diff options
Diffstat (limited to 'filter/source/msfilter')
| -rw-r--r-- | filter/source/msfilter/dffpropset.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index f8aff171998e..a17cf1e44e6d 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1125,7 +1125,7 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool bSetUninitializedOnly ) sal_uInt32 nMergeFlags = nContent; nMergeFlags &= ( nMergeFlags >> 16 ) | 0xffff0000; // clearing low word - nMergeFlags &= ( ( nCurrentFlags & 0xffff0000 ) // remove allready hard set + nMergeFlags &= ( ( nCurrentFlags & 0xffff0000 ) // remove already hard set | ( nCurrentFlags >> 16 ) ) ^ 0xffffffff; // attributes from mergeflags nCurrentFlags &= ( ( nMergeFlags & 0xffff0000 ) // apply zero master bits | ( nMergeFlags >> 16 ) ) ^ 0xffffffff; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 83f6cdd70550..eea3f99e475b 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5765,7 +5765,7 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, // und der Text nicht gedreht ist) sal_Bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? sal_False : sal_True; - // we don't knwo yet whether it's a TextBox + // we don't know yet whether it's a TextBox MSO_SPT eShapeType = mso_sptNil; // analyze Shape |