textcharacterproperties.cxx (ca5ec200) textcharacterproperties.cxx (f1574915)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 36 unchanged lines hidden (view full) ---

45void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSourceProps )
46{
47 // overwrite all properties exisiting in rSourceProps
48 maHyperlinkPropertyMap.insert( rSourceProps.maHyperlinkPropertyMap.begin(), rSourceProps.maHyperlinkPropertyMap.end() );
49 maLatinFont.assignIfUsed( rSourceProps.maLatinFont );
50 maAsianFont.assignIfUsed( rSourceProps.maAsianFont );
51 maComplexFont.assignIfUsed( rSourceProps.maComplexFont );
52 maSymbolFont.assignIfUsed( rSourceProps.maSymbolFont );
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 36 unchanged lines hidden (view full) ---

45void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSourceProps )
46{
47 // overwrite all properties exisiting in rSourceProps
48 maHyperlinkPropertyMap.insert( rSourceProps.maHyperlinkPropertyMap.begin(), rSourceProps.maHyperlinkPropertyMap.end() );
49 maLatinFont.assignIfUsed( rSourceProps.maLatinFont );
50 maAsianFont.assignIfUsed( rSourceProps.maAsianFont );
51 maComplexFont.assignIfUsed( rSourceProps.maComplexFont );
52 maSymbolFont.assignIfUsed( rSourceProps.maSymbolFont );
53 maCharColor.assignIfUsed( rSourceProps.maCharColor );
53 // keep existing char color
54 if (!maCharColor.isUsed())
55 maCharColor.assignIfUsed( rSourceProps.maCharColor );
56
54 maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
55 maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor );
56 moHeight.assignIfUsed( rSourceProps.moHeight );
57 moSpacing.assignIfUsed( rSourceProps.moSpacing );
58 moUnderline.assignIfUsed( rSourceProps.moUnderline );
59 moStrikeout.assignIfUsed( rSourceProps.moStrikeout );
60 moCaseMap.assignIfUsed( rSourceProps.moCaseMap );
61 moBold.assignIfUsed( rSourceProps.moBold );

--- 104 unchanged lines hidden --- 		57 maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
58 maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor );
59 moHeight.assignIfUsed( rSourceProps.moHeight );
60 moSpacing.assignIfUsed( rSourceProps.moSpacing );
61 moUnderline.assignIfUsed( rSourceProps.moUnderline );
62 moStrikeout.assignIfUsed( rSourceProps.moStrikeout );
63 moCaseMap.assignIfUsed( rSourceProps.moCaseMap );
64 moBold.assignIfUsed( rSourceProps.moBold );

--- 104 unchanged lines hidden ---