diff --git a/Repository.mk b/Repository.mk index 10aabd5a419d..a6642835e75d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -981,10 +981,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ extras_persona_pink \ extras_persona_sand \ extras_persona_white \ + extras_tplpresnt \ extras_tplwizdesktop \ $(if $(WITH_TEMPLATES),\ extras_templates \ - extras_tplpresnt \ extras_tplwizbitmap \ extras_tplwizard \ ) \ diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index 5ead84ee3466..99adb175f8e8 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -62,7 +62,6 @@ namespace accessibility // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 55112facacbc..7570bdbb5afe 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -77,7 +77,6 @@ namespace accessibility // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 3825be0d4f22..c2db4a0cdd63 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -67,8 +67,7 @@ public: */ css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 i) override; - /** The role is always AccessibleRole::COMBO_BOX. - */ + sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleAction @@ -107,7 +106,7 @@ protected: /** Returns true when the object is valid. */ - virtual bool IsValid() const = 0; + bool IsValid() const; virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) override; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index 67c2ef93b139..6294e7df91d1 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -39,8 +39,6 @@ public: private: virtual ~VCLXAccessibleComboBox() override = default; - - virtual bool IsValid() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index 76c1c14594e9..2527b2fbc2c8 100644 --- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -41,7 +41,6 @@ public: private: virtual ~VCLXAccessibleDropDownComboBox() override = default; - virtual bool IsValid() const override; virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override; }; diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx index d971e80ccaa9..3a314ad09434 100644 --- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx @@ -40,8 +40,6 @@ public: private: virtual ~VCLXAccessibleDropDownListBox() override = default; - - virtual bool IsValid() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index 187a03264718..e5d810ccc016 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -63,6 +63,7 @@ public: // XAccessibleContext virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; + virtual OUString SAL_CALL getAccessibleName() override; virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleAction @@ -101,6 +102,7 @@ public: virtual sal_Bool SAL_CALL setText( const OUString& sText ) override; private: + bool isComboBoxChild(); bool isEditable(); }; diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx index 9405947b2b5b..ed2cd05efc56 100644 --- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx @@ -38,8 +38,6 @@ public: private: virtual ~VCLXAccessibleListBox() override = default; - - virtual bool IsValid() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 84283e20ee2c..612ef43a105a 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -25,7 +25,6 @@ #include #include #include -#include namespace accessibility @@ -130,11 +129,6 @@ namespace accessibility u"com.sun.star.awt.AccessibleIconChoiceControl"_ustr}; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) - { - return cppu::supportsService(this, _rServiceName); - } - // XAccessible Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index bcb1c9f4b87c..8bdf8e84364a 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -26,7 +26,6 @@ #include #include #include -#include namespace accessibility @@ -261,11 +260,6 @@ namespace accessibility u"com.sun.star.awt.AccessibleTreeListBox"_ustr}; } - sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) - { - return cppu::supportsService(this, _rServiceName); - } - // XAccessible Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( ) diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 19867b61fcfb..8068d118ed9f 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1043,20 +1043,18 @@ void Document::retrieveRunAttributesImpl( tPropValMap aRunAttrSeq; if ( pColor ) { - css::beans::PropertyValue aPropVal; - aPropVal.Name = "CharColor"; - aPropVal.Handle = -1; - aPropVal.Value = mapFontColor( pColor->GetColor() ); - aPropVal.State = css::beans::PropertyState_DIRECT_VALUE; + css::beans::PropertyValue aPropVal{ + "CharColor", -1, + mapFontColor(pColor->GetColor()), + css::beans::PropertyState_DIRECT_VALUE}; aRunAttrSeq[ aPropVal.Name ] = aPropVal; } if ( pWeight ) { - css::beans::PropertyValue aPropVal; - aPropVal.Name = "CharWeight"; - aPropVal.Handle = -1; - aPropVal.Value = mapFontWeight( pWeight->getFontWeight() ); - aPropVal.State = css::beans::PropertyState_DIRECT_VALUE; + css::beans::PropertyValue aPropVal{ + "CharWeight", -1, + mapFontWeight(pWeight->getFontWeight()), + css::beans::PropertyState_DIRECT_VALUE}; aRunAttrSeq[ aPropVal.Name ] = aPropVal; } if ( !RequestedAttributes.hasElements() ) diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 43b9967ed51a..9e8569ce0826 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -54,6 +54,11 @@ VCLXAccessibleBox::VCLXAccessibleBox (VCLXWindow* pVCLWindow, BoxType aType, boo VCLXAccessibleBox::~VCLXAccessibleBox() {} +bool VCLXAccessibleBox::IsValid() const +{ + return GetWindow(); +} + void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) { uno::Any aOldValue, aNewValue; @@ -308,12 +313,8 @@ Reference SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int64 if (m_aBoxType==COMBOBOX) { VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); - if (pComboBox!=nullptr && pComboBox->GetSubEdit()!=nullptr) - //Set the edit's acc name the same as parent - { - pComboBox->GetSubEdit()->SetAccessibleName(getAccessibleName()); + if (pComboBox && pComboBox->GetSubEdit()) m_xText = pComboBox->GetSubEdit()->GetAccessible(); - } } else if (m_bIsDropDownBox) m_xText = new VCLXAccessibleTextField (GetVCLXWindow(),this); diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 8b239996599d..5e0c77304ad8 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -30,12 +30,6 @@ VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow) { } - -bool VCLXAccessibleComboBox::IsValid() const -{ - return GetWindow(); -} - // XServiceInfo OUString VCLXAccessibleComboBox::getImplementationName() diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 903e704b92bf..5dc7073e7f0b 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -33,12 +33,6 @@ VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCL { } - -bool VCLXAccessibleDropDownComboBox::IsValid() const -{ - return GetWindow(); -} - void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) { switch ( rVclWindowEvent.GetId() ) diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 5d1c206f1737..360eab0dc26c 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -30,11 +30,6 @@ VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWi { } -bool VCLXAccessibleDropDownListBox::IsValid() const -{ - return GetWindow(); -} - // XServiceInfo OUString VCLXAccessibleDropDownListBox::getImplementationName() { diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index f7ce36f3187e..73298a4ff255 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -168,15 +168,7 @@ bool VCLXAccessibleEdit::PreferFullTextInTextChangedEvent() // for a combobox subedit, the Orca screen reader announces the new/added text // so always send the whole old and new text and not just // the changed characters, so the whole entry text gets announced - Reference xParent = getAccessibleParent(); - if (xParent.is()) - { - Reference xParentContext = xParent->getAccessibleContext(); - if (xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::COMBO_BOX) - return true; - } - - return false; + return isComboBoxChild(); } // XServiceInfo @@ -210,6 +202,16 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int64 ) throw IndexOutOfBoundsException(); } +OUString VCLXAccessibleEdit::getAccessibleName() +{ + OExternalLockGuard aGuard(this); + + // for combobox edit, return name of the parent + if (isComboBoxChild()) + return getAccessibleParent()->getAccessibleContext()->getAccessibleName(); + + return VCLXAccessibleTextComponent::getAccessibleName(); +} sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) { @@ -616,6 +618,18 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) return bReturn; } +bool VCLXAccessibleEdit::isComboBoxChild() +{ + Reference xParent = getAccessibleParent(); + if (xParent.is()) + { + Reference xParentContext = xParent->getAccessibleContext(); + if (xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::COMBO_BOX) + return true; + } + return false; +} + bool VCLXAccessibleEdit::isEditable() { VclPtr pEdit = GetAs(); diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 1b4d444e6ca9..2f9392ab0341 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -29,12 +29,6 @@ VCLXAccessibleListBox::VCLXAccessibleListBox (VCLXWindow* pVCLWindow) { } - -bool VCLXAccessibleListBox::IsValid() const -{ - return GetWindow(); -} - // XServiceInfo OUString VCLXAccessibleListBox::getImplementationName() diff --git a/android/source/res/values-ia/strings.xml b/android/source/res/values-ia/strings.xml index 5b3952a19518..9dedca5f0a1b 100644 --- a/android/source/res/values-ia/strings.xml +++ b/android/source/res/values-ia/strings.xml @@ -5,7 +5,7 @@ Monstrar Modo de disveloppator Cancellar - Crear un nove file + Crear nove file Celar Inviar commando UNO sin titulo @@ -16,10 +16,10 @@ Retro Bmp non valide! Collar - OK + De accordo SALVEGUARDAR Nove folio de calculo - Selige un file a aperir + Selectiona file a aperir Non poteva exportar a PDF Salveguardar como… Color de littera @@ -29,9 +29,9 @@ icone de file Files recente Pagina - Inserer + Insertar Stylo - Seliger un imagine + Selectionar imagine NON Nove documento de texto Imprimer @@ -40,52 +40,52 @@ Deler Disfacer Iste version es fornite per $VENDOR. - Insere le contrasigno - OK + Inserta contrasigno + De accordo Partes General Texto copiate al area de transferentia Exportar a PDF - Monstrar le claviero + Monstrar claviero Politica de confidentialitate Presentation de diapositivas - Seliger un photo + Selectionar photo Copiar - Inserer + Insertar Cerca Necun camera trovate Error Parametros del visualisator de LibreOffice Le nomine fornite jam es in uso. Salveguardar - OK + De accordo Parametros Version: %1$s<br>ID de compilation: <a href=https://hub.libreoffice.org/git-core/%2$s>%2$s</a> - Monstrar le licentia + Monstrar licentia Tote le files Non poteva salveguardar le file Visualisator de LibreOffice Adder un diapositiva Cancellar - Trovar le sequente - Trovar le previe + Trovar sequente + Trovar precedente Activar le modo de edition experimental. Usa lo sub tu proprie risco. - Iste file es solo lectura - Monstrar le aviso + Iste file es de sol lectura. + Monstrar aviso Cancellar Previe - Seliger optiones de insertion: - Seliger optiones de deletion: - Renominar le folio de calculo - Deler le folio - Deler le diapositiva + Selectionar optiones de insertion: + Selectionar optiones de deletion: + Renominar folio de calculo + Deler folio + Deler diapositiva Folio Diapositiva Renominar le diapositiva Character Paragrapho Commando UNO actual - Inserer un tabella + Insertar tabella Commando UNO - Prender un photo + Prender photo \ No newline at end of file diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 4bada4d23ec1..823152e3b029 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -171,15 +171,16 @@ void MediaWindowImpl::dispose() uno::Reference MediaWindowImpl::createPlayer(const OUString& rURL, const OUString& rReferer, const OUString*) { - uno::Reference xPlayer; - if( rURL.isEmpty() ) - return xPlayer; + return nullptr; if (SvtSecurityOptions::isUntrustedReferer(rReferer)) - { - return xPlayer; - } + return nullptr; + + if (INetURLObject(rURL).IsExoticProtocol()) + return nullptr; + + uno::Reference xPlayer; // currently there isn't anything else, throw any mime type to the media players //if (!pMimeType || *pMimeType == AVMEDIA_MIMETYPE_COMMON) diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 48c09c039388..c0b54a51885e 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -238,7 +238,7 @@ OUString ChooseMacro(weld::Window* pParent, SbMethod* pMethod = nullptr; MacroChooser aChooser(pParent, xDocFrame); - if ( bChooseOnly || !SvtModuleOptions::IsBasicIDE() ) + if (bChooseOnly || !SvtModuleOptions::IsBasicIDEInstalled()) aChooser.SetMode(MacroChooser::ChooseOnly); if ( !bChooseOnly && rxLimitToDocument.is() ) diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index f8af9e037b60..8e1eaf40c79f 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -375,7 +375,7 @@ tools::Long HandleBasicError( StarBASIC const * pBasic ) tools::Long nRet = 0; Shell* pShell = nullptr; - if ( SvtModuleOptions::IsBasicIDE() ) + if (SvtModuleOptions::IsBasicIDEInstalled()) { BasicManager* pBasMgr = FindBasicManager( pBasic ); if ( pBasMgr ) diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index 1184886784c9..bd3523a134b9 100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx @@ -728,8 +728,7 @@ namespace dxcanvas "CanvasHelper::setupGraphicsState: reference device invalid" ); // setup view transform first. Clipping e.g. depends on it - ::basegfx::B2DHomMatrix aTransform; - ::canvas::tools::getViewStateTransform(aTransform, viewState); + ::basegfx::B2DHomMatrix aTransform = ::canvas::tools::getViewStateTransform(viewState); // add output offset if( !maOutputOffset.equalZero() ) diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 2517e05be947..d6aa4e06f0f5 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -70,8 +70,7 @@ namespace canvas // rectangular area which is actually covered by the sprite. // coordinates are relative to the sprite origin. - ::basegfx::B2DRectangle aSpriteRectPixel; - ::canvas::tools::calcTransformedRectBounds( aSpriteRectPixel, + ::basegfx::B2DRectangle aSpriteRectPixel = ::canvas::tools::calcTransformedRectBounds( aBounds, maTransform ); @@ -413,8 +412,7 @@ namespace canvas // transform bounds at origin, as the sprite transformation is // formulated that way - ::basegfx::B2DRectangle aTransformedBounds; - return ::canvas::tools::calcTransformedRectBounds( aTransformedBounds, + return ::canvas::tools::calcTransformedRectBounds( rBounds, aTransform ); } diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index b77524351b96..cf72e8fed401 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -91,10 +91,10 @@ namespace canvas::tools return viewState; } - ::basegfx::B2DHomMatrix& getViewStateTransform( ::basegfx::B2DHomMatrix& transform, - const rendering::ViewState& viewState ) + ::basegfx::B2DHomMatrix getViewStateTransform( const rendering::ViewState& viewState ) { - return ::basegfx::unotools::homMatrixFromAffineMatrix( transform, viewState.AffineTransform ); + ::basegfx::B2DHomMatrix aTransform; + return ::basegfx::unotools::homMatrixFromAffineMatrix( aTransform, viewState.AffineTransform ); } rendering::ViewState& setViewStateTransform( rendering::ViewState& viewState, @@ -105,10 +105,10 @@ namespace canvas::tools return viewState; } - ::basegfx::B2DHomMatrix& getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, - const rendering::RenderState& renderState ) + ::basegfx::B2DHomMatrix getRenderStateTransform( const rendering::RenderState& renderState ) { - return ::basegfx::unotools::homMatrixFromAffineMatrix( transform, renderState.AffineTransform ); + ::basegfx::B2DHomMatrix aTransform; + return ::basegfx::unotools::homMatrixFromAffineMatrix( aTransform, renderState.AffineTransform ); } rendering::RenderState& setRenderStateTransform( rendering::RenderState& renderState, @@ -122,18 +122,14 @@ namespace canvas::tools rendering::RenderState& appendToRenderState( rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& rTransform ) { - ::basegfx::B2DHomMatrix transform; - - getRenderStateTransform( transform, renderState ); + ::basegfx::B2DHomMatrix transform = getRenderStateTransform( renderState ); return setRenderStateTransform( renderState, transform * rTransform ); } rendering::RenderState& prependToRenderState( rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& rTransform ) { - ::basegfx::B2DHomMatrix transform; - - getRenderStateTransform( transform, renderState ); + ::basegfx::B2DHomMatrix transform = getRenderStateTransform( renderState ); return setRenderStateTransform( renderState, rTransform * transform ); } @@ -814,10 +810,10 @@ namespace canvas::tools // rSpriteSize is mapped with its left,top corner to (0,0) // again. This is required to properly render sprite // animations to buffer bitmaps. - ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, - const ::basegfx::B2DRange& i_srcRect, - const ::basegfx::B2DHomMatrix& i_transformation ) + ::basegfx::B2DHomMatrix calcRectToOriginTransform( const ::basegfx::B2DRange& i_srcRect, + const ::basegfx::B2DHomMatrix& i_transformation ) { + ::basegfx::B2DHomMatrix o_transform; if( i_srcRect.isEmpty() ) { o_transform = i_transformation; @@ -825,9 +821,7 @@ namespace canvas::tools } // transform by given transformation - ::basegfx::B2DRectangle aTransformedRect; - - calcTransformedRectBounds( aTransformedRect, + ::basegfx::B2DRectangle aTransformedRect = calcTransformedRectBounds( i_srcRect, i_transformation ); @@ -841,11 +835,10 @@ namespace canvas::tools return o_transform; } - ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& outRect, - const ::basegfx::B2DRange& inRect, + ::basegfx::B2DRange calcTransformedRectBounds( const ::basegfx::B2DRange& inRect, const ::basegfx::B2DHomMatrix& transformation ) { - outRect.reset(); + ::basegfx::B2DRange outRect; if( inRect.isEmpty() ) return outRect; diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index f398f6734f1a..a35a93bc1dba 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -795,8 +795,7 @@ namespace vclcanvas // modify output position, to account for the fact // that transformBitmap() always normalizes its output // bitmap into the smallest enclosing box. - ::basegfx::B2DRectangle aDestRect; - ::canvas::tools::calcTransformedRectBounds( aDestRect, + ::basegfx::B2DRectangle aDestRect = ::canvas::tools::calcTransformedRectBounds( ::basegfx::B2DRectangle(0, 0, aBmpSize.Width(), diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index f9501cf8d426..2a1ec6b88c9a 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -574,9 +574,8 @@ namespace vclcanvas // extra-verbosity { ::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0); - ::basegfx::B2DRectangle aTextureDeviceRect; ::basegfx::B2DHomMatrix aTextureTransform; - ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect, + ::basegfx::B2DRectangle aTextureDeviceRect = ::canvas::tools::calcTransformedRectBounds( aRect, aTextureTransform ); rOutDev.SetLineColor( COL_RED ); @@ -699,8 +698,7 @@ namespace vclcanvas aTotalTransform *= aTextureTransform; const ::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0); - ::basegfx::B2DRectangle aTextureDeviceRect; - ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect, + ::basegfx::B2DRectangle aTextureDeviceRect = ::canvas::tools::calcTransformedRectBounds( aRect, aTotalTransform ); @@ -806,8 +804,7 @@ namespace vclcanvas // modify output position, to account for the fact // that transformBitmap() always normalizes its output // bitmap into the smallest enclosing box. - ::basegfx::B2DRectangle aDestRect; - ::canvas::tools::calcTransformedRectBounds( aDestRect, + ::basegfx::B2DRectangle aDestRect = ::canvas::tools::calcTransformedRectBounds( ::basegfx::B2DRectangle(0, 0, aBmpSize.Width, @@ -867,8 +864,7 @@ namespace vclcanvas // Finally, the bound rect is transformed back to // device coordinate space, were we determine the // start point from it. - ::basegfx::B2DRectangle aTextureSpacePolygonRect; - ::canvas::tools::calcTransformedRectBounds( aTextureSpacePolygonRect, + ::basegfx::B2DRectangle aTextureSpacePolygonRect = ::canvas::tools::calcTransformedRectBounds( vcl::unotools::b2DRectangleFromRectangle(aPolygonDeviceRect), aInverseTextureTransform ); @@ -891,8 +887,7 @@ namespace vclcanvas nY1 + 1.0 ); // and convert back to device space - ::basegfx::B2DRectangle aSingleDeviceTextureRect; - ::canvas::tools::calcTransformedRectBounds( aSingleDeviceTextureRect, + ::basegfx::B2DRectangle aSingleDeviceTextureRect = ::canvas::tools::calcTransformedRectBounds( aSingleTextureRect, aPureTotalTransform ); diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index cafc59a9b83f..7b431bdf7258 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -223,13 +223,12 @@ namespace vclcanvas::tools // deleted from the transformation; this can be handled by // an offset when painting the bitmap const Size aBmpSize( rBitmap.GetSizePixel() ); - ::basegfx::B2DRectangle aDestRect; // calc effective transformation for bitmap const ::basegfx::B2DRectangle aSrcRect( 0, 0, aBmpSize.Width(), aBmpSize.Height() ); - ::canvas::tools::calcTransformedRectBounds( aDestRect, + ::basegfx::B2DRectangle aDestRect = ::canvas::tools::calcTransformedRectBounds( aSrcRect, rTransform ); @@ -237,8 +236,7 @@ namespace vclcanvas::tools // aligned with (0,0). The method takes the given // rectangle, and calculates a transformation that maps // this rectangle unscaled to the origin. - ::basegfx::B2DHomMatrix aLocalTransform; - ::canvas::tools::calcRectToOriginTransform( aLocalTransform, + ::basegfx::B2DHomMatrix aLocalTransform = ::canvas::tools::calcRectToOriginTransform( aSrcRect, rTransform ); diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index c57c238ef3b0..3f37794e1d10 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -546,6 +546,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart) assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]", "val", u"bar"); } +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieSplitPos) +{ + loadFromFile(u"xlsx/pieOfPieChart2.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:splitPos[1]", "val", u"4"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieSplitPos) +{ + loadFromFile(u"xlsx/barOfPieChart2.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:splitPos[1]", "val", u"5"); +} + CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits) { loadFromFile(u"docx/DisplayUnits.docx"); @@ -1133,6 +1155,49 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) CPPUNIT_ASSERT_EQUAL(chart2::PieChartSubType_PIE, subPieType); } +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_barOfPie_split_pos) +{ + loadFromFile(u"ods/tdf161800_barOfPie_split_pos.ods"); + saveAndReload(u"calc8"_ustr); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + // Verify that it saves and loads with the correct split position + Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); + uno::Any aAny = xPropSet->getPropertyValue(u"SplitPos"_ustr); + CPPUNIT_ASSERT(aAny.hasValue()); + double nSplitPos; + aAny >>= nSplitPos; + CPPUNIT_ASSERT_EQUAL(4.0, nSplitPos); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_pieOfPie_split_pos) +{ + loadFromFile(u"ods/tdf161800_pieOfPie_split_pos.ods"); + saveAndReload(u"calc8"_ustr); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + CPPUNIT_ASSERT_EQUAL(u"com.sun.star.chart2.PieChartType"_ustr, + xChartType->getChartType()); + + // Verify that it saves and loads with the correct split position + Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); + uno::Any aAny = xPropSet->getPropertyValue(u"SplitPos"_ustr); + CPPUNIT_ASSERT(aAny.hasValue()); + double nSplitPos; + aAny >>= nSplitPos; + CPPUNIT_ASSERT_EQUAL(3.0, nSplitPos); +} + CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash) { loadFromFile(u"docx/FDO75975.docx"); diff --git a/chart2/qa/extras/data/ods/tdf161800_barOfPie_split_pos.ods b/chart2/qa/extras/data/ods/tdf161800_barOfPie_split_pos.ods new file mode 100644 index 000000000000..a87941bfa22d Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf161800_barOfPie_split_pos.ods differ diff --git a/chart2/qa/extras/data/ods/tdf161800_pieOfPie_split_pos.ods b/chart2/qa/extras/data/ods/tdf161800_pieOfPie_split_pos.ods new file mode 100644 index 000000000000..9a08628a91e7 Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf161800_pieOfPie_split_pos.ods differ diff --git a/chart2/qa/extras/data/xlsx/barOfPieChart2.xlsx b/chart2/qa/extras/data/xlsx/barOfPieChart2.xlsx new file mode 100644 index 000000000000..be24cd293915 Binary files /dev/null and b/chart2/qa/extras/data/xlsx/barOfPieChart2.xlsx differ diff --git a/chart2/qa/extras/data/xlsx/pieOfPieChart2.xlsx b/chart2/qa/extras/data/xlsx/pieOfPieChart2.xlsx new file mode 100644 index 000000000000..c80f0169cc89 Binary files /dev/null and b/chart2/qa/extras/data/xlsx/pieOfPieChart2.xlsx differ diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 29618ddbfaf6..79eb36f41050 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -104,7 +104,7 @@ enum PROP_DIAGRAM_STARTING_ANGLE, PROP_DIAGRAM_OF_PIE_TYPE, - PROP_DIAGRAM_COMPOSITE_SIZE, + PROP_DIAGRAM_SPLIT_POS, PROP_DIAGRAM_RIGHT_ANGLED_AXES, PROP_DIAGRAM_PERSPECTIVE, @@ -236,8 +236,8 @@ void lcl_AddPropertiesToVector( cppu::UnoType::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.emplace_back( "CompositeSize", - PROP_DIAGRAM_COMPOSITE_SIZE, + rOutProperties.emplace_back( "SplitPos", + PROP_DIAGRAM_SPLIT_POS, cppu::UnoType::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ); diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 308ff1930457..365df1c328f9 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -305,7 +305,8 @@ rtl::Reference< ChartTypeTemplate > ChartTypeDialogController::getCurrentTemplat } void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParameter - , const rtl::Reference<::chart::ChartModel>& xChartModel ) + , const rtl::Reference<::chart::ChartModel>& xChartModel + , const uno::Reference& xTemplateProps) { rtl::Reference< ::chart::ChartTypeManager > xTemplateManager = xChartModel->getTypeManager(); rtl::Reference< ::chart::ChartTypeTemplate > xTemplate( getCurrentTemplate( rParameter, xTemplateManager ) ); @@ -329,6 +330,20 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame if (xDiagram.is()) { xDiagram->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::Any(rParameter.bSortByXValues)); + + sal_Int32 nSplitPos; + try { + if (xTemplateProps.is()) { + xTemplateProps->getPropertyValue(u"SplitPos"_ustr) >>= nSplitPos; + xDiagram->setPropertyValue(u"SplitPos"_ustr, uno::Any(nSplitPos)); + } + } + catch( uno::Exception & ex ) + { + //not all templates need to support SplitPos + ex.Context.is();//to have debug information without compilation warnings + } + } } void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) @@ -763,7 +778,7 @@ void OfPieChartDialogController::fillExtraControls( { try { - xTemplateProps->getPropertyValue( u"CompositeSize"_ustr ) >>= nCompositeSize; + xTemplateProps->getPropertyValue( u"SplitPos"_ustr ) >>= nCompositeSize; } catch( const uno::Exception & ) { @@ -801,7 +816,7 @@ void OfPieChartDialogController::setTemplateProperties( const uno::Reference< be if( xTemplateProps.is()) { sal_Int32 nCompositeSize = m_xMF_CompositeSize->get_value(); - xTemplateProps->setPropertyValue( u"CompositeSize"_ustr , uno::Any(nCompositeSize) ); + xTemplateProps->setPropertyValue( u"SplitPos"_ustr , uno::Any(nCompositeSize) ); } } diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 811c4df19017..12fa0325cef4 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -166,7 +166,8 @@ void ChartTypeTabPage::commitToModel( const ChartTypeParameter& rParameter ) return; m_aTimerTriggeredControllerLock.startTimer(); - m_pCurrentMainType->commitToModel( rParameter, m_xChartModel ); + uno::Reference< beans::XPropertySet > xTemplateProps( static_cast(getCurrentTemplate().get()), uno::UNO_QUERY ); + m_pCurrentMainType->commitToModel( rParameter, m_xChartModel, xTemplateProps ); } void ChartTypeTabPage::stateChanged() diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx index c0b53972e546..16450f28f781 100644 --- a/chart2/source/controller/inc/TabPageNotifiable.hxx +++ b/chart2/source/controller/inc/TabPageNotifiable.hxx @@ -20,11 +20,6 @@ #include -// color to use as foreground for an invalid range -#define RANGE_SELECTION_INVALID_RANGE_FOREGROUND_COLOR COL_WHITE -// color to use as background for an invalid range -#define RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR Color(0xff6563) - class BuilderPage; namespace chart diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index bc8e65409130..bfbacd95a90c 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -271,8 +271,7 @@ void ChartController::executeDispatch_InsertSpecialCharacter() pOutlinerView->InsertText(aString, true); ESelection aSel = pOutlinerView->GetSelection(); - aSel.nStartPara = aSel.nEndPara; - aSel.nStartPos = aSel.nEndPos; + aSel.CollapseToEnd(); pOutlinerView->SetSelection(aSel); // show changes diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index 38ea92912a19..fa85ded6d4a6 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -391,7 +391,9 @@ void ChartTypePanel::commitToModel(const ChartTypeParameter& rParameter) return; m_aTimerTriggeredControllerLock.startTimer(); - m_pCurrentMainType->commitToModel(rParameter, m_xChartModel); + uno::Reference xTemplateProps( + static_cast(getCurrentTemplate().get()), uno::UNO_QUERY); + m_pCurrentMainType->commitToModel(rParameter, m_xChartModel, xTemplateProps); } void ChartTypePanel::selectMainType() diff --git a/chart2/source/inc/ChartType.hxx b/chart2/source/inc/ChartType.hxx index 7b1fccfb159e..697b0d7ffc91 100644 --- a/chart2/source/inc/ChartType.hxx +++ b/chart2/source/inc/ChartType.hxx @@ -43,7 +43,7 @@ enum PROP_PIECHARTTYPE_USE_RINGS, PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, PROP_PIECHARTTYPE_SUBTYPE, // none, of-bar, of-pie - PROP_PIECHARTTYPE_COMPOSITESIZE + PROP_PIECHARTTYPE_SPLIT_POS }; diff --git a/chart2/source/inc/ChartTypeDialogController.hxx b/chart2/source/inc/ChartTypeDialogController.hxx index cbeeb8b59406..1d36a433d96a 100644 --- a/chart2/source/inc/ChartTypeDialogController.hxx +++ b/chart2/source/inc/ChartTypeDialogController.hxx @@ -130,8 +130,10 @@ public: virtual void adjustParameterToSubType(ChartTypeParameter& rParameter); virtual void adjustParameterToMainType(ChartTypeParameter& rParameter); OUString getServiceNameForParameter(const ChartTypeParameter& rParameter) const; - void commitToModel(const ChartTypeParameter& rParameter, - const rtl::Reference<::chart::ChartModel>& xChartModel); + void + commitToModel(const ChartTypeParameter& rParameter, + const rtl::Reference<::chart::ChartModel>& xChartModel, + const css::uno::Reference& xTemplateProps); rtl::Reference<::chart::ChartTypeTemplate> getCurrentTemplate(const ChartTypeParameter& rParameter, const rtl::Reference<::chart::ChartTypeManager>& xTemplateManager) const; diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index a5099cc0c31a..7ddcf432cb1e 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -37,171 +37,171 @@ class SdrAngleItem; // SCHATTR // can't this be changed to 0? -constexpr sal_uInt16 SCHATTR_START = 1; +inline constexpr sal_uInt16 SCHATTR_START = 1; -constexpr sal_uInt16 SCHATTR_DATADESCR_START (SCHATTR_START); -constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_NUMBER (SCHATTR_DATADESCR_START); -constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1); -constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2); -constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3); -constexpr TypedWhichId SCHATTR_DATADESCR_WRAP_TEXT (SCHATTR_DATADESCR_START + 4); -constexpr TypedWhichId SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 5); -constexpr TypedWhichId SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 6); -constexpr TypedWhichId SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 7); -constexpr TypedWhichId SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 8); //percentage values should not be offered -constexpr TypedWhichId SCHATTR_DATADESCR_CUSTOM_LEADER_LINES (SCHATTR_DATADESCR_START + 9); -constexpr TypedWhichId SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_DATADESCR_START + 10); -constexpr TypedWhichId SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_DATADESCR_START + 11); -constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_DATA_SERIES_NAME (SCHATTR_DATADESCR_START + 12); -constexpr sal_uInt16 SCHATTR_DATADESCR_END (SCHATTR_DATADESCR_SHOW_DATA_SERIES_NAME); +inline constexpr sal_uInt16 SCHATTR_DATADESCR_START (SCHATTR_START); +inline constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_NUMBER (SCHATTR_DATADESCR_START); +inline constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1); +inline constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2); +inline constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3); +inline constexpr TypedWhichId SCHATTR_DATADESCR_WRAP_TEXT (SCHATTR_DATADESCR_START + 4); +inline constexpr TypedWhichId SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 5); +inline constexpr TypedWhichId SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 6); +inline constexpr TypedWhichId SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 7); +inline constexpr TypedWhichId SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 8); //percentage values should not be offered +inline constexpr TypedWhichId SCHATTR_DATADESCR_CUSTOM_LEADER_LINES (SCHATTR_DATADESCR_START + 9); +inline constexpr TypedWhichId SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_DATADESCR_START + 10); +inline constexpr TypedWhichId SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_DATADESCR_START + 11); +inline constexpr TypedWhichId SCHATTR_DATADESCR_SHOW_DATA_SERIES_NAME (SCHATTR_DATADESCR_START + 12); +inline constexpr sal_uInt16 SCHATTR_DATADESCR_END (SCHATTR_DATADESCR_SHOW_DATA_SERIES_NAME); //legend -constexpr sal_uInt16 SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1); -constexpr TypedWhichId SCHATTR_LEGEND_POS (SCHATTR_LEGEND_START); -constexpr TypedWhichId SCHATTR_LEGEND_SHOW (SCHATTR_LEGEND_START + 1); -constexpr TypedWhichId SCHATTR_LEGEND_NO_OVERLAY (SCHATTR_LEGEND_START + 2); -constexpr sal_uInt16 SCHATTR_LEGEND_END (SCHATTR_LEGEND_NO_OVERLAY); +inline constexpr sal_uInt16 SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1); +inline constexpr TypedWhichId SCHATTR_LEGEND_POS (SCHATTR_LEGEND_START); +inline constexpr TypedWhichId SCHATTR_LEGEND_SHOW (SCHATTR_LEGEND_START + 1); +inline constexpr TypedWhichId SCHATTR_LEGEND_NO_OVERLAY (SCHATTR_LEGEND_START + 2); +inline constexpr sal_uInt16 SCHATTR_LEGEND_END (SCHATTR_LEGEND_NO_OVERLAY); //text -constexpr sal_uInt16 SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1); -constexpr TypedWhichId SCHATTR_TEXT_DEGREES (SCHATTR_TEXT_START); -constexpr TypedWhichId SCHATTR_TEXT_STACKED (SCHATTR_TEXT_START + 1); -constexpr sal_uInt16 SCHATTR_TEXT_END (SCHATTR_TEXT_STACKED); +inline constexpr sal_uInt16 SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1); +inline constexpr TypedWhichId SCHATTR_TEXT_DEGREES (SCHATTR_TEXT_START); +inline constexpr TypedWhichId SCHATTR_TEXT_STACKED (SCHATTR_TEXT_START + 1); +inline constexpr sal_uInt16 SCHATTR_TEXT_END (SCHATTR_TEXT_STACKED); // statistic -constexpr sal_uInt16 SCHATTR_STAT_START (SCHATTR_TEXT_END + 1); -constexpr TypedWhichId SCHATTR_STAT_AVERAGE (SCHATTR_STAT_START); -constexpr TypedWhichId SCHATTR_STAT_KIND_ERROR (SCHATTR_STAT_START + 1); -constexpr TypedWhichId SCHATTR_STAT_PERCENT (SCHATTR_STAT_START + 2); -constexpr TypedWhichId SCHATTR_STAT_BIGERROR (SCHATTR_STAT_START + 3); -constexpr TypedWhichId SCHATTR_STAT_CONSTPLUS (SCHATTR_STAT_START + 4); -constexpr TypedWhichId SCHATTR_STAT_CONSTMINUS (SCHATTR_STAT_START + 5); -constexpr TypedWhichId SCHATTR_STAT_INDICATE (SCHATTR_STAT_START + 6); -constexpr TypedWhichId SCHATTR_STAT_RANGE_POS (SCHATTR_STAT_START + 7); -constexpr TypedWhichId SCHATTR_STAT_RANGE_NEG (SCHATTR_STAT_START + 8); -constexpr TypedWhichId SCHATTR_STAT_ERRORBAR_TYPE (SCHATTR_STAT_START + 9); -constexpr sal_uInt16 SCHATTR_STAT_END (SCHATTR_STAT_ERRORBAR_TYPE); +inline constexpr sal_uInt16 SCHATTR_STAT_START (SCHATTR_TEXT_END + 1); +inline constexpr TypedWhichId SCHATTR_STAT_AVERAGE (SCHATTR_STAT_START); +inline constexpr TypedWhichId SCHATTR_STAT_KIND_ERROR (SCHATTR_STAT_START + 1); +inline constexpr TypedWhichId SCHATTR_STAT_PERCENT (SCHATTR_STAT_START + 2); +inline constexpr TypedWhichId SCHATTR_STAT_BIGERROR (SCHATTR_STAT_START + 3); +inline constexpr TypedWhichId SCHATTR_STAT_CONSTPLUS (SCHATTR_STAT_START + 4); +inline constexpr TypedWhichId SCHATTR_STAT_CONSTMINUS (SCHATTR_STAT_START + 5); +inline constexpr TypedWhichId SCHATTR_STAT_INDICATE (SCHATTR_STAT_START + 6); +inline constexpr TypedWhichId SCHATTR_STAT_RANGE_POS (SCHATTR_STAT_START + 7); +inline constexpr TypedWhichId SCHATTR_STAT_RANGE_NEG (SCHATTR_STAT_START + 8); +inline constexpr TypedWhichId SCHATTR_STAT_ERRORBAR_TYPE (SCHATTR_STAT_START + 9); +inline constexpr sal_uInt16 SCHATTR_STAT_END (SCHATTR_STAT_ERRORBAR_TYPE); // these attributes are for replacement of enum eChartStyle -constexpr sal_uInt16 SCHATTR_STYLE_START (SCHATTR_STAT_END + 1); +inline constexpr sal_uInt16 SCHATTR_STYLE_START (SCHATTR_STAT_END + 1); // for whole chart -constexpr TypedWhichId SCHATTR_STYLE_DEEP (SCHATTR_STYLE_START ); -constexpr TypedWhichId SCHATTR_STYLE_3D (SCHATTR_STYLE_START + 1); -constexpr TypedWhichId SCHATTR_STYLE_VERTICAL (SCHATTR_STYLE_START + 2); +inline constexpr TypedWhichId SCHATTR_STYLE_DEEP (SCHATTR_STYLE_START ); +inline constexpr TypedWhichId SCHATTR_STYLE_3D (SCHATTR_STYLE_START + 1); +inline constexpr TypedWhichId SCHATTR_STYLE_VERTICAL (SCHATTR_STYLE_START + 2); // also for series -constexpr TypedWhichId SCHATTR_STYLE_BASETYPE (SCHATTR_STYLE_START + 3);// Line,Area,...,Pie -constexpr TypedWhichId SCHATTR_STYLE_LINES (SCHATTR_STYLE_START + 4);// draw line -constexpr TypedWhichId SCHATTR_STYLE_PERCENT (SCHATTR_STYLE_START + 5); -constexpr TypedWhichId SCHATTR_STYLE_STACKED (SCHATTR_STYLE_START + 6); -constexpr TypedWhichId SCHATTR_STYLE_SPLINES (SCHATTR_STYLE_START + 7); +inline constexpr TypedWhichId SCHATTR_STYLE_BASETYPE (SCHATTR_STYLE_START + 3);// Line,Area,...,Pie +inline constexpr TypedWhichId SCHATTR_STYLE_LINES (SCHATTR_STYLE_START + 4);// draw line +inline constexpr TypedWhichId SCHATTR_STYLE_PERCENT (SCHATTR_STYLE_START + 5); +inline constexpr TypedWhichId SCHATTR_STYLE_STACKED (SCHATTR_STYLE_START + 6); +inline constexpr TypedWhichId SCHATTR_STYLE_SPLINES (SCHATTR_STYLE_START + 7); // also for data point -constexpr TypedWhichId SCHATTR_STYLE_SYMBOL (SCHATTR_STYLE_START + 8); -constexpr TypedWhichId SCHATTR_STYLE_SHAPE (SCHATTR_STYLE_START + 9); -constexpr sal_uInt16 SCHATTR_STYLE_END (SCHATTR_STYLE_SHAPE ); +inline constexpr TypedWhichId SCHATTR_STYLE_SYMBOL (SCHATTR_STYLE_START + 8); +inline constexpr TypedWhichId SCHATTR_STYLE_SHAPE (SCHATTR_STYLE_START + 9); +inline constexpr sal_uInt16 SCHATTR_STYLE_END (SCHATTR_STYLE_SHAPE ); -constexpr TypedWhichId SCHATTR_AXIS (SCHATTR_STYLE_END + 1); // see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. +inline constexpr TypedWhichId SCHATTR_AXIS (SCHATTR_STYLE_END + 1); // see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. //Re-mapped: -constexpr sal_uInt16 SCHATTR_AXIS_START (SCHATTR_AXIS + 1); +inline constexpr sal_uInt16 SCHATTR_AXIS_START (SCHATTR_AXIS + 1); //axis scale -constexpr TypedWhichId SCHATTR_AXISTYPE (SCHATTR_AXIS_START); -constexpr TypedWhichId SCHATTR_AXIS_REVERSE (SCHATTR_AXIS_START + 1); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_MIN (SCHATTR_AXIS_START + 2); -constexpr TypedWhichId SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 3); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 4); -constexpr TypedWhichId SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 5); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 6); -constexpr TypedWhichId SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 7); -constexpr TypedWhichId SCHATTR_AXIS_MAIN_TIME_UNIT (SCHATTR_AXIS_START + 8); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 9); -constexpr TypedWhichId SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 10); -constexpr TypedWhichId SCHATTR_AXIS_HELP_TIME_UNIT (SCHATTR_AXIS_START + 11); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_TIME_RESOLUTION (SCHATTR_AXIS_START + 12); -constexpr TypedWhichId SCHATTR_AXIS_TIME_RESOLUTION (SCHATTR_AXIS_START + 13); -constexpr TypedWhichId SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 14); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_DATEAXIS (SCHATTR_AXIS_START + 15); -constexpr TypedWhichId SCHATTR_AXIS_ALLOW_DATEAXIS (SCHATTR_AXIS_START + 16); -constexpr TypedWhichId SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 17); -constexpr TypedWhichId SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 18); +inline constexpr TypedWhichId SCHATTR_AXISTYPE (SCHATTR_AXIS_START); +inline constexpr TypedWhichId SCHATTR_AXIS_REVERSE (SCHATTR_AXIS_START + 1); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_MIN (SCHATTR_AXIS_START + 2); +inline constexpr TypedWhichId SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 3); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 4); +inline constexpr TypedWhichId SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 5); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 6); +inline constexpr TypedWhichId SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 7); +inline constexpr TypedWhichId SCHATTR_AXIS_MAIN_TIME_UNIT (SCHATTR_AXIS_START + 8); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 9); +inline constexpr TypedWhichId SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 10); +inline constexpr TypedWhichId SCHATTR_AXIS_HELP_TIME_UNIT (SCHATTR_AXIS_START + 11); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_TIME_RESOLUTION (SCHATTR_AXIS_START + 12); +inline constexpr TypedWhichId SCHATTR_AXIS_TIME_RESOLUTION (SCHATTR_AXIS_START + 13); +inline constexpr TypedWhichId SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 14); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_DATEAXIS (SCHATTR_AXIS_START + 15); +inline constexpr TypedWhichId SCHATTR_AXIS_ALLOW_DATEAXIS (SCHATTR_AXIS_START + 16); +inline constexpr TypedWhichId SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 17); +inline constexpr TypedWhichId SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 18); //axis position -constexpr sal_uInt16 SCHATTR_AXIS_POSITION_START (SCHATTR_AXIS_ORIGIN + 1); -constexpr TypedWhichId SCHATTR_AXIS_TICKS (SCHATTR_AXIS_POSITION_START); -constexpr TypedWhichId SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_POSITION_START + 1); -constexpr TypedWhichId SCHATTR_AXIS_POSITION (SCHATTR_AXIS_POSITION_START + 2); -constexpr TypedWhichId SCHATTR_AXIS_POSITION_VALUE (SCHATTR_AXIS_POSITION_START + 3); -constexpr TypedWhichId SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT (SCHATTR_AXIS_POSITION_START + 4); -constexpr TypedWhichId SCHATTR_AXIS_SHIFTED_CATEGORY_POSITION (SCHATTR_AXIS_POSITION_START + 5); -constexpr TypedWhichId SCHATTR_AXIS_LABEL_POSITION (SCHATTR_AXIS_POSITION_START + 6); -constexpr TypedWhichId SCHATTR_AXIS_MARK_POSITION (SCHATTR_AXIS_POSITION_START + 7); +inline constexpr sal_uInt16 SCHATTR_AXIS_POSITION_START (SCHATTR_AXIS_ORIGIN + 1); +inline constexpr TypedWhichId SCHATTR_AXIS_TICKS (SCHATTR_AXIS_POSITION_START); +inline constexpr TypedWhichId SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_POSITION_START + 1); +inline constexpr TypedWhichId SCHATTR_AXIS_POSITION (SCHATTR_AXIS_POSITION_START + 2); +inline constexpr TypedWhichId SCHATTR_AXIS_POSITION_VALUE (SCHATTR_AXIS_POSITION_START + 3); +inline constexpr TypedWhichId SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT (SCHATTR_AXIS_POSITION_START + 4); +inline constexpr TypedWhichId SCHATTR_AXIS_SHIFTED_CATEGORY_POSITION (SCHATTR_AXIS_POSITION_START + 5); +inline constexpr TypedWhichId SCHATTR_AXIS_LABEL_POSITION (SCHATTR_AXIS_POSITION_START + 6); +inline constexpr TypedWhichId SCHATTR_AXIS_MARK_POSITION (SCHATTR_AXIS_POSITION_START + 7); //axis label -constexpr sal_uInt16 SCHATTR_AXIS_LABEL_START (SCHATTR_AXIS_MARK_POSITION + 1); -constexpr TypedWhichId SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_LABEL_START); -constexpr TypedWhichId SCHATTR_AXIS_LABEL_ORDER (SCHATTR_AXIS_LABEL_START + 1); -constexpr TypedWhichId SCHATTR_AXIS_LABEL_OVERLAP (SCHATTR_AXIS_LABEL_START + 2); -constexpr TypedWhichId SCHATTR_AXIS_LABEL_BREAK (SCHATTR_AXIS_LABEL_START + 3); -constexpr sal_uInt16 SCHATTR_AXIS_LABEL_END (SCHATTR_AXIS_LABEL_BREAK); +inline constexpr sal_uInt16 SCHATTR_AXIS_LABEL_START (SCHATTR_AXIS_MARK_POSITION + 1); +inline constexpr TypedWhichId SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_LABEL_START); +inline constexpr TypedWhichId SCHATTR_AXIS_LABEL_ORDER (SCHATTR_AXIS_LABEL_START + 1); +inline constexpr TypedWhichId SCHATTR_AXIS_LABEL_OVERLAP (SCHATTR_AXIS_LABEL_START + 2); +inline constexpr TypedWhichId SCHATTR_AXIS_LABEL_BREAK (SCHATTR_AXIS_LABEL_START + 3); +inline constexpr sal_uInt16 SCHATTR_AXIS_LABEL_END (SCHATTR_AXIS_LABEL_BREAK); -constexpr sal_uInt16 SCHATTR_AXIS_END (SCHATTR_AXIS_LABEL_END); +inline constexpr sal_uInt16 SCHATTR_AXIS_END (SCHATTR_AXIS_LABEL_END); -constexpr TypedWhichId SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1); -constexpr TypedWhichId SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2); -constexpr TypedWhichId SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3); -constexpr TypedWhichId SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4); -constexpr TypedWhichId SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY (SCHATTR_AXIS_END + 5); +inline constexpr TypedWhichId SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1); +inline constexpr TypedWhichId SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2); +inline constexpr TypedWhichId SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3); +inline constexpr TypedWhichId SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4); +inline constexpr TypedWhichId SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY (SCHATTR_AXIS_END + 5); // non persistent items (binary format) -constexpr sal_uInt16 SCHATTR_CHARTTYPE_START (SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY + 1); +inline constexpr sal_uInt16 SCHATTR_CHARTTYPE_START (SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY + 1); // new from New Chart -constexpr TypedWhichId SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ); -constexpr TypedWhichId SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1); -constexpr TypedWhichId SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2); -constexpr TypedWhichId SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3); -constexpr TypedWhichId SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4); -constexpr TypedWhichId SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5); -constexpr TypedWhichId SCHATTR_GROUP_BARS_PER_AXIS (SCHATTR_CHARTTYPE_START + 6); -constexpr TypedWhichId SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 7); -constexpr TypedWhichId SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 8); -constexpr TypedWhichId SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 9); -constexpr TypedWhichId SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10); -constexpr TypedWhichId SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 11); -constexpr TypedWhichId SCHATTR_HIDE_LEGEND_ENTRY (SCHATTR_CHARTTYPE_START + 12); +inline constexpr TypedWhichId SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ); +inline constexpr TypedWhichId SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1); +inline constexpr TypedWhichId SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2); +inline constexpr TypedWhichId SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3); +inline constexpr TypedWhichId SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4); +inline constexpr TypedWhichId SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5); +inline constexpr TypedWhichId SCHATTR_GROUP_BARS_PER_AXIS (SCHATTR_CHARTTYPE_START + 6); +inline constexpr TypedWhichId SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 7); +inline constexpr TypedWhichId SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 8); +inline constexpr TypedWhichId SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 9); +inline constexpr TypedWhichId SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10); +inline constexpr TypedWhichId SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 11); +inline constexpr TypedWhichId SCHATTR_HIDE_LEGEND_ENTRY (SCHATTR_CHARTTYPE_START + 12); -constexpr sal_uInt16 SCHATTR_CHARTTYPE_END (SCHATTR_HIDE_LEGEND_ENTRY); +inline constexpr sal_uInt16 SCHATTR_CHARTTYPE_END (SCHATTR_HIDE_LEGEND_ENTRY); // items for transporting information to dialogs -constexpr sal_uInt16 SCHATTR_MISC_START (SCHATTR_CHARTTYPE_END + 1); -constexpr TypedWhichId SCHATTR_AXIS_FOR_ALL_SERIES (SCHATTR_MISC_START); -constexpr sal_uInt16 SCHATTR_MISC_END (SCHATTR_AXIS_FOR_ALL_SERIES); +inline constexpr sal_uInt16 SCHATTR_MISC_START (SCHATTR_CHARTTYPE_END + 1); +inline constexpr TypedWhichId SCHATTR_AXIS_FOR_ALL_SERIES (SCHATTR_MISC_START); +inline constexpr sal_uInt16 SCHATTR_MISC_END (SCHATTR_AXIS_FOR_ALL_SERIES); // regression curve -constexpr sal_uInt16 SCHATTR_REGRESSION_START (SCHATTR_MISC_END + 1); -constexpr TypedWhichId SCHATTR_REGRESSION_TYPE (SCHATTR_REGRESSION_START); -constexpr TypedWhichId SCHATTR_REGRESSION_SHOW_EQUATION (SCHATTR_REGRESSION_START + 1); -constexpr TypedWhichId SCHATTR_REGRESSION_SHOW_COEFF (SCHATTR_REGRESSION_START + 2); -constexpr TypedWhichId SCHATTR_REGRESSION_DEGREE (SCHATTR_REGRESSION_START + 3); -constexpr TypedWhichId SCHATTR_REGRESSION_PERIOD (SCHATTR_REGRESSION_START + 4); -constexpr TypedWhichId SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD (SCHATTR_REGRESSION_START + 5); -constexpr TypedWhichId SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD (SCHATTR_REGRESSION_START + 6); -constexpr TypedWhichId SCHATTR_REGRESSION_SET_INTERCEPT (SCHATTR_REGRESSION_START + 7); -constexpr TypedWhichId SCHATTR_REGRESSION_INTERCEPT_VALUE (SCHATTR_REGRESSION_START + 8); -constexpr TypedWhichId SCHATTR_REGRESSION_CURVE_NAME (SCHATTR_REGRESSION_START + 9); -constexpr TypedWhichId SCHATTR_REGRESSION_XNAME (SCHATTR_REGRESSION_START + 10); -constexpr TypedWhichId SCHATTR_REGRESSION_YNAME (SCHATTR_REGRESSION_START + 11); -constexpr TypedWhichId SCHATTR_REGRESSION_MOVING_TYPE (SCHATTR_REGRESSION_START + 12); -constexpr sal_uInt16 SCHATTR_REGRESSION_END (SCHATTR_REGRESSION_MOVING_TYPE); +inline constexpr sal_uInt16 SCHATTR_REGRESSION_START (SCHATTR_MISC_END + 1); +inline constexpr TypedWhichId SCHATTR_REGRESSION_TYPE (SCHATTR_REGRESSION_START); +inline constexpr TypedWhichId SCHATTR_REGRESSION_SHOW_EQUATION (SCHATTR_REGRESSION_START + 1); +inline constexpr TypedWhichId SCHATTR_REGRESSION_SHOW_COEFF (SCHATTR_REGRESSION_START + 2); +inline constexpr TypedWhichId SCHATTR_REGRESSION_DEGREE (SCHATTR_REGRESSION_START + 3); +inline constexpr TypedWhichId SCHATTR_REGRESSION_PERIOD (SCHATTR_REGRESSION_START + 4); +inline constexpr TypedWhichId SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD (SCHATTR_REGRESSION_START + 5); +inline constexpr TypedWhichId SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD (SCHATTR_REGRESSION_START + 6); +inline constexpr TypedWhichId SCHATTR_REGRESSION_SET_INTERCEPT (SCHATTR_REGRESSION_START + 7); +inline constexpr TypedWhichId SCHATTR_REGRESSION_INTERCEPT_VALUE (SCHATTR_REGRESSION_START + 8); +inline constexpr TypedWhichId SCHATTR_REGRESSION_CURVE_NAME (SCHATTR_REGRESSION_START + 9); +inline constexpr TypedWhichId SCHATTR_REGRESSION_XNAME (SCHATTR_REGRESSION_START + 10); +inline constexpr TypedWhichId SCHATTR_REGRESSION_YNAME (SCHATTR_REGRESSION_START + 11); +inline constexpr TypedWhichId SCHATTR_REGRESSION_MOVING_TYPE (SCHATTR_REGRESSION_START + 12); +inline constexpr sal_uInt16 SCHATTR_REGRESSION_END (SCHATTR_REGRESSION_MOVING_TYPE); -constexpr sal_uInt16 SCHATTR_DATA_TABLE_START (SCHATTR_REGRESSION_END + 1); -constexpr TypedWhichId SCHATTR_DATA_TABLE_HORIZONTAL_BORDER (SCHATTR_DATA_TABLE_START + 0); -constexpr TypedWhichId SCHATTR_DATA_TABLE_VERTICAL_BORDER (SCHATTR_DATA_TABLE_START + 1); -constexpr TypedWhichId SCHATTR_DATA_TABLE_OUTLINE (SCHATTR_DATA_TABLE_START + 2); -constexpr TypedWhichId SCHATTR_DATA_TABLE_KEYS (SCHATTR_DATA_TABLE_START + 3); -constexpr sal_uInt16 SCHATTR_DATA_TABLE_END (SCHATTR_DATA_TABLE_KEYS); +inline constexpr sal_uInt16 SCHATTR_DATA_TABLE_START (SCHATTR_REGRESSION_END + 1); +inline constexpr TypedWhichId SCHATTR_DATA_TABLE_HORIZONTAL_BORDER (SCHATTR_DATA_TABLE_START + 0); +inline constexpr TypedWhichId SCHATTR_DATA_TABLE_VERTICAL_BORDER (SCHATTR_DATA_TABLE_START + 1); +inline constexpr TypedWhichId SCHATTR_DATA_TABLE_OUTLINE (SCHATTR_DATA_TABLE_START + 2); +inline constexpr TypedWhichId SCHATTR_DATA_TABLE_KEYS (SCHATTR_DATA_TABLE_START + 3); +inline constexpr sal_uInt16 SCHATTR_DATA_TABLE_END (SCHATTR_DATA_TABLE_KEYS); -constexpr sal_uInt16 SCHATTR_END (SCHATTR_DATA_TABLE_END); +inline constexpr sal_uInt16 SCHATTR_END (SCHATTR_DATA_TABLE_END); // values for Items diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index bbd5dd61fab2..c3c4e0be9cc6 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -98,6 +98,7 @@ enum PROP_DIAGRAM_3DRELATIVEHEIGHT, PROP_DIAGRAM_DATATABLEHBORDER, PROP_DIAGRAM_OF_PIE_TYPE, + PROP_DIAGRAM_SPLIT_POS, PROP_DIAGRAM_DATATABLEVBORDER, PROP_DIAGRAM_DATATABLEOUTLINE, PROP_DIAGRAM_EXTERNALDATA @@ -188,6 +189,10 @@ void lcl_AddPropertiesToVector( PROP_DIAGRAM_OF_PIE_TYPE, cppu::UnoType::get(), beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "SplitPos", + PROP_DIAGRAM_SPLIT_POS, + cppu::UnoType::get(), + beans::PropertyAttribute::MAYBEVOID ); rOutProperties.emplace_back( "ExternalData", PROP_DIAGRAM_EXTERNALDATA, cppu::UnoType::get(), @@ -209,6 +214,7 @@ const ::chart::tPropertyValueMap& StaticDiagramDefaults() ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aMap, PROP_DIAGRAM_3DRELATIVEHEIGHT, 100 ); ::chart::PropertyHelper::setPropertyValueDefault< chart2::PieChartSubType >( aMap, PROP_DIAGRAM_OF_PIE_TYPE, chart2::PieChartSubType_NONE); + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aMap, PROP_DIAGRAM_SPLIT_POS, 2 ); ::chart::SceneProperties::AddDefaultsToMap( aMap ); return aMap; }(); diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index b81e47ee3884..deb70d9aa03c 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -396,52 +396,52 @@ rtl::Reference< ::chart::ChartTypeTemplate > ChartTypeManager::createTemplate( case TEMPLATE_PIE: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_NONE, false, - chart2::PieChartSubType_NONE, 2 )); + chart2::PieChartSubType_NONE, 3, 2)); break; case TEMPLATE_PIEALLEXPLODED: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_ALL_EXPLODED, false, - chart2::PieChartSubType_NONE, 2 )); + chart2::PieChartSubType_NONE, 3, 2 )); break; case TEMPLATE_DONUT: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_NONE, true, - chart2::PieChartSubType_NONE, 2 )); + chart2::PieChartSubType_NONE, 3, 2 )); break; case TEMPLATE_DONUTALLEXPLODED: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_ALL_EXPLODED, true, - chart2::PieChartSubType_NONE, 2 )); + chart2::PieChartSubType_NONE, 3, 2 )); break; case TEMPLATE_BAROFPIE: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_NONE, false, - chart2::PieChartSubType_BAR, 2 )); + chart2::PieChartSubType_BAR, 3, 2 )); break; case TEMPLATE_PIEOFPIE: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_NONE, false, - chart2::PieChartSubType_PIE, 2 )); + chart2::PieChartSubType_PIE, 3, 2 )); break; case TEMPLATE_THREEDPIE: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_NONE, false, - chart2::PieChartSubType_NONE, 3 )); + chart2::PieChartSubType_NONE, 3, 3 )); break; case TEMPLATE_THREEDPIEALLEXPLODED: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_ALL_EXPLODED, false, - chart2::PieChartSubType_NONE, 3 )); + chart2::PieChartSubType_NONE, 3, 3 )); break; case TEMPLATE_THREEDDONUT: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_NONE, true, - chart2::PieChartSubType_NONE, 3 )); + chart2::PieChartSubType_NONE, 3, 3 )); break; case TEMPLATE_THREEDDONUTALLEXPLODED: xTemplate.set( new PieChartTypeTemplate( m_xContext, aServiceSpecifier, chart2::PieChartOffsetMode_ALL_EXPLODED, true, - chart2::PieChartSubType_NONE, 3 )); + chart2::PieChartSubType_NONE, 3, 3 )); break; case TEMPLATE_SCATTERLINESYMBOL: diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 265a5a97058a..46991f23e37a 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -317,13 +317,13 @@ bool ChartTypeTemplate::matchesTemplate2( for( std::size_t nCooSysIdx=0; bResult && (nCooSysIdx < aCooSysSeq.size()); ++nCooSysIdx ) { // match dimension - bResult = bResult && (aCooSysSeq[nCooSysIdx]->getDimension() == nDimensionToMatch); + bResult = aCooSysSeq[nCooSysIdx]->getDimension() == nDimensionToMatch; const std::vector< rtl::Reference< ChartType > > & aChartTypeSeq( aCooSysSeq[nCooSysIdx]->getChartTypes2()); for( std::size_t nCTIdx=0; bResult && (nCTIdx < aChartTypeSeq.size()); ++nCTIdx ) { // match chart type - bResult = bResult && aChartTypeSeq[nCTIdx]->getChartType() == aChartTypeToMatch; + bResult = aChartTypeSeq[nCTIdx]->getChartType() == aChartTypeToMatch; bool bFound=false; bool bAmbiguous=false; // match stacking mode @@ -508,7 +508,7 @@ void ChartTypeTemplate::createCoordinateSystems( { bool bOk = true; for( std::size_t i=0; bOk && igetCoordinateSystemType() == aCoordinateSystems[i]->getCoordinateSystemType() && + bOk = ( xCooSys->getCoordinateSystemType() == aCoordinateSystems[i]->getCoordinateSystemType() && (xCooSys->getDimension() == aCoordinateSystems[i]->getDimension()) ); // coordinate systems are ok if( bOk ) diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 224b37a88865..36f9a59d0862 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -47,7 +47,7 @@ namespace ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, ::chart::PROP_PIECHARTTYPE_USE_RINGS, false ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aOutMap, ::chart::PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, 100 ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, ::chart::PROP_PIECHARTTYPE_SUBTYPE, chart2::PieChartSubType_NONE ); - ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aOutMap, ::chart::PROP_PIECHARTTYPE_COMPOSITESIZE, 2 ); + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aOutMap, ::chart::PROP_PIECHARTTYPE_SPLIT_POS, 2 ); return aOutMap; }(); return aStaticDefaults; @@ -72,8 +72,8 @@ namespace ::chart::PROP_PIECHARTTYPE_SUBTYPE, cppu::UnoType::get(), beans::PropertyAttribute::MAYBEDEFAULT }, - { u"CompositeSize"_ustr, - ::chart::PROP_PIECHARTTYPE_COMPOSITESIZE, + { u"SplitPos"_ustr, + ::chart::PROP_PIECHARTTYPE_SPLIT_POS, cppu::UnoType::get(), beans::PropertyAttribute::MAYBEVOID } }; diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index cc5c0c0ed09f..0cdeb48ecfce 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -56,7 +56,7 @@ enum PROP_PIE_TEMPLATE_DIMENSION, PROP_PIE_TEMPLATE_USE_RINGS, PROP_PIE_TEMPLATE_SUB_PIE_TYPE, - PROP_PIE_TEMPLATE_COMPOSITE_SIZE + PROP_PIE_TEMPLATE_SPLIT_POS }; ::chart::tPropertyValueMap& StaticPieChartTypeTemplateDefaults() @@ -69,7 +69,8 @@ enum ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aOutMap, PROP_PIE_TEMPLATE_DIMENSION, 2 ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_PIE_TEMPLATE_USE_RINGS, false ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_PIE_TEMPLATE_SUB_PIE_TYPE, chart2::PieChartSubType_NONE ); - ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aOutMap, PROP_PIE_TEMPLATE_COMPOSITE_SIZE, 2 ); + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( + aOutMap, PROP_PIE_TEMPLATE_SPLIT_POS, 2 ); return aOutMap; }(); return aStaticDefaults; @@ -106,8 +107,8 @@ enum cppu::UnoType::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT }, - { u"CompositeSize"_ustr, - PROP_PIE_TEMPLATE_COMPOSITE_SIZE, + { u"SplitPos"_ustr, + PROP_PIE_TEMPLATE_SPLIT_POS, cppu::UnoType::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT } @@ -140,6 +141,7 @@ PieChartTypeTemplate::PieChartTypeTemplate( chart2::PieChartOffsetMode eMode, bool bRings, chart2::PieChartSubType eSubType, + sal_Int32 nCompositeSize, sal_Int32 nDim /* = 2 */ ) : ChartTypeTemplate( xContext, rServiceName ) { @@ -147,7 +149,7 @@ PieChartTypeTemplate::PieChartTypeTemplate( setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DIMENSION, uno::Any( nDim )); setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS, uno::Any( bRings )); setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_SUB_PIE_TYPE, uno::Any( eSubType )); - setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_COMPOSITE_SIZE, uno::Any( sal_Int32(2) )); + setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_SPLIT_POS, uno::Any( nCompositeSize )); } PieChartTypeTemplate::~PieChartTypeTemplate() @@ -274,7 +276,8 @@ void PieChartTypeTemplate::createChartTypes( xCT->setFastPropertyValue( PROP_PIECHARTTYPE_SUBTYPE, getFastPropertyValue( PROP_PIE_TEMPLATE_SUB_PIE_TYPE )); // "SubType" xCT->setFastPropertyValue( - PROP_PIECHARTTYPE_COMPOSITESIZE, getFastPropertyValue( PROP_PIE_TEMPLATE_COMPOSITE_SIZE )); // "CompositeSize" + PROP_PIECHARTTYPE_SPLIT_POS, getFastPropertyValue( + PROP_PIE_TEMPLATE_SPLIT_POS )); // "CompositeSize" rCoordSys[0]->setChartTypes( std::vector{xCT} ); if( !aSeriesSeq.empty() ) diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index c7b3b9b6951c..d95b8c49d900 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -39,6 +39,7 @@ public: css::chart2::PieChartOffsetMode eMode, bool bRings, css::chart2::PieChartSubType eSubType, + sal_Int32 nCompositeSize, sal_Int32 nDim ); virtual ~PieChartTypeTemplate() override; diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 4bda2129817d..82ed7f32f6d4 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -195,7 +195,7 @@ PieChart::PieChart( const rtl::Reference& xChartTypeModel , m_bUseRings(false) , m_bSizeExcludesLabelsAndExplodedSegments(bExcludingPositioning) , m_eSubType(PieChartSubType_NONE) - , m_nCompositeSize(2) + , m_nSplitPos(2) , m_fMaxOffset(std::numeric_limits::quiet_NaN()) { PlotterBase::m_pPosHelper = &m_aPosHelper; @@ -230,7 +230,7 @@ PieChart::PieChart( const rtl::Reference& xChartTypeModel } try { - xChartTypeModel->getFastPropertyValue(PROP_PIECHARTTYPE_COMPOSITESIZE) >>= m_nCompositeSize; // "CompositeSize" + xChartTypeModel->getFastPropertyValue(PROP_PIECHARTTYPE_SPLIT_POS) >>= m_nSplitPos; // "CompositeSize" } catch( const uno::Exception& ) { @@ -1050,7 +1050,7 @@ void PieChart::createShapes() PieDataSrcBase *pDataSrc = nullptr; PieDataSrc normalPieSrc; - OfPieDataSrc ofPieSrc(m_nCompositeSize); + OfPieDataSrc ofPieSrc(m_nSplitPos); // Default to regular pie if too few points for of-pie ::css::chart2::PieChartSubType eSubType = @@ -2303,26 +2303,25 @@ uno::Reference< beans::XPropertySet > PieDataSrc::getProps( // class OfPieDataSrc //======================= -// For now, just implement the default Excel behavior, which is that the -// right pie consists of the last three entries in the series. Other -// behaviors should be supported later. +// Support data splits only of the type "last n entries go in right subchart", +// for now. // TODO sal_Int32 OfPieDataSrc::getNPoints(const VDataSeries* pSeries, enum SubPieType eType) const { if (eType == SubPieType::LEFT) { - return pSeries->getTotalPointCount() - m_nCompositeSize + 1; + return pSeries->getTotalPointCount() - m_nSplitPos + 1; } else { assert(eType == SubPieType::RIGHT); - return m_nCompositeSize; + return m_nSplitPos; } } double OfPieDataSrc::getData(const VDataSeries* pSeries, sal_Int32 nPtIdx, enum SubPieType eType) const { - const sal_Int32 n = pSeries->getTotalPointCount() - m_nCompositeSize; + const sal_Int32 n = pSeries->getTotalPointCount() - m_nSplitPos; if (eType == SubPieType::LEFT) { // nPtIdx should be in [0, n] if (nPtIdx < n) { @@ -2331,7 +2330,7 @@ double OfPieDataSrc::getData(const VDataSeries* pSeries, sal_Int32 nPtIdx, // composite wedge assert(nPtIdx == n); double total = 0; - for (sal_Int32 i = n; i < n + m_nCompositeSize; ++i) { + for (sal_Int32 i = n; i < n + m_nSplitPos; ++i) { total += pSeries->getYValue(i); } return total; @@ -2347,7 +2346,7 @@ uno::Reference< beans::XPropertySet > OfPieDataSrc::getProps( enum SubPieType eType) const { const sal_Int32 nPts = pSeries->getTotalPointCount(); - const sal_Int32 n = nPts - m_nCompositeSize; + const sal_Int32 n = nPts - m_nSplitPos; if (eType == SubPieType::LEFT) { // nPtIdx should be in [0, n] if (nPtIdx < n) { diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index c5cb1e535cc8..b2fa3b8982ec 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -101,8 +101,8 @@ public: class OfPieDataSrc : public PieDataSrcBase { public: - OfPieDataSrc(sal_Int32 nCompositeSize): - m_nCompositeSize(nCompositeSize) + OfPieDataSrc(sal_Int32 nSplitPos): + m_nSplitPos(nSplitPos) {} // Minimum sensible number of data points @@ -118,7 +118,7 @@ public: const VDataSeries* pSeries, sal_Int32 nPtIdx, enum SubPieType eType) const; private: - sal_Int32 m_nCompositeSize; + double m_nSplitPos; }; //======================= @@ -276,7 +276,7 @@ private: //member bool m_bSizeExcludesLabelsAndExplodedSegments; ::css::chart2::PieChartSubType m_eSubType; // Number of entries in an of-pie composite wedge - sal_Int32 m_nCompositeSize; + double m_nSplitPos; struct PieLabelInfo { diff --git a/chart2/source/view/main/SeriesPlotterContainer.cxx b/chart2/source/view/main/SeriesPlotterContainer.cxx index 43b62ae747ad..8ad97c3d1717 100644 --- a/chart2/source/view/main/SeriesPlotterContainer.cxx +++ b/chart2/source/view/main/SeriesPlotterContainer.cxx @@ -154,6 +154,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart sal_Int32 nStartingAngle = 90; sal_Int32 n3DRelativeHeight = 100; PieChartSubType ePieChartSubType = PieChartSubType_NONE; + double nSplitPos = 2; try { xDiagram->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= bSortByXValues; @@ -167,6 +168,8 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart xDiagram->getPropertyValue(u"3DRelativeHeight"_ustr) >>= n3DRelativeHeight; } xDiagram->getPropertyValue(u"SubPieType"_ustr) >>= ePieChartSubType; + + xDiagram->getPropertyValue(u"SplitPos"_ustr) >>= nSplitPos; } catch (const uno::Exception&) { @@ -234,6 +237,9 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart uno::Any(ePieChartSubType)); // Reset the diagram-level property so it's not persistent. xDiagram->setPropertyValue(u"SubPieType"_ustr, uno::Any(PieChartSubType_NONE)); + + xChartType->setFastPropertyValue(PROP_PIECHARTTYPE_SPLIT_POS, uno::Any(nSplitPos)); + //xDiagram->setPropertyValue(u"SplitPos"_ustr, uno::Any(nSplitPos)); } if (nT == 0) diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 81d41e83bbc7..b821c1f5206a 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1098,7 +1098,7 @@ rtl::Reference //so we need to translate the object via transformation matrix //Matrix for position - if (!rPolyPolygon.empty() && !rPolyPolygon[0].empty()) + if (!rPolyPolygon[0].empty()) { basegfx::B3DHomMatrix aM; aM.translate(0, 0, rPolyPolygon[0][0].PositionZ); diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 159aaa65248d..85a43d6a779b 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -70,12 +70,15 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/container/NamedPropertyValuesContainer \ comphelper/source/container/container \ comphelper/source/container/containermultiplexer \ - comphelper/source/container/interfacecontainer2 \ + comphelper/source/container/interfacecontainer2 \ comphelper/source/container/embeddedobjectcontainer \ comphelper/source/container/enumerablemap \ comphelper/source/container/enumhelper \ comphelper/source/container/namecontainer \ comphelper/source/crypto/Crypto \ + $(if $(filter NSS,$(TLS)), comphelper/source/crypto/Crypto_NSS) \ + $(if $(filter OPENSSL,$(TLS)), comphelper/source/crypto/Crypto_OpenSSL) \ + $(if $(filter NSS OPENSSL,$(TLS)),,comphelper/source/crypto/Crypto_None) \ comphelper/source/eventattachermgr/eventattachermgr \ comphelper/source/misc/accessiblecomponenthelper \ comphelper/source/misc/accessibleeventnotifier \ diff --git a/comphelper/qa/unit/CryptoTest.cxx b/comphelper/qa/unit/CryptoTest.cxx index 2b0dac47416f..4c7603d88eb6 100644 --- a/comphelper/qa/unit/CryptoTest.cxx +++ b/comphelper/qa/unit/CryptoTest.cxx @@ -30,17 +30,9 @@ public: NSS_Shutdown(); #endif } - - void testCryptoHash(); - void testRoundUp(); - - CPPUNIT_TEST_SUITE(CryptoTest); - CPPUNIT_TEST(testCryptoHash); - CPPUNIT_TEST(testRoundUp); - CPPUNIT_TEST_SUITE_END(); }; -void CryptoTest::testCryptoHash() +CPPUNIT_TEST_FIXTURE(CryptoTest, testCryptoHash) { // Check examples from Wikipedia (https://en.wikipedia.org/wiki/HMAC) OString aContentString("The quick brown fox jumps over the lazy dog"_ostr); @@ -84,7 +76,7 @@ void CryptoTest::testCryptoHash() } } -void CryptoTest::testRoundUp() +CPPUNIT_TEST_FIXTURE(CryptoTest, testRoundUp) { CPPUNIT_ASSERT_EQUAL(16, comphelper::roundUp(16, 16)); CPPUNIT_ASSERT_EQUAL(32, comphelper::roundUp(32, 16)); @@ -95,6 +87,102 @@ void CryptoTest::testRoundUp() CPPUNIT_ASSERT_EQUAL(32, comphelper::roundUp(31, 16)); } -CPPUNIT_TEST_SUITE_REGISTRATION(CryptoTest); +CPPUNIT_TEST_FIXTURE(CryptoTest, testEncrypt_AES256_CBC) +{ + std::vector key = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, 0x21, 0x22, + 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, 0x31, 0x32 }; + + std::vector iv = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 }; + + std::vector original = { 's', 'e', 'c', 'r', 'e', 't', '\0' }; + + std::vector encrypted(original.size()); + + { + sal_uInt32 nWrittenSize = 0; + comphelper::Encrypt aEncryptor(key, iv, comphelper::CryptoType::AES_256_CBC); + nWrittenSize = aEncryptor.update(encrypted, original); + + // nothing should be written as the size of the input is not a multiple of block size + CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), nWrittenSize); + } + + { + sal_uInt32 nWrittenSize = 0; + comphelper::Encrypt aEncryptor(key, iv, comphelper::CryptoType::AES_256_CBC); + + original.resize(16, 0); // apply padding to make it multiple of block size + encrypted.resize(16, 0); + + CPPUNIT_ASSERT_EQUAL(std::string("73656372657400000000000000000000"), + comphelper::hashToString(original)); + + nWrittenSize = aEncryptor.update(encrypted, original); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(16), nWrittenSize); + + CPPUNIT_ASSERT_EQUAL(std::string("e75cb91a34377c09c354c24fcef345a6"), + comphelper::hashToString(encrypted)); + + std::vector decrypted(encrypted.size(), 0); + + comphelper::Decrypt aDecryptor(key, iv, comphelper::CryptoType::AES_256_CBC); + nWrittenSize = aDecryptor.update(decrypted, encrypted); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(16), nWrittenSize); + + CPPUNIT_ASSERT_EQUAL(std::string("73656372657400000000000000000000"), + comphelper::hashToString(decrypted)); + } +} + +CPPUNIT_TEST_FIXTURE(CryptoTest, testEncrypt_AES256_ECB) +{ + std::vector key = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, 0x21, 0x22, + 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, 0x31, 0x32 }; + + std::vector iv = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 }; + + std::vector original = { 's', 'e', 'c', 'r', 'e', 't', '\0' }; + + std::vector encrypted(original.size()); + + { + sal_uInt32 nWrittenSize = 0; + comphelper::Encrypt aEncryptor(key, iv, comphelper::CryptoType::AES_256_ECB); + nWrittenSize = aEncryptor.update(encrypted, original); + + // nothing should be written as the size of the input is not a multiple of block size + CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), nWrittenSize); + } + + { + sal_uInt32 nWrittenSize = 0; + comphelper::Encrypt aEncryptor(key, iv, comphelper::CryptoType::AES_256_ECB); + + original.resize(16, 0); // apply padding to make it multiple of block size + encrypted.resize(16, 0); + + CPPUNIT_ASSERT_EQUAL(std::string("73656372657400000000000000000000"), + comphelper::hashToString(original)); + + nWrittenSize = aEncryptor.update(encrypted, original); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(16), nWrittenSize); + + CPPUNIT_ASSERT_EQUAL(std::string("abf7abec9a6b58c089e902397c47ac49"), + comphelper::hashToString(encrypted)); + + std::vector decrypted(encrypted.size(), 0); + + comphelper::Decrypt aDecryptor(key, iv, comphelper::CryptoType::AES_256_ECB); + nWrittenSize = aDecryptor.update(decrypted, encrypted); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(16), nWrittenSize); + + CPPUNIT_ASSERT_EQUAL(std::string("73656372657400000000000000000000"), + comphelper::hashToString(decrypted)); + } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/crypto/Crypto.cxx b/comphelper/source/crypto/Crypto.cxx index 9a90f0aa0553..faf1da7307f9 100644 --- a/comphelper/source/crypto/Crypto.cxx +++ b/comphelper/source/crypto/Crypto.cxx @@ -5,444 +5,34 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * */ #include #include #include - #include -#if USE_TLS_OPENSSL -#include -#include -#include -#endif // USE_TLS_OPENSSL - -#if USE_TLS_NSS -#include -#include -#include -#endif // USE_TLS_NSS - namespace comphelper { -#if USE_TLS_OPENSSL - -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - -static HMAC_CTX* HMAC_CTX_new(void) -{ - HMAC_CTX* pContext = new HMAC_CTX; - HMAC_CTX_init(pContext); - return pContext; -} - -static void HMAC_CTX_free(HMAC_CTX* pContext) -{ - HMAC_CTX_cleanup(pContext); - delete pContext; -} -#endif - -namespace -{ -struct cipher_delete -{ - void operator()(EVP_CIPHER_CTX* p) { EVP_CIPHER_CTX_free(p); } -}; - -struct hmac_delete -{ - SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_CTX_free' is deprecated - void - operator()(HMAC_CTX* p) - { - HMAC_CTX_free(p); - } - SAL_WNODEPRECATED_DECLARATIONS_POP -}; -} - -struct CryptoImpl -{ - std::unique_ptr mpContext; - std::unique_ptr mpHmacContext; - - CryptoImpl() = default; - - void setupEncryptContext(std::vector& key, std::vector& iv, - CryptoType eType) - { - mpContext.reset(EVP_CIPHER_CTX_new()); - EVP_CIPHER_CTX_init(mpContext.get()); - - const EVP_CIPHER* cipher = getCipher(eType); - if (cipher == nullptr) - return; - - if (iv.empty()) - EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), nullptr); - else - EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), iv.data()); - EVP_CIPHER_CTX_set_padding(mpContext.get(), 0); - } - - void setupDecryptContext(std::vector& key, std::vector& iv, - CryptoType eType) - { - mpContext.reset(EVP_CIPHER_CTX_new()); - EVP_CIPHER_CTX_init(mpContext.get()); - - const EVP_CIPHER* pCipher = getCipher(eType); - if (pCipher == nullptr) - return; - - const size_t nMinKeySize = EVP_CIPHER_key_length(pCipher); - if (key.size() < nMinKeySize) - key.resize(nMinKeySize, 0); - - if (iv.empty()) - EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), nullptr); - else - { - const size_t nMinIVSize = EVP_CIPHER_iv_length(pCipher); - if (iv.size() < nMinIVSize) - iv.resize(nMinIVSize, 0); - - EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), iv.data()); - } - EVP_CIPHER_CTX_set_padding(mpContext.get(), 0); - } - - void setupCryptoHashContext(std::vector& rKey, CryptoHashType eType) - { - SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_CTX_new' is deprecated - mpHmacContext.reset(HMAC_CTX_new()); - SAL_WNODEPRECATED_DECLARATIONS_POP - const EVP_MD* aEvpMd = nullptr; - switch (eType) - { - case CryptoHashType::SHA1: - aEvpMd = EVP_sha1(); - break; - case CryptoHashType::SHA256: - aEvpMd = EVP_sha256(); - break; - case CryptoHashType::SHA384: - aEvpMd = EVP_sha384(); - break; - case CryptoHashType::SHA512: - aEvpMd = EVP_sha512(); - break; - } - SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_Init_ex' is deprecated - HMAC_Init_ex(mpHmacContext.get(), rKey.data(), rKey.size(), aEvpMd, nullptr); - SAL_WNODEPRECATED_DECLARATIONS_POP - } - - ~CryptoImpl() - { - if (mpContext) - EVP_CIPHER_CTX_cleanup(mpContext.get()); - } - - static const EVP_CIPHER* getCipher(CryptoType type) - { - switch (type) - { - case CryptoType::AES_128_ECB: - return EVP_aes_128_ecb(); - case CryptoType::AES_128_CBC: - return EVP_aes_128_cbc(); - case CryptoType::AES_256_CBC: - return EVP_aes_256_cbc(); - default: - break; - } - return nullptr; - } -}; - -#elif USE_TLS_NSS - -#define MAX_WRAPPED_KEY_LEN 128 - -struct CryptoImpl -{ - PK11SlotInfo* mSlot; - PK11Context* mContext; - SECItem* mSecParam; - PK11SymKey* mSymKey; - PK11Context* mWrapKeyContext; - PK11SymKey* mWrapKey; - - CryptoImpl() - : mSlot(nullptr) - , mContext(nullptr) - , mSecParam(nullptr) - , mSymKey(nullptr) - , mWrapKeyContext(nullptr) - , mWrapKey(nullptr) - { - // Initialize NSS, database functions are not needed - if (!NSS_IsInitialized()) - { - auto const e = NSS_NoDB_Init(nullptr); - if (e != SECSuccess) - { - PRErrorCode error = PR_GetError(); - const char* errorText = PR_ErrorToName(error); - throw css::uno::RuntimeException( - "NSS_NoDB_Init failed with " - + OUString(errorText, strlen(errorText), RTL_TEXTENCODING_UTF8) + " (" - + OUString::number(static_cast(error)) + ")"); - } - } - } - - ~CryptoImpl() - { - if (mContext) - PK11_DestroyContext(mContext, PR_TRUE); - if (mSecParam) - SECITEM_FreeItem(mSecParam, PR_TRUE); - if (mSymKey) - PK11_FreeSymKey(mSymKey); - if (mWrapKeyContext) - PK11_DestroyContext(mWrapKeyContext, PR_TRUE); - if (mWrapKey) - PK11_FreeSymKey(mWrapKey); - if (mSlot) - PK11_FreeSlot(mSlot); - } - - PK11SymKey* ImportSymKey(CK_MECHANISM_TYPE mechanism, CK_ATTRIBUTE_TYPE operation, SECItem* key) - { - mSymKey = PK11_ImportSymKey(mSlot, mechanism, PK11_OriginUnwrap, operation, key, nullptr); - if (!mSymKey) //rhbz#1614419 maybe failed due to FIPS, use rhbz#1461450 style workaround - { - /* - * Without FIPS it would be possible to just use - * mSymKey = PK11_ImportSymKey( mSlot, mechanism, PK11_OriginUnwrap, CKA_ENCRYPT, &keyItem, nullptr ); - * with FIPS NSS Level 2 certification has to be "workarounded" (so it becomes Level 1) by using - * following method: - * 1. Generate wrap key - * 2. Encrypt authkey with wrap key - * 3. Unwrap encrypted authkey using wrap key - */ - - /* - * Generate wrapping key - */ - CK_MECHANISM_TYPE wrap_mechanism = PK11_GetBestWrapMechanism(mSlot); - int wrap_key_len = PK11_GetBestKeyLength(mSlot, wrap_mechanism); - mWrapKey = PK11_KeyGen(mSlot, wrap_mechanism, nullptr, wrap_key_len, nullptr); - if (!mWrapKey) - throw css::uno::RuntimeException(u"PK11_KeyGen SymKey failure"_ustr, - css::uno::Reference()); - - /* - * Encrypt authkey with wrapping key - */ - - /* - * Initialization of IV is not needed because PK11_GetBestWrapMechanism should return ECB mode - */ - SECItem tmp_sec_item = {}; - mWrapKeyContext - = PK11_CreateContextBySymKey(wrap_mechanism, CKA_ENCRYPT, mWrapKey, &tmp_sec_item); - if (!mWrapKeyContext) - throw css::uno::RuntimeException(u"PK11_CreateContextBySymKey failure"_ustr, - css::uno::Reference()); - - unsigned char wrapped_key_data[MAX_WRAPPED_KEY_LEN]; - int wrapped_key_len = sizeof(wrapped_key_data); - - if (PK11_CipherOp(mWrapKeyContext, wrapped_key_data, &wrapped_key_len, - sizeof(wrapped_key_data), key->data, key->len) - != SECSuccess) - { - throw css::uno::RuntimeException(u"PK11_CipherOp failure"_ustr, - css::uno::Reference()); - } - - if (PK11_Finalize(mWrapKeyContext) != SECSuccess) - throw css::uno::RuntimeException(u"PK11_Finalize failure"_ustr, - css::uno::Reference()); - - /* - * Finally unwrap sym key - */ - SECItem wrapped_key = {}; - wrapped_key.data = wrapped_key_data; - wrapped_key.len = wrapped_key_len; - - mSymKey = PK11_UnwrapSymKey(mWrapKey, wrap_mechanism, &tmp_sec_item, &wrapped_key, - mechanism, operation, key->len); - } - return mSymKey; - } - - void setupEncryptContext(std::vector& key, std::vector& iv, - CryptoType type) - { - setupCryptoContext(key, iv, type, CKA_ENCRYPT); - } - - void setupDecryptContext(std::vector& key, std::vector& iv, - CryptoType type) - { - setupCryptoContext(key, iv, type, CKA_DECRYPT); - } - - void setupCryptoContext(std::vector& key, std::vector& iv, - CryptoType type, CK_ATTRIBUTE_TYPE operation) - { - CK_MECHANISM_TYPE mechanism = static_cast(-1); - - SECItem ivItem; - ivItem.type = siBuffer; - if (iv.empty()) - ivItem.data = nullptr; - else - ivItem.data = iv.data(); - ivItem.len = iv.size(); - - SECItem* pIvItem = nullptr; - - switch (type) - { - case CryptoType::AES_128_ECB: - mechanism = CKM_AES_ECB; - break; - case CryptoType::AES_128_CBC: - mechanism = CKM_AES_CBC; - pIvItem = &ivItem; - break; - case CryptoType::AES_256_CBC: - mechanism = CKM_AES_CBC; - pIvItem = &ivItem; - break; - default: - break; - } - - mSlot = PK11_GetBestSlot(mechanism, nullptr); - - if (!mSlot) - throw css::uno::RuntimeException(u"NSS Slot failure"_ustr, - css::uno::Reference()); - - SECItem keyItem; - keyItem.type = siBuffer; - keyItem.data = key.data(); - keyItem.len = key.size(); - - mSymKey = ImportSymKey(mechanism, CKA_ENCRYPT, &keyItem); - if (!mSymKey) - throw css::uno::RuntimeException(u"NSS SymKey failure"_ustr, - css::uno::Reference()); - - mSecParam = PK11_ParamFromIV(mechanism, pIvItem); - mContext = PK11_CreateContextBySymKey(mechanism, operation, mSymKey, mSecParam); - } - - void setupCryptoHashContext(std::vector& rKey, CryptoHashType eType) - { - CK_MECHANISM_TYPE aMechanism = static_cast(-1); - - switch (eType) - { - case CryptoHashType::SHA1: - aMechanism = CKM_SHA_1_HMAC; - break; - case CryptoHashType::SHA256: - aMechanism = CKM_SHA256_HMAC; - break; - case CryptoHashType::SHA384: - aMechanism = CKM_SHA384_HMAC; - break; - case CryptoHashType::SHA512: - aMechanism = CKM_SHA512_HMAC; - break; - } - - mSlot = PK11_GetBestSlot(aMechanism, nullptr); - - if (!mSlot) - throw css::uno::RuntimeException(u"NSS Slot failure"_ustr, - css::uno::Reference()); - - SECItem aKeyItem; - aKeyItem.data = rKey.data(); - aKeyItem.len = rKey.size(); - - mSymKey = ImportSymKey(aMechanism, CKA_SIGN, &aKeyItem); - if (!mSymKey) - throw css::uno::RuntimeException(u"NSS SymKey failure"_ustr, - css::uno::Reference()); - - SECItem param; - param.data = nullptr; - param.len = 0; - mContext = PK11_CreateContextBySymKey(aMechanism, CKA_SIGN, mSymKey, ¶m); - } -}; -#else -struct CryptoImpl -{ -}; -#endif - Crypto::Crypto() - : mpImpl(std::make_unique()) + : mpImpl(ICryptoImplementation::createInstance()) { } - -Crypto::~Crypto() {} +Crypto::~Crypto() = default; // DECRYPT Decrypt::Decrypt(std::vector& key, std::vector& iv, CryptoType type) { -#if USE_TLS_OPENSSL + USE_TLS_NSS == 0 - (void)key; - (void)iv; - (void)type; -#else mpImpl->setupDecryptContext(key, iv, type); -#endif } sal_uInt32 Decrypt::update(std::vector& output, std::vector& input, sal_uInt32 inputLength) { - int outputLength = 0; - -#if USE_TLS_OPENSSL + USE_TLS_NSS > 0 sal_uInt32 actualInputLength = inputLength == 0 || inputLength > input.size() ? input.size() : inputLength; -#else - (void)output; - (void)input; - (void)inputLength; -#endif - -#if USE_TLS_OPENSSL - (void)EVP_DecryptUpdate(mpImpl->mpContext.get(), output.data(), &outputLength, input.data(), - actualInputLength); -#endif // USE_TLS_OPENSSL - -#if USE_TLS_NSS - if (!mpImpl->mContext) - return 0; - (void)PK11_CipherOp(mpImpl->mContext, output.data(), &outputLength, actualInputLength, - input.data(), actualInputLength); -#endif // USE_TLS_NSS - - return static_cast(outputLength); + return mpImpl->decryptUpdate(output, input, actualInputLength); } sal_uInt32 Decrypt::aes128ecb(std::vector& output, std::vector& input, @@ -459,40 +49,15 @@ sal_uInt32 Decrypt::aes128ecb(std::vector& output, std::vector& key, std::vector& iv, CryptoType type) { -#if USE_TLS_OPENSSL + USE_TLS_NSS == 0 - (void)key; - (void)iv; - (void)type; -#else mpImpl->setupEncryptContext(key, iv, type); -#endif } sal_uInt32 Encrypt::update(std::vector& output, std::vector& input, sal_uInt32 inputLength) { - int outputLength = 0; - -#if USE_TLS_OPENSSL + USE_TLS_NSS > 0 sal_uInt32 actualInputLength = inputLength == 0 || inputLength > input.size() ? input.size() : inputLength; -#else - (void)output; - (void)input; - (void)inputLength; -#endif - -#if USE_TLS_OPENSSL - (void)EVP_EncryptUpdate(mpImpl->mpContext.get(), output.data(), &outputLength, input.data(), - actualInputLength); -#endif // USE_TLS_OPENSSL - -#if USE_TLS_NSS - (void)PK11_CipherOp(mpImpl->mContext, output.data(), &outputLength, actualInputLength, - input.data(), actualInputLength); -#endif // USE_TLS_NSS - - return static_cast(outputLength); + return mpImpl->encryptUpdate(output, input, actualInputLength); } // CryptoHash - HMAC @@ -520,52 +85,20 @@ sal_Int32 getSizeForHashType(CryptoHashType eType) CryptoHash::CryptoHash(std::vector& rKey, CryptoHashType eType) : mnHashSize(getSizeForHashType(eType)) { -#if USE_TLS_OPENSSL + USE_TLS_NSS > 0 mpImpl->setupCryptoHashContext(rKey, eType); - -#if USE_TLS_NSS - PK11_DigestBegin(mpImpl->mContext); -#endif - -#else - (void)rKey; -#endif } bool CryptoHash::update(std::vector& rInput, sal_uInt32 nInputLength) { -#if USE_TLS_OPENSSL + USE_TLS_NSS > 0 sal_uInt32 nActualInputLength = (nInputLength == 0 || nInputLength > rInput.size()) ? rInput.size() : nInputLength; -#else - (void)rInput; - (void)nInputLength; -#endif - -#if USE_TLS_OPENSSL - SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_Update' is deprecated - return HMAC_Update(mpImpl->mpHmacContext.get(), rInput.data(), nActualInputLength) - != 0; - SAL_WNODEPRECATED_DECLARATIONS_POP -#elif USE_TLS_NSS - return PK11_DigestOp(mpImpl->mContext, rInput.data(), nActualInputLength) == SECSuccess; -#else - return false; // ??? -#endif + return mpImpl->cryptoHashUpdate(rInput, nActualInputLength); } std::vector CryptoHash::finalize() { std::vector aHash(mnHashSize, 0); -#if USE_TLS_OPENSSL - unsigned int nSizeWritten = 0; - SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_Final' is deprecated - (void) HMAC_Final(mpImpl->mpHmacContext.get(), aHash.data(), &nSizeWritten); - SAL_WNODEPRECATED_DECLARATIONS_POP -#elif USE_TLS_NSS - unsigned int nSizeWritten = 0; - PK11_DigestFinal(mpImpl->mContext, aHash.data(), &nSizeWritten, aHash.size()); -#endif + mpImpl->cryptoHashFinalize(aHash); return aHash; } diff --git a/comphelper/source/crypto/Crypto_NSS.cxx b/comphelper/source/crypto/Crypto_NSS.cxx new file mode 100644 index 000000000000..4f850735a42f --- /dev/null +++ b/comphelper/source/crypto/Crypto_NSS.cxx @@ -0,0 +1,295 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include +#include + +#include +#include +#include + +namespace comphelper +{ +namespace +{ +#define MAX_WRAPPED_KEY_LEN 128 + +class CryptoImplementationNSS : public ICryptoImplementation +{ + PK11SlotInfo* mSlot; + PK11Context* mContext; + SECItem* mSecParam; + PK11SymKey* mSymKey; + PK11Context* mWrapKeyContext; + PK11SymKey* mWrapKey; + +public: + CryptoImplementationNSS() + : mSlot(nullptr) + , mContext(nullptr) + , mSecParam(nullptr) + , mSymKey(nullptr) + , mWrapKeyContext(nullptr) + , mWrapKey(nullptr) + { + // Initialize NSS, database functions are not needed + if (!NSS_IsInitialized()) + { + auto const e = NSS_NoDB_Init(nullptr); + if (e != SECSuccess) + { + PRErrorCode error = PR_GetError(); + const char* errorText = PR_ErrorToName(error); + throw css::uno::RuntimeException( + "NSS_NoDB_Init failed with " + + OUString(errorText, strlen(errorText), RTL_TEXTENCODING_UTF8) + " (" + + OUString::number(static_cast(error)) + ")"); + } + } + } + + virtual ~CryptoImplementationNSS() + { + if (mContext) + PK11_DestroyContext(mContext, PR_TRUE); + if (mSecParam) + SECITEM_FreeItem(mSecParam, PR_TRUE); + if (mSymKey) + PK11_FreeSymKey(mSymKey); + if (mWrapKeyContext) + PK11_DestroyContext(mWrapKeyContext, PR_TRUE); + if (mWrapKey) + PK11_FreeSymKey(mWrapKey); + if (mSlot) + PK11_FreeSlot(mSlot); + } + + PK11SymKey* ImportSymKey(CK_MECHANISM_TYPE mechanism, CK_ATTRIBUTE_TYPE operation, SECItem* key) + { + mSymKey = PK11_ImportSymKey(mSlot, mechanism, PK11_OriginUnwrap, operation, key, nullptr); + if (!mSymKey) //rhbz#1614419 maybe failed due to FIPS, use rhbz#1461450 style workaround + { + /* + * Without FIPS it would be possible to just use + * mSymKey = PK11_ImportSymKey( mSlot, mechanism, PK11_OriginUnwrap, CKA_ENCRYPT, &keyItem, nullptr ); + * with FIPS NSS Level 2 certification has to be "workarounded" (so it becomes Level 1) by using + * following method: + * 1. Generate wrap key + * 2. Encrypt authkey with wrap key + * 3. Unwrap encrypted authkey using wrap key + */ + + /* + * Generate wrapping key + */ + CK_MECHANISM_TYPE wrap_mechanism = PK11_GetBestWrapMechanism(mSlot); + int wrap_key_len = PK11_GetBestKeyLength(mSlot, wrap_mechanism); + mWrapKey = PK11_KeyGen(mSlot, wrap_mechanism, nullptr, wrap_key_len, nullptr); + if (!mWrapKey) + throw css::uno::RuntimeException(u"PK11_KeyGen SymKey failure"_ustr, + css::uno::Reference()); + + /* + * Encrypt authkey with wrapping key + */ + + /* + * Initialization of IV is not needed because PK11_GetBestWrapMechanism should return ECB mode + */ + SECItem tmp_sec_item = {}; + mWrapKeyContext + = PK11_CreateContextBySymKey(wrap_mechanism, CKA_ENCRYPT, mWrapKey, &tmp_sec_item); + if (!mWrapKeyContext) + throw css::uno::RuntimeException(u"PK11_CreateContextBySymKey failure"_ustr, + css::uno::Reference()); + + unsigned char wrapped_key_data[MAX_WRAPPED_KEY_LEN]; + int wrapped_key_len = sizeof(wrapped_key_data); + + if (PK11_CipherOp(mWrapKeyContext, wrapped_key_data, &wrapped_key_len, + sizeof(wrapped_key_data), key->data, key->len) + != SECSuccess) + { + throw css::uno::RuntimeException(u"PK11_CipherOp failure"_ustr, + css::uno::Reference()); + } + + if (PK11_Finalize(mWrapKeyContext) != SECSuccess) + throw css::uno::RuntimeException(u"PK11_Finalize failure"_ustr, + css::uno::Reference()); + + /* + * Finally unwrap sym key + */ + SECItem wrapped_key = {}; + wrapped_key.data = wrapped_key_data; + wrapped_key.len = wrapped_key_len; + + mSymKey = PK11_UnwrapSymKey(mWrapKey, wrap_mechanism, &tmp_sec_item, &wrapped_key, + mechanism, operation, key->len); + } + return mSymKey; + } + + void setupEncryptContext(std::vector& key, std::vector& iv, + CryptoType type) override + { + setupCryptoContext(key, iv, type, CKA_ENCRYPT); + } + + void setupDecryptContext(std::vector& key, std::vector& iv, + CryptoType type) override + { + setupCryptoContext(key, iv, type, CKA_DECRYPT); + } + + void setupCryptoContext(std::vector& key, std::vector& iv, + CryptoType type, CK_ATTRIBUTE_TYPE operation) + { + CK_MECHANISM_TYPE mechanism = static_cast(-1); + + SECItem ivItem; + ivItem.type = siBuffer; + if (iv.empty()) + ivItem.data = nullptr; + else + ivItem.data = iv.data(); + ivItem.len = iv.size(); + + SECItem* pIvItem = nullptr; + + switch (type) + { + case CryptoType::AES_128_ECB: + case CryptoType::AES_256_ECB: + mechanism = CKM_AES_ECB; + break; + case CryptoType::AES_128_CBC: + mechanism = CKM_AES_CBC; + pIvItem = &ivItem; + break; + case CryptoType::AES_256_CBC: + mechanism = CKM_AES_CBC; + pIvItem = &ivItem; + break; + default: + break; + } + + mSlot = PK11_GetBestSlot(mechanism, nullptr); + + if (!mSlot) + throw css::uno::RuntimeException(u"NSS Slot failure"_ustr, + css::uno::Reference()); + + SECItem keyItem; + keyItem.type = siBuffer; + keyItem.data = key.data(); + keyItem.len = key.size(); + + mSymKey = ImportSymKey(mechanism, CKA_ENCRYPT, &keyItem); + if (!mSymKey) + throw css::uno::RuntimeException(u"NSS SymKey failure"_ustr, + css::uno::Reference()); + + mSecParam = PK11_ParamFromIV(mechanism, pIvItem); + mContext = PK11_CreateContextBySymKey(mechanism, operation, mSymKey, mSecParam); + } + + void setupCryptoHashContext(std::vector& rKey, CryptoHashType eType) override + { + CK_MECHANISM_TYPE aMechanism = static_cast(-1); + + switch (eType) + { + case CryptoHashType::SHA1: + aMechanism = CKM_SHA_1_HMAC; + break; + case CryptoHashType::SHA256: + aMechanism = CKM_SHA256_HMAC; + break; + case CryptoHashType::SHA384: + aMechanism = CKM_SHA384_HMAC; + break; + case CryptoHashType::SHA512: + aMechanism = CKM_SHA512_HMAC; + break; + } + + mSlot = PK11_GetBestSlot(aMechanism, nullptr); + + if (!mSlot) + throw css::uno::RuntimeException(u"NSS Slot failure"_ustr, + css::uno::Reference()); + + SECItem aKeyItem; + aKeyItem.data = rKey.data(); + aKeyItem.len = rKey.size(); + + mSymKey = ImportSymKey(aMechanism, CKA_SIGN, &aKeyItem); + if (!mSymKey) + throw css::uno::RuntimeException(u"NSS SymKey failure"_ustr, + css::uno::Reference()); + + SECItem param; + param.data = nullptr; + param.len = 0; + mContext = PK11_CreateContextBySymKey(aMechanism, CKA_SIGN, mSymKey, ¶m); + + // Also call digest to begin + PK11_DigestBegin(mContext); + } + + sal_uInt32 decryptUpdate(std::vector& output, std::vector& input, + sal_uInt32 inputLength) override + { + if (!mContext) + return 0; + int outputLength = 0; + (void)PK11_CipherOp(mContext, output.data(), &outputLength, inputLength, input.data(), + inputLength); + return outputLength; + } + + sal_uInt32 encryptUpdate(std::vector& output, std::vector& input, + sal_uInt32 inputLength) override + { + if (!mContext) + return 0; + int outputLength = 0; + (void)PK11_CipherOp(mContext, output.data(), &outputLength, inputLength, input.data(), + inputLength); + return outputLength; + } + + bool cryptoHashUpdate(std::vector& rInput, sal_uInt32 nInputLength) override + { + return PK11_DigestOp(mContext, rInput.data(), nInputLength) == SECSuccess; + } + + bool cryptoHashFinalize(std::vector& rHash) override + { + unsigned int nSizeWritten = 0; + PK11_DigestFinal(mContext, rHash.data(), &nSizeWritten, rHash.size()); + return nSizeWritten == rHash.size(); + } +}; + +} // anonymous namespace + +std::shared_ptr ICryptoImplementation::createInstance() +{ + return std::shared_ptr(new CryptoImplementationNSS); +} + +} // namespace comphelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/crypto/Crypto_None.cxx b/comphelper/source/crypto/Crypto_None.cxx new file mode 100644 index 000000000000..b1c2d9712e51 --- /dev/null +++ b/comphelper/source/crypto/Crypto_None.cxx @@ -0,0 +1,67 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include + +namespace comphelper +{ +namespace +{ +class CryptoImplementationNone : public ICryptoImplementation +{ +public: + CryptoImplementationNone() = default; + + virtual ~CryptoImplementationNone() {} + + void setupEncryptContext(std::vector& /*key*/, std::vector& /*iv*/, + CryptoType /*eType*/) override + { + } + + void setupDecryptContext(std::vector& /*key*/, std::vector& /*iv*/, + CryptoType /*eType*/) override + { + } + + void setupCryptoHashContext(std::vector& /*rKey*/, CryptoHashType /*eType*/) override + { + } + + sal_uInt32 decryptUpdate(std::vector& /*output*/, std::vector& /*input*/, + sal_uInt32 /*inputLength*/) override + { + return 0; + } + + sal_uInt32 encryptUpdate(std::vector& /*output*/, std::vector& /*input*/, + sal_uInt32 /*inputLength*/) override + { + return 0; + } + + bool cryptoHashUpdate(std::vector& /*rInput*/, sal_uInt32 /*nInputLength*/) override + { + return false; + } + + bool cryptoHashFinalize(std::vector& /*rHash*/) override { return false; } +}; +} // anonymous namespace + +std::shared_ptr ICryptoImplementation::createInstance() +{ + return std::shared_ptr(new CryptoImplementationNone); +} + +} // namespace comphelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/crypto/Crypto_OpenSSL.cxx b/comphelper/source/crypto/Crypto_OpenSSL.cxx new file mode 100644 index 000000000000..37c5ff44e222 --- /dev/null +++ b/comphelper/source/crypto/Crypto_OpenSSL.cxx @@ -0,0 +1,208 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include + +#include +#include +#include + +namespace comphelper +{ +namespace +{ +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + +static HMAC_CTX* HMAC_CTX_new(void) +{ + HMAC_CTX* pContext = new HMAC_CTX; + HMAC_CTX_init(pContext); + return pContext; +} + +static void HMAC_CTX_free(HMAC_CTX* pContext) +{ + HMAC_CTX_cleanup(pContext); + delete pContext; +} +#endif + +namespace +{ +struct cipher_delete +{ + void operator()(EVP_CIPHER_CTX* p) { EVP_CIPHER_CTX_free(p); } +}; + +struct hmac_delete +{ + SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_CTX_free' is deprecated + void + operator()(HMAC_CTX* p) + { + HMAC_CTX_free(p); + } + SAL_WNODEPRECATED_DECLARATIONS_POP +}; +} + +class CryptoImplementationOpenSSL : public ICryptoImplementation +{ + std::unique_ptr mpContext; + std::unique_ptr mpHmacContext; + +public: + CryptoImplementationOpenSSL() = default; + + virtual ~CryptoImplementationOpenSSL() + { + if (mpContext) + EVP_CIPHER_CTX_cleanup(mpContext.get()); + } + + void setupEncryptContext(std::vector& key, std::vector& iv, + CryptoType eType) override + { + mpContext.reset(EVP_CIPHER_CTX_new()); + EVP_CIPHER_CTX_init(mpContext.get()); + + const EVP_CIPHER* cipher = getCipher(eType); + if (cipher == nullptr) + return; + + if (iv.empty()) + EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), nullptr); + else + EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), iv.data()); + EVP_CIPHER_CTX_set_padding(mpContext.get(), 0); + } + + void setupDecryptContext(std::vector& key, std::vector& iv, + CryptoType eType) override + { + mpContext.reset(EVP_CIPHER_CTX_new()); + EVP_CIPHER_CTX_init(mpContext.get()); + + const EVP_CIPHER* pCipher = getCipher(eType); + if (pCipher == nullptr) + return; + + const size_t nMinKeySize = EVP_CIPHER_key_length(pCipher); + if (key.size() < nMinKeySize) + key.resize(nMinKeySize, 0); + + if (iv.empty()) + EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), nullptr); + else + { + const size_t nMinIVSize = EVP_CIPHER_iv_length(pCipher); + if (iv.size() < nMinIVSize) + iv.resize(nMinIVSize, 0); + + EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), iv.data()); + } + EVP_CIPHER_CTX_set_padding(mpContext.get(), 0); + } + + void setupCryptoHashContext(std::vector& rKey, CryptoHashType eType) override + { + SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_CTX_new' is deprecated + mpHmacContext.reset(HMAC_CTX_new()); + SAL_WNODEPRECATED_DECLARATIONS_POP + const EVP_MD* aEvpMd = nullptr; + switch (eType) + { + case CryptoHashType::SHA1: + aEvpMd = EVP_sha1(); + break; + case CryptoHashType::SHA256: + aEvpMd = EVP_sha256(); + break; + case CryptoHashType::SHA384: + aEvpMd = EVP_sha384(); + break; + case CryptoHashType::SHA512: + aEvpMd = EVP_sha512(); + break; + } + SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_Init_ex' is deprecated + HMAC_Init_ex(mpHmacContext.get(), rKey.data(), rKey.size(), aEvpMd, nullptr); + SAL_WNODEPRECATED_DECLARATIONS_POP + } + + static const EVP_CIPHER* getCipher(CryptoType type) + { + switch (type) + { + case CryptoType::AES_128_ECB: + return EVP_aes_128_ecb(); + case CryptoType::AES_256_ECB: + return EVP_aes_256_ecb(); + case CryptoType::AES_128_CBC: + return EVP_aes_128_cbc(); + case CryptoType::AES_256_CBC: + return EVP_aes_256_cbc(); + default: + break; + } + return nullptr; + } + + sal_uInt32 decryptUpdate(std::vector& output, std::vector& input, + sal_uInt32 inputLength) override + { + if (!mpContext) + return 0; + int outputLength = 0; + (void)EVP_DecryptUpdate(mpContext.get(), output.data(), &outputLength, input.data(), + inputLength); + return outputLength; + } + + sal_uInt32 encryptUpdate(std::vector& output, std::vector& input, + sal_uInt32 inputLength) override + { + if (!mpContext) + return 0; + int outputLength = 0; + (void)EVP_EncryptUpdate(mpContext.get(), output.data(), &outputLength, input.data(), + inputLength); + return sal_uInt32(outputLength); + } + + bool cryptoHashUpdate(std::vector& rInput, sal_uInt32 nInputLength) override + { + SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_Update' is deprecated + return HMAC_Update(mpHmacContext.get(), rInput.data(), nInputLength) + != 0; + SAL_WNODEPRECATED_DECLARATIONS_POP + } + + bool cryptoHashFinalize(std::vector& rHash) override + { + unsigned int nSizeWritten = 0; + SAL_WNODEPRECATED_DECLARATIONS_PUSH // 'HMAC_Final' is deprecated + (void) HMAC_Final(mpHmacContext.get(), rHash.data(), &nSizeWritten); + SAL_WNODEPRECATED_DECLARATIONS_POP + return nSizeWritten == rHash.size(); + } +}; + +} // anonymous namespace + +std::shared_ptr ICryptoImplementation::createInstance() +{ + return std::shared_ptr(new CryptoImplementationOpenSSL); +} + +} // namespace comphelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index 7866efc445d7..090769f1a2f6 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -152,8 +152,6 @@ include/svx/autoformathelper.hxx:216 _Bool AutoFormatBase::SaveBlockB(SvStream &,unsigned short) const include/svx/dlgctrl.hxx:99 Point SvxRectCtl::SetActualRPWithoutInvalidate(enum RectPoint) -include/svx/framelink.hxx:159 - svx::frame::Style & svx::frame::Style::MirrorSelf() include/svx/PaletteManager.hxx:87 _Bool PaletteManager::GetLumModOff(unsigned short,unsigned short,short &,short &) include/test/a11y/AccessibilityTools.hxx:119 diff --git a/config_host.mk.in b/config_host.mk.in index 78874b1ee149..4b7bf923a4b9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -134,6 +134,7 @@ export DCONF_LIBS=@DCONF_LIBS@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ +DISABLE_NAN_TESTS=@DISABLE_NAN_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DOCDIR=@DOCDIR@ diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 4790cdd4bd3c..86f2d0928dc6 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -529,10 +529,10 @@ Components::Components( sal_uInt32 nStartTime = osl_getGlobalTimer(); parseXcsXcuLayer(layer, url); SAL_INFO("configmgr", "parseXcsXcuLayer() took " << (osl_getGlobalTimer() - nStartTime) << " ms"); - layer += 2; //TODO: overflow + layer += 2; } else if (type == "bundledext") { parseXcsXcuIniLayer(layer, url, false); - layer += 2; //TODO: overflow + layer += 2; } else if (type == "sharedext") { if (sharedExtensionLayer_ != -1) { throw css::uno::RuntimeException( @@ -540,7 +540,7 @@ Components::Components( } sharedExtensionLayer_ = layer; parseXcsXcuIniLayer(layer, url, true); - layer += 2; //TODO: overflow + layer += 2; } else if (type == "userext") { if (userExtensionLayer_ != -1) { throw css::uno::RuntimeException( @@ -548,12 +548,12 @@ Components::Components( } userExtensionLayer_ = layer; parseXcsXcuIniLayer(layer, url, true); - layer += 2; //TODO: overflow + layer += 2; } else if (type == "res") { sal_uInt32 nStartTime = osl_getGlobalTimer(); parseResLayer(layer, url); SAL_INFO("configmgr", "parseResLayer() took " << (osl_getGlobalTimer() - nStartTime) << " ms"); - ++layer; //TODO: overflow + ++layer; #if ENABLE_DCONF } else if (type == "dconf") { if (url == "!") { @@ -566,7 +566,7 @@ Components::Components( "CONFIGURATION_LAYERS: unknown \"dconf\" kind \"" + url + "\""); } - ++layer; //TODO: overflow + ++layer; #endif #if defined(_WIN32) } else if (type == "winreg") { @@ -586,7 +586,7 @@ Components::Components( if (!getenv("SAL_CONFIG_WINREG_RETAIN_TMP")) osl::File::remove(aTempFileURL); } - ++layer; //TODO: overflow + ++layer; #endif } else if (type == "user") { bool write; @@ -625,7 +625,7 @@ Components::Components( } parseModificationLayer(write ? Data::NO_LAYER : layer, url); } - ++layer; //TODO: overflow + ++layer; } else { throw css::uno::RuntimeException( "CONFIGURATION_LAYERS: unknown layer type \"" + type + "\""); diff --git a/configure.ac b/configure.ac index 01cb56658cff..2a1063232fa4 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[25.2.0.0.alpha0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[25.2.0.0.alpha1+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard @@ -1895,6 +1895,11 @@ libo_FUZZ_ARG_ENABLE(cve-tests, [Prevent CVE tests to be executed]), ,) +libo_FUZZ_ARG_ENABLE(nan-tests, + AS_HELP_STRING([--disable-nan-tests], + [Prevent NaN payload tests to be executed]), +,) + AC_ARG_ENABLE(build-opensymbol, AS_HELP_STRING([--enable-build-opensymbol], [Do not use the prebuilt opens___.ttf. Build it instead. This needs @@ -4268,7 +4273,7 @@ map_vs_year_to_version() 2022) vsversion=17;; 2022preview) - vsversion=17.12;; + vsversion=17.13;; *) AC_MSG_ERROR([Assertion failure - invalid argument "$1" to map_vs_year_to_version()]);; esac @@ -4394,7 +4399,7 @@ find_msvc() vcyear=2019 vctoolset=v142 ;; - 17.0 | 17.12) + 17.0 | 17.13) vcyear=2022 vctoolset=v143 ;; @@ -4565,7 +4570,7 @@ if test "$_os" = "WINNT"; then # are always "better", we list them in reverse chronological order. case "$vcnumwithdot" in - 16.0 | 17.0 | 17.12) + 16.0 | 17.0 | 17.13) WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0" ;; esac @@ -7048,7 +7053,7 @@ find_msms() msmdir= case "$VCVER" in - 16.0 | 17.0 | 17.12) + 16.0 | 17.0 | 17.13) for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/" echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5 @@ -7084,7 +7089,7 @@ find_msvc_x64_dlls() msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" case "$VCVER" in - 16.0 | 17.0 | 17.12) + 16.0 | 17.0 | 17.13) for crtver in 141 142 143; do for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do echo "$as_me:$LINENO: testing $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5 @@ -11538,6 +11543,18 @@ else AC_MSG_RESULT([yes]) fi +dnl =================================================================== +dnl Check for disabling nan_tests +dnl =================================================================== +AC_MSG_CHECKING([whether to execute NaN payload tests]) +if test "$enable_nan_tests" = "no"; then + AC_MSG_RESULT([no]) + DISABLE_NAN_TESTS=TRUE + AC_SUBST(DISABLE_NAN_TESTS) +else + AC_MSG_RESULT([yes]) +fi + dnl =================================================================== dnl Check for system openssl dnl =================================================================== @@ -12248,7 +12265,7 @@ if test "$test_gtk3" = yes -a "x$enable_gtk3" = "xyes" -o "x$enable_gtk3_kde5" = add_warning 'Non-system cairo combined with gtk3 is known to cause trouble (eg. broken image in the splashscreen). Use --with-system-cairo unless you know what you are doing.' fi : ${with_system_cairo:=yes} - PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo) + PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo) GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" FilterLibs "${GTK3_LIBS}" diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index fca2c963eb33..ee260fdb33e5 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -659,14 +659,6 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName, { switch (::comphelper::getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) { - // put criteria depending on the Type as String or double in the variable - case DataType::CHAR: - case DataType::VARCHAR: - case DataType::LONGVARCHAR: - *(*m_aAssignValues)[nId] = ORowSetValue(aValue); - //Characterset is already converted, since the entire statement was converted - break; - case DataType::BIT: if (aValue.equalsIgnoreAsciiCase("TRUE") || aValue[0] == '1') *(*m_aAssignValues)[nId] = true; @@ -675,6 +667,10 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName, else throwFunctionSequenceException(*this); break; + case DataType::CHAR: + case DataType::VARCHAR: + case DataType::LONGVARCHAR: + //Characterset is already converted, since the entire statement was converted case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx index 99f4f95ecc9a..94cc42f77e4a 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx @@ -47,9 +47,7 @@ namespace cppcanvas::internal SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::CachedPrimitiveBase: 0x" << std::hex << this ); const rendering::ViewState aViewState( mpCanvas->getViewState() ); - ::basegfx::B2DHomMatrix aTotalTransform; - - ::canvas::tools::getViewStateTransform( aTotalTransform, + ::basegfx::B2DHomMatrix aTotalTransform = ::canvas::tools::getViewStateTransform( aViewState ); aTotalTransform *= rTransformation; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 4a041ee5de5a..381387080bd3 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2980,9 +2980,7 @@ namespace cppcanvas::internal // render subset of actions // ======================== - ::basegfx::B2DHomMatrix aMatrix; - ::canvas::tools::getRenderStateTransform( aMatrix, - getRenderState() ); + ::basegfx::B2DHomMatrix aMatrix = ::canvas::tools::getRenderStateTransform( getRenderState() ); ActionRenderer aRenderer( aMatrix ); @@ -3024,8 +3022,7 @@ namespace cppcanvas::internal // query bounds for subset of actions // ================================== - ::basegfx::B2DHomMatrix aMatrix; - ::canvas::tools::getRenderStateTransform( aMatrix, + ::basegfx::B2DHomMatrix aMatrix = ::canvas::tools::getRenderStateTransform( getRenderState() ); AreaQuery aQuery( aMatrix ); @@ -3043,8 +3040,7 @@ namespace cppcanvas::internal { SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::ImplRenderer::draw()" ); - ::basegfx::B2DHomMatrix aMatrix; - ::canvas::tools::getRenderStateTransform( aMatrix, + ::basegfx::B2DHomMatrix aMatrix = ::canvas::tools::getRenderStateTransform( getRenderState() ); try diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index dce2973bebca..e0ed0e94f222 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -634,9 +634,7 @@ namespace cppcanvas::tools viewState, renderState ); - ::basegfx::B2DRange aTransformedBounds; - return ::canvas::tools::calcTransformedRectBounds( aTransformedBounds, - rBounds, + return ::canvas::tools::calcTransformedRectBounds(rBounds, aTransform ); } diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index c3c1cfdf50f6..1f62c0bc30d9 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -176,12 +176,10 @@ namespace cppcanvas::internal // determine overall transformation matrix (render, view, // and passed transformation) - ::basegfx::B2DHomMatrix aTransform; - ::canvas::tools::getRenderStateTransform( aTransform, maState ); + ::basegfx::B2DHomMatrix aTransform = ::canvas::tools::getRenderStateTransform( maState ); aTransform = rTransformation * aTransform; - ::basegfx::B2DHomMatrix aTotalTransform; - ::canvas::tools::getViewStateTransform( aTotalTransform, mpCanvas->getViewState() ); + ::basegfx::B2DHomMatrix aTotalTransform = ::canvas::tools::getViewStateTransform( mpCanvas->getViewState() ); aTotalTransform = aTotalTransform * aTransform; // since pure translational changes to the transformation diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index 81b5a3759fd6..6f13f7452e65 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -55,9 +55,7 @@ namespace cppcanvas::internal ::basegfx::B2DHomMatrix ImplCanvas::getTransformation() const { - ::basegfx::B2DHomMatrix aMatrix; - return ::canvas::tools::getViewStateTransform( aMatrix, - maViewState ); + return ::canvas::tools::getViewStateTransform( maViewState ); } void ImplCanvas::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index e007aea1cfa3..d968cc45fb23 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -298,7 +298,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index 3e204ef7a719..1674f7299f9a 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -26,7 +26,6 @@ #define RID_CUISTR_KEY_TEMPLATE_PATH NC_("RID_SVXSTR_KEY_TEMPLATE_PATH", "Templates") #define RID_CUISTR_KEY_GLOSSARY_PATH NC_("RID_SVXSTR_KEY_GLOSSARY_PATH", "AutoText") #define RID_CUISTR_KEY_DICTIONARY_PATH NC_("RID_SVXSTR_KEY_DICTIONARY_PATH", "Dictionaries") -#define RID_CUISTR_KEY_HELP_DIR NC_("RID_SVXSTR_KEY_HELP_DIR", "Help") #define RID_CUISTR_KEY_GALLERY_DIR NC_("RID_SVXSTR_KEY_GALLERY_DIR", "Gallery") #define RID_CUISTR_KEY_TEMP_PATH NC_("RID_SVXSTR_KEY_TEMP_PATH", "Temporary files") #define RID_CUISTR_KEY_CLASSIFICATION_PATH NC_("RID_SVXSTR_KEY_CLASSIFICATION_PATH", "Classification") diff --git a/cui/inc/strings.hxx b/cui/inc/strings.hxx index 5b72f3873df4..870061ccbfa0 100644 --- a/cui/inc/strings.hxx +++ b/cui/inc/strings.hxx @@ -9,6 +9,4 @@ #pragma once -#define RID_SVXSTR_KEY_BASIC_PATH "BASIC" - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 9b79a931163f..3aaa07d6bb15 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2739,6 +2739,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window *pWindow, m_xTbSymbol->SetItemWidth(m_nExpectedSize); m_xTbSymbol->SetItemHeight(m_nExpectedSize); m_xTbSymbol->SetExtraSpacing(6); + m_xTbSymbol->SetMargin(4); Size aSize(m_xTbSymbol->CalcWindowSizePixel(Size(m_nExpectedSize, m_nExpectedSize), 11, 5)); m_xTbSymbol->set_size_request(aSize.Width(), aSize.Height()); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 279ed4c9f4c4..7ee6de654530 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1350,7 +1350,7 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) std::vector aAttribList; m_xEditEngine->GetCharAttribs(0, aAttribList); - auto nCursor = aCurrentSelection.nStartPos; + auto nCursor = aCurrentSelection.start.nIndex; const EECharAttrib* pBackAttr = FindCharAttrib(nCursor, EE_CHAR_BKGCOLOR, aAttribList); const EECharAttrib* pErrorAttr = FindCharAttrib(nCursor, EE_CHAR_GRABBAG, aAttribList); const EECharAttrib* pBackAttrLeft = nullptr; @@ -1361,21 +1361,21 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) if (bHasRange) { if (pBackAttr && - pBackAttr->nStart == aCurrentSelection.nStartPos && - pBackAttr->nEnd == aCurrentSelection.nEndPos) + pBackAttr->nStart == aCurrentSelection.start.nIndex && + pBackAttr->nEnd == aCurrentSelection.end.nIndex) { nSelectionType = FULL; } else if (pErrorAttr && - pErrorAttr->nStart <= aCurrentSelection.nStartPos && - pErrorAttr->nEnd >= aCurrentSelection.nEndPos) + pErrorAttr->nStart <= aCurrentSelection.start.nIndex && + pErrorAttr->nEnd >= aCurrentSelection.end.nIndex) { nSelectionType = INSIDE_YES; } else { nSelectionType = bHasField||bHasError ? BRACE : OUTSIDE_NO; - while (nCursor < aCurrentSelection.nEndPos) + while (nCursor < aCurrentSelection.end.nIndex) { ++nCursor; const EECharAttrib* pIntBackAttr = FindCharAttrib(nCursor, EE_CHAR_BKGCOLOR, aAttribList); @@ -1396,8 +1396,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) const EECharAttrib* pCurAttr = pBackAttr ? pBackAttr : pErrorAttr; if (pCurAttr) { - nSelectionType = pCurAttr->nStart == aCurrentSelection.nStartPos ? - LEFT_NO : pCurAttr->nEnd == aCurrentSelection.nEndPos ? RIGHT_NO : INSIDE_NO; + nSelectionType = pCurAttr->nStart == aCurrentSelection.start.nIndex ? + LEFT_NO : pCurAttr->nEnd == aCurrentSelection.end.nIndex ? RIGHT_NO : INSIDE_NO; } else nSelectionType = OUTSIDE_NO; @@ -1747,7 +1747,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, const css void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_Int32 nStart, sal_Int32 nEnd, bool bGrammarError) { - ESelection aAll(0, 0, 0, EE_TEXTPOS_ALL); + ESelection aAll(m_xEditEngine->NormalizeESelection(ESelection::All())); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_COLOR); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT_CJK); @@ -1769,7 +1769,7 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_Int32 nStart, sal_Int32 nEnd, // unless (tdf#133958) the selection already overlaps this range ESelection aCurrentSelection = m_xEditView->GetSelection(); aCurrentSelection.Adjust(); - bool bCurrentSelectionInRange = nStart <= aCurrentSelection.nEndPos && aCurrentSelection.nStartPos <= nEnd; + bool bCurrentSelectionInRange = nStart <= aCurrentSelection.end.nIndex && aCurrentSelection.start.nIndex <= nEnd; if (!bCurrentSelectionInRange) { m_xEditView->SetSelection(ESelection(0, nStart)); @@ -2160,7 +2160,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pWidget->set_sensitive(false); //remove error marks - ESelection aAll(0, 0, 0, EE_TEXTPOS_ALL); + ESelection aAll(m_xEditEngine->NormalizeESelection(ESelection::All())); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_COLOR); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT_CJK); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 73904ed34258..3f27aaa70f4c 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -51,8 +51,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp(weld::Container* pParent, SvxHpLinkDlg* p m_xBtAdrBook->connect_clicked( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) ); m_xCbbReceiver->connect_changed( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) ); - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) || - comphelper::LibreOfficeKit::isActive() ) + if (!SvtModuleOptions().IsDataBaseInstalled() || comphelper::LibreOfficeKit::isActive()) m_xBtAdrBook->hide(); } diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index 8f9af7fd9570..44e7a862df73 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -24,7 +24,6 @@ inline constexpr OUString HID_OPTIONS_COLORCONFIG_SAVE_SCHEME = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"_ustr; inline constexpr OUString HID_OFA_FONT_SUBST_CLB = u"CUI_HID_OFA_FONT_SUBST_CLB"_ustr; inline constexpr OUString HID_DBPATH_CTL_PATH = u"CUI_HID_DBPATH_CTL_PATH"_ustr; -#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" inline constexpr OUString HID_OFADLG_TREELISTBOX = u"CUI_HID_OFADLG_TREELISTBOX"_ustr; inline constexpr OUString HID_SVX_CONFIG_TOOLBAR = u"CUI_HID_SVX_CONFIG_TOOLBAR"_ustr; inline constexpr OUString HID_SVX_CONFIG_TOOLBAR_CONTENTS diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index b1b014771dae..740f952ed94d 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -30,10 +30,6 @@ #include -#define OBJTYPE_METHOD 2L -#define OBJTYPE_SCRIPTCONTAINER 3L -#define OBJTYPE_SFROOT 4L - typedef std::unordered_map < OUString, OUString > Selection_hash; class SFEntry; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 0e0e4bfb8b84..41cb13f358ac 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -31,8 +31,8 @@ namespace constexpr std::pair> options_list[] { { u"DocumentTitle"_ustr, { sfx::AccessibilityIssueID::DOCUMENT_TITLE, STR_DOCUMENT_TITLE } }, { u"DocumentLanguage"_ustr, { sfx::AccessibilityIssueID::DOCUMENT_LANGUAGE, STR_DOCUMENT_DEFAULT_LANGUAGE } }, - { u"DocumentBackground"_ustr, { sfx::AccessibilityIssueID::DOCUMENT_LANGUAGE, STR_AVOID_BACKGROUND_IMAGES } }, - { u"DocumentStyleLanguage"_ustr, { sfx::AccessibilityIssueID::DOCUMENT_BACKGROUND, STR_STYLE_NO_LANGUAGE } }, + { u"DocumentBackground"_ustr, { sfx::AccessibilityIssueID::DOCUMENT_BACKGROUND, STR_AVOID_BACKGROUND_IMAGES } }, + { u"DocumentStyleLanguage"_ustr, { sfx::AccessibilityIssueID::STYLE_LANGUAGE, STR_STYLE_NO_LANGUAGE } }, { u"LinkedGraphic"_ustr, { sfx::AccessibilityIssueID::LINKED_GRAPHIC, STR_LINKED_GRAPHIC } }, { u"NoAltOleObj"_ustr, { sfx::AccessibilityIssueID::NO_ALT_OLE, STR_NO_ALT_OLE } }, { u"NoAltGraphicObj"_ustr, { sfx::AccessibilityIssueID::NO_ALT_GRAPHIC, STR_NO_ALT_GRAPHIC } }, diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index e9ef0c7800aa..8e008e2c8069 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -108,10 +108,9 @@ const vEntryInfo[] = // The list of these entries (enum ColorConfigEntry) are in colorcfg.hxx. { Group_General, IDS(doccolor), std::u16string_view(u"/DocColor") }, - { Group_General, IDS_CB(docboundaries), std::u16string_view(u"/DocBoundaries") }, + { Group_General, IDS(docboundaries), std::u16string_view(u"/DocBoundaries") }, { Group_General, IDS(appback), std::u16string_view(u"/AppBackground") }, - { Group_General, IDS_CB(objboundaries), std::u16string_view(u"/ObjectBoundaries") }, - { Group_General, IDS_CB(tblboundaries), std::u16string_view(u"/TableBoundaries") }, + { Group_General, IDS(tblboundaries), std::u16string_view(u"/TableBoundaries") }, { Group_General, IDS(font), std::u16string_view(u"/FontColor") }, { Group_General, IDS_CB(unvisitedlinks), std::u16string_view(u"/Links") }, { Group_General, IDS_CB(visitedlinks), std::u16string_view(u"/LinksVisited") }, @@ -125,7 +124,7 @@ const vEntryInfo[] = { Group_Writer, IDS_CB(index), std::u16string_view(u"/WriterIdxShadings") }, { Group_Writer, IDS(direct), std::u16string_view(u"/WriterDirectCursor") }, { Group_Writer, IDS(script), std::u16string_view(u"/WriterScriptIndicator") }, - { Group_Writer, IDS_CB(section), std::u16string_view(u"/WriterSectionBoundaries") }, + { Group_Writer, IDS(section), std::u16string_view(u"/WriterSectionBoundaries") }, { Group_Writer, IDS(hdft), std::u16string_view(u"/WriterHeaderFooterMark") }, { Group_Writer, IDS(pagebreak), std::u16string_view(u"/WriterPageBreaks") }, { Group_Writer, IDS(nonprintchars), std::u16string_view(u"/WriterNonPrintChars") }, @@ -485,7 +484,7 @@ void ColorConfigWindow_Impl::CreateEntries() // get it to align its contents with that of a CheckBox { OUString sSampleText(u"XXXXXX"_ustr); - std::unique_ptr xCheckBox(m_xBuilder->weld_check_button(u"docboundaries"_ustr)); + std::unique_ptr xCheckBox(m_xBuilder->weld_check_button(u"unvisitedlinks"_ustr)); std::unique_ptr xFixedText(m_xBuilder->weld_label(u"doccolor"_ustr)); OUString sOrigCheck(xCheckBox->get_label()); OUString sOrigFixed(xFixedText->get_label()); @@ -677,15 +676,15 @@ bool ColorConfigWindow_Impl::IsGroupVisible (Group eGroup) const { case Group_Writer: case Group_Html: - return aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::WRITER); + return aModuleOptions.IsWriterInstalled(); case Group_Calc: - return aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::CALC); + return aModuleOptions.IsCalcInstalled(); case Group_Draw: return - aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DRAW) || - aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::IMPRESS); + aModuleOptions.IsDrawInstalled() || + aModuleOptions.IsImpressInstalled(); case Group_Sql: - return aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DATABASE); + return aModuleOptions.IsDataBaseInstalled(); default: return true; } diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index efda65e1ad26..14bb0c9463f0 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -331,16 +331,16 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* ) SvtModuleOptions aModuleOpt; // int the same sequence as the enums of MSFltrPg2_CheckBoxEntries - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) + if (aModuleOpt.IsMathInstalled()) InsertEntry( sChgToFromMath, MSFltrPg2_CheckBoxEntries::Math ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (aModuleOpt.IsWriterInstalled()) InsertEntry( sChgToFromWriter, MSFltrPg2_CheckBoxEntries::Writer ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + if (aModuleOpt.IsCalcInstalled()) InsertEntry( sChgToFromCalc, MSFltrPg2_CheckBoxEntries::Calc ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + if (aModuleOpt.IsImpressInstalled()) InsertEntry( sChgToFromImpress, MSFltrPg2_CheckBoxEntries::Impress ); InsertEntry( sChgToFromSmartArt, MSFltrPg2_CheckBoxEntries::SmartArt, false ); - if (aModuleOpt.IsModuleInstalled(SvtModuleOptions::EModule::DRAW)) + if (aModuleOpt.IsDrawInstalled()) { InsertEntry(sChgToFromVisio, MSFltrPg2_CheckBoxEntries::Visio, false); InsertEntry(sChgToFromPDF, MSFltrPg2_CheckBoxEntries::PDF, false); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6ca5847d22cf..65717c944956 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1065,17 +1065,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_xUseHardwareAccell->save_state(); { // #i95644# AntiAliasing - if(SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem()) - { - m_xUseAntiAliase->set_active(SvtOptionsDrawinglayer::IsAntiAliasing()); - } - else - { - m_xUseAntiAliase->set_active(false); - m_xUseAntiAliase->set_sensitive(false); - m_xUseAntiAliaseImg->set_visible(true); - } - + m_xUseAntiAliase->set_active(SvtOptionsDrawinglayer::IsAntiAliasing()); bEnable = !officecfg::Office::Common::Drawinglayer::AntiAliasing::isReadOnly(); m_xUseAntiAliase->set_sensitive(bEnable); m_xUseAntiAliaseImg->set_visible(!bEnable); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index d11aab9e7eaf..97f9c5535cb8 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -247,7 +247,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) { // only writer uses autotext if ( static_cast(i) == SvtPathOptions::Paths::AutoText - && !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + && !SvtModuleOptions().IsWriterInstalled()) continue; TranslateId pId; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 907ece3e51bd..effa144bd761 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -140,7 +140,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p m_xBackupCB->connect_toggled(LINK(this, SvxSaveTabPage, BackupClickHdl_Impl)); SvtModuleOptions aModuleOpt; - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) + if (!aModuleOpt.IsMathInstalled()) { m_xSaveAsLB->remove_id(OUString::number(APP_MATH)); m_xDocTypeLB->remove_id(OUString::number(APP_MATH)); @@ -151,7 +151,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p pImpl->aDefaultReadonlyArr[APP_MATH] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::MATH); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) + if (!aModuleOpt.IsDrawInstalled()) { m_xSaveAsLB->remove_id(OUString::number(APP_DRAW)); m_xDocTypeLB->remove_id(OUString::number(APP_DRAW)); @@ -162,7 +162,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p pImpl->aDefaultReadonlyArr[APP_DRAW] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::DRAW); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + if (!aModuleOpt.IsImpressInstalled()) { m_xSaveAsLB->remove_id(OUString::number(APP_IMPRESS)); m_xDocTypeLB->remove_id(OUString::number(APP_IMPRESS)); @@ -173,7 +173,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p pImpl->aDefaultReadonlyArr[APP_IMPRESS] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::IMPRESS); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + if (!aModuleOpt.IsCalcInstalled()) { m_xSaveAsLB->remove_id(OUString::number(APP_CALC)); m_xDocTypeLB->remove_id(OUString::number(APP_CALC)); @@ -184,7 +184,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p pImpl->aDefaultReadonlyArr[APP_CALC] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::CALC); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (!aModuleOpt.IsWriterInstalled()) { m_xSaveAsLB->remove_id(OUString::number(APP_WRITER)); m_xSaveAsLB->remove_id(OUString::number(APP_WRITER_WEB)); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 15a6b2803021..f5d6a9eaf040 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1712,20 +1712,16 @@ OUString OfaTreeOptionsDialog::getCurrentFactory_Impl( const Reference< XFrame > void OfaTreeOptionsDialog::generalOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) ) { setGroupName(u"ProductName", CuiResId(SID_GENERAL_OPTIONS_RES[0].first)); - nGroup = AddGroup(CuiResId(SID_GENERAL_OPTIONS_RES[0].first), nullptr, nullptr, SID_GENERAL_OPTIONS ); - const sal_uInt16 nEnd = static_cast(std::size(SID_GENERAL_OPTIONS_RES)); + sal_uInt16 nGroup = AddGroup(CuiResId(SID_GENERAL_OPTIONS_RES[0].first), nullptr, nullptr, SID_GENERAL_OPTIONS ); - for (sal_uInt16 i = 1; i < nEnd; ++i) + for (size_t i = 1; i < std::size(SID_GENERAL_OPTIONS_RES); ++i) { OUString sNewTitle = CuiResId(SID_GENERAL_OPTIONS_RES[i].first); - nPageId = SID_GENERAL_OPTIONS_RES[i].second; + sal_uInt16 nPageId = SID_GENERAL_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -1750,17 +1746,14 @@ void OfaTreeOptionsDialog::generalOptions(const std::vector& vPageId void OfaTreeOptionsDialog::loadAndSaveOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) ) { setGroupName( u"LoadSave", CuiResId(SID_FILTER_DLG_RES[0].first) ); - nGroup = AddGroup( CuiResId(SID_FILTER_DLG_RES[0].first), nullptr, nullptr, SID_FILTER_DLG ); + sal_uInt16 nGroup = AddGroup( CuiResId(SID_FILTER_DLG_RES[0].first), nullptr, nullptr, SID_FILTER_DLG ); for ( size_t i = 1; i < std::size(SID_FILTER_DLG_RES); ++i ) { - nPageId = static_cast(SID_FILTER_DLG_RES[i].second); + sal_uInt16 nPageId = SID_FILTER_DLG_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) { if (!vPageId.empty()) @@ -1777,18 +1770,14 @@ void OfaTreeOptionsDialog::loadAndSaveOptions(const std::vector& vPa void OfaTreeOptionsDialog::languageOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - SvtCTLOptions aCTLLanguageOptions; if ( !lcl_isOptionHidden( SID_LANGUAGE_OPTIONS, aOptionsDlgOpt ) ) { setGroupName(u"LanguageSettings", CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first)); - nGroup = AddGroup(CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first), nullptr, nullptr, SID_LANGUAGE_OPTIONS ); + sal_uInt16 nGroup = AddGroup(CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first), nullptr, nullptr, SID_LANGUAGE_OPTIONS ); for (size_t i = 1; i < std::size(SID_LANGUAGE_OPTIONS_RES); ++i) { - nPageId = static_cast(SID_LANGUAGE_OPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_LANGUAGE_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -1817,33 +1806,28 @@ void OfaTreeOptionsDialog::languageOptions(const std::vector& vPageI void OfaTreeOptionsDialog::writerOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; - SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - OUString aFactory = getCurrentFactory_Impl( m_xFrame ); - DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); - - SvtModuleOptions aModuleOpt; - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (SvtModuleOptions().IsWriterInstalled()) { // text document + OUString aFactory = getCurrentFactory_Impl(m_xFrame); + DBG_ASSERT(GetModuleIdentifier(m_xFrame) == aFactory, "This should not happen"); if ( aFactory == "com.sun.star.text.TextDocument" || aFactory == "com.sun.star.text.WebDocument" || aFactory == "com.sun.star.text.GlobalDocument" ) { - SfxModule* pSwMod = SfxApplication::GetModule(SfxToolsModule::Writer); + SvtOptionsDialogOptions aOptionsDlgOpt; if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { if ( aFactory == "com.sun.star.text.WebDocument" ) setGroupName( u"WriterWeb", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) ); else setGroupName( u"Writer", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) ); - nGroup = AddGroup(CuiResId(SID_SW_EDITOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); + SfxModule* pSwMod = SfxApplication::GetModule(SfxToolsModule::Writer); + sal_uInt16 nGroup = AddGroup(CuiResId(SID_SW_EDITOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); SvtCTLOptions aCTLLanguageOptions; for ( size_t i = 1; i < std::size(SID_SW_EDITOPTIONS_RES); ++i ) { - nPageId = static_cast(SID_SW_EDITOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SW_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || SvtCJKOptions::IsCJKFontEnabled() ) && @@ -1877,30 +1861,24 @@ void OfaTreeOptionsDialog::writerOptions(const std::vector& vPageId) void OfaTreeOptionsDialog::writerWebOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; - SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - OUString aFactory = getCurrentFactory_Impl( m_xFrame ); - DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); - - SvtModuleOptions aModuleOpt; - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (SvtModuleOptions().IsWriterInstalled()) { // text document + OUString aFactory = getCurrentFactory_Impl(m_xFrame); + DBG_ASSERT(GetModuleIdentifier(m_xFrame) == aFactory, "This should not happen"); if ( aFactory == "com.sun.star.text.TextDocument" || aFactory == "com.sun.star.text.WebDocument" || aFactory == "com.sun.star.text.GlobalDocument" ) { - SfxModule* pSwMod = SfxApplication::GetModule(SfxToolsModule::Writer); - // HTML documents + SvtOptionsDialogOptions aOptionsDlgOpt; if ( !lcl_isOptionHidden( SID_SW_ONLINEOPTIONS, aOptionsDlgOpt ) ) { - nGroup = AddGroup(CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS ); + SfxModule* pSwMod = SfxApplication::GetModule(SfxToolsModule::Writer); + sal_uInt16 nGroup = AddGroup(CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS ); for( size_t i = 1; i < std::size(SID_SW_ONLINEOPTIONS_RES); ++i ) { - nPageId = static_cast(SID_SW_ONLINEOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SW_ONLINEOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) { if (!vPageId.empty()) @@ -1931,28 +1909,22 @@ void OfaTreeOptionsDialog::writerWebOptions(const std::vector& vPage void OfaTreeOptionsDialog::calcOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; - SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - OUString aFactory = getCurrentFactory_Impl( m_xFrame ); - DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); - - SvtModuleOptions aModuleOpt; // Calc options - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + if (SvtModuleOptions().IsCalcInstalled()) { + OUString aFactory = getCurrentFactory_Impl(m_xFrame); + DBG_ASSERT(GetModuleIdentifier(m_xFrame) == aFactory, "This should not happen"); if ( aFactory == "com.sun.star.sheet.SpreadsheetDocument" ) { + SvtOptionsDialogOptions aOptionsDlgOpt; if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) ) { SfxModule* pScMod = SfxApplication::GetModule( SfxToolsModule::Calc ); setGroupName( u"Calc", CuiResId(SID_SC_EDITOPTIONS_RES[0].first) ); - nGroup = AddGroup( CuiResId(SID_SC_EDITOPTIONS_RES[0].first), pScMod, pScMod, SID_SC_EDITOPTIONS ); - const sal_uInt16 nCount = static_cast(std::size(SID_SC_EDITOPTIONS_RES)); - for ( sal_uInt16 i = 1; i < nCount; ++i ) + sal_uInt16 nGroup = AddGroup( CuiResId(SID_SC_EDITOPTIONS_RES[0].first), pScMod, pScMod, SID_SC_EDITOPTIONS ); + for (size_t i = 1; i < std::size(SID_SC_EDITOPTIONS_RES); ++i) { - nPageId = static_cast(SID_SC_EDITOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SC_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -1971,28 +1943,22 @@ void OfaTreeOptionsDialog::calcOptions(const std::vector& vPageId) void OfaTreeOptionsDialog::impressOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; - SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - OUString aFactory = getCurrentFactory_Impl( m_xFrame ); - DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); - SvtModuleOptions aModuleOpt; - // Impress options - SfxModule* pSdMod = SfxApplication::GetModule( SfxToolsModule::Draw ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + if (SvtModuleOptions().IsImpressInstalled()) { + OUString aFactory = getCurrentFactory_Impl(m_xFrame); + DBG_ASSERT(GetModuleIdentifier(m_xFrame) == aFactory, "This should not happen"); if ( aFactory == "com.sun.star.presentation.PresentationDocument" ) { + SvtOptionsDialogOptions aOptionsDlgOpt; if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) ) { + SfxModule* pSdMod = SfxApplication::GetModule(SfxToolsModule::Draw); setGroupName( u"Impress", CuiResId(SID_SD_EDITOPTIONS_RES[0].first) ); - nGroup = AddGroup( CuiResId(SID_SD_EDITOPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); - const sal_uInt16 nCount = static_cast(std::size(SID_SD_EDITOPTIONS_RES)); - for ( sal_uInt16 i = 1; i < nCount; ++i ) + sal_uInt16 nGroup = AddGroup( CuiResId(SID_SD_EDITOPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); + for (size_t i = 1; i < std::size(SID_SD_EDITOPTIONS_RES); ++i) { - nPageId = static_cast(SID_SD_EDITOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SD_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -2011,28 +1977,22 @@ void OfaTreeOptionsDialog::impressOptions(const std::vector& vPageId void OfaTreeOptionsDialog::drawOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; - SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - OUString aFactory = getCurrentFactory_Impl( m_xFrame ); - DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); - SvtModuleOptions aModuleOpt; - // Draw options - SfxModule* pSdMod = SfxApplication::GetModule(SfxToolsModule::Draw); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) + if (SvtModuleOptions().IsDrawInstalled()) { + OUString aFactory = getCurrentFactory_Impl(m_xFrame); + DBG_ASSERT(GetModuleIdentifier(m_xFrame) == aFactory, "This should not happen"); if ( aFactory == "com.sun.star.drawing.DrawingDocument" ) { + SvtOptionsDialogOptions aOptionsDlgOpt; if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) ) { + SfxModule* pSdMod = SfxApplication::GetModule(SfxToolsModule::Draw); setGroupName( u"Draw", CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first) ); - nGroup = AddGroup( CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); - const sal_uInt16 nCount = static_cast(std::size(SID_SD_GRAPHIC_OPTIONS_RES)); - for ( sal_uInt16 i = 1; i < nCount; ++i ) + sal_uInt16 nGroup = AddGroup( CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); + for (size_t i = 1; i < std::size(SID_SD_GRAPHIC_OPTIONS_RES); ++i) { - nPageId = static_cast(SID_SD_GRAPHIC_OPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SD_GRAPHIC_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -2052,27 +2012,22 @@ void OfaTreeOptionsDialog::drawOptions(const std::vector& vPageId) void OfaTreeOptionsDialog::mathOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; - SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - - OUString aFactory = getCurrentFactory_Impl( m_xFrame ); - DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); - SvtModuleOptions aModuleOpt; - // Math options - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) + if (SvtModuleOptions().IsMathInstalled()) { + OUString aFactory = getCurrentFactory_Impl(m_xFrame); + DBG_ASSERT(GetModuleIdentifier(m_xFrame) == aFactory, "This should not happen"); if ( aFactory == "com.sun.star.formula.FormulaProperties" ) { + SvtOptionsDialogOptions aOptionsDlgOpt; if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) ) { SfxModule* pSmMod = SfxApplication::GetModule(SfxToolsModule::Math); setGroupName( u"Math", CuiResId(SID_SM_EDITOPTIONS_RES[0].first) ); - nGroup = AddGroup(CuiResId(SID_SM_EDITOPTIONS_RES[0].first), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); + sal_uInt16 nGroup = AddGroup(CuiResId(SID_SM_EDITOPTIONS_RES[0].first), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); for ( size_t i = 1; i < std::size(SID_SM_EDITOPTIONS_RES); ++i ) { - nPageId = static_cast(SID_SM_EDITOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SM_EDITOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) { if (!vPageId.empty()) @@ -2092,24 +2047,21 @@ void OfaTreeOptionsDialog::mathOptions(const std::vector& vPageId) void OfaTreeOptionsDialog::databaseOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; - SvtModuleOptions aModuleOpt; // Database - needed only if there is an application which integrates with databases if ( !lcl_isOptionHidden( SID_SB_STARBASEOPTIONS, aOptionsDlgOpt ) && - ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) - || aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) - || aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) + ( aModuleOpt.IsDataBaseInstalled() + || aModuleOpt.IsWriterInstalled() + || aModuleOpt.IsCalcInstalled() ) ) { setGroupName( u"Base", CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first) ); - nGroup = AddGroup( CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first), nullptr, nullptr, SID_SB_STARBASEOPTIONS ); + sal_uInt16 nGroup = AddGroup( CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first), nullptr, nullptr, SID_SB_STARBASEOPTIONS ); for ( size_t i = 1; i < std::size(SID_SB_STARBASEOPTIONS_RES); ++i ) { - nPageId = static_cast(SID_SB_STARBASEOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SB_STARBASEOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) { if (!vPageId.empty()) @@ -2126,17 +2078,15 @@ void OfaTreeOptionsDialog::databaseOptions(const std::vector& vPageI void OfaTreeOptionsDialog::chartOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; if ( !lcl_isOptionHidden( SID_SCH_EDITOPTIONS, aOptionsDlgOpt ) ) { setGroupName( u"Charts", CuiResId(SID_SCH_EDITOPTIONS_RES[0].first) ); - nGroup = AddGroup( CuiResId(SID_SCH_EDITOPTIONS_RES[0].first), nullptr, nullptr, SID_SCH_EDITOPTIONS ); + sal_uInt16 nGroup = AddGroup( CuiResId(SID_SCH_EDITOPTIONS_RES[0].first), nullptr, nullptr, SID_SCH_EDITOPTIONS ); for ( size_t i = 1; i < std::size(SID_SCH_EDITOPTIONS_RES); ++i ) { - nPageId = static_cast(SID_SCH_EDITOPTIONS_RES[i].second); + sal_uInt16 nPageId = SID_SCH_EDITOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) { if (!vPageId.empty()) @@ -2153,19 +2103,17 @@ void OfaTreeOptionsDialog::chartOptions(const std::vector& vPageId) void OfaTreeOptionsDialog::internetOptions(const std::vector& vPageId) { - sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; - sal_uInt16 nPageId = 0; if ( lcl_isOptionHidden( SID_INET_DLG, aOptionsDlgOpt ) ) return; setGroupName(u"Internet", CuiResId(SID_INET_DLG_RES[0].first)); - nGroup = AddGroup(CuiResId(SID_INET_DLG_RES[0].first), nullptr, nullptr, SID_INET_DLG ); + sal_uInt16 nGroup = AddGroup(CuiResId(SID_INET_DLG_RES[0].first), nullptr, nullptr, SID_INET_DLG ); for ( size_t i = 1; i < std::size(SID_INET_DLG_RES); ++i ) { - nPageId = static_cast(SID_INET_DLG_RES[i].second); + sal_uInt16 nPageId = SID_INET_DLG_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; #if defined(_WIN32) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 4ccf16dfd822..9cfeff9b1ff8 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -392,6 +392,7 @@ SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController* m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OUString::number(i+1), FieldUnit::CM); m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OUString::number(i+1)); m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OUString::number(i+1), FieldUnit::CM); + m_aControlGroups[i]->set_sensitive(false); } // this page needs ExchangeSupport diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui index 91243182fdb6..8196a72668e2 100644 --- a/cui/uiconfig/ui/colorconfigwin.ui +++ b/cui/uiconfig/ui/colorconfigwin.ui @@ -18,7 +18,7 @@ 0 none - + True False @@ -61,14 +61,12 @@ - + Text boundaries True True - False start center - True @@ -138,65 +136,19 @@ - - Object boundaries - True - True - False - start - center - True - - - - - - 0 - 3 - - - - - True - True - False - end - 0 - True - - - - - - - - - - Object boundaries color - - - - - 1 - 3 - - - - + Table boundaries True True - False start center - True 0 - 4 + 3 @@ -222,7 +174,7 @@ 1 - 4 + 3 @@ -237,7 +189,7 @@ 0 - 5 + 4 @@ -255,7 +207,7 @@ 1 - 5 + 4 @@ -273,7 +225,7 @@ 0 - 6 + 5 @@ -299,7 +251,7 @@ 1 - 6 + 5 @@ -317,7 +269,7 @@ 0 - 7 + 6 @@ -343,7 +295,7 @@ 1 - 7 + 6 @@ -358,7 +310,7 @@ 0 - 8 + 7 @@ -376,7 +328,7 @@ 1 - 8 + 7 @@ -391,7 +343,7 @@ 0 - 9 + 8 @@ -409,7 +361,7 @@ 1 - 9 + 8 @@ -427,7 +379,7 @@ 0 - 10 + 9 @@ -453,7 +405,7 @@ 1 - 10 + 9 @@ -646,14 +598,12 @@ - + Section boundaries True True - False start center - True diff --git a/cui/uiconfig/ui/iconselectordialog.ui b/cui/uiconfig/ui/iconselectordialog.ui index 9ee6ee8847cb..1d07337f1cbb 100644 --- a/cui/uiconfig/ui/iconselectordialog.ui +++ b/cui/uiconfig/ui/iconselectordialog.ui @@ -119,10 +119,6 @@ True True GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK - 3 - 3 - 3 - 3 True True diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index f0f785a97a3c..e57862902047 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -234,10 +234,8 @@ False Wi_dth: True + MTR_FLD_WIDTH 0 - - - 0 @@ -329,9 +327,6 @@ True adjustmentSIZE 2 - - - Enter a width for the selected object. @@ -352,9 +347,6 @@ True adjustmentSIZE1 2 - - - Enter a height for the selected object. @@ -372,10 +364,8 @@ False H_eight: True + MTR_FLD_HEIGHT 0 - - - 0 diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index ed10f38e660b..741dc7afeeb8 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -598,11 +598,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const case SID_NEWDOC: case SID_APP_NEW_FORM: case ID_DOCUMENT_CREATE_REPWIZ: - aReturn.bEnabled = !isDataSourceReadOnly() && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::WRITER); + aReturn.bEnabled = !isDataSourceReadOnly() && SvtModuleOptions().IsWriterInstalled(); break; case SID_APP_NEW_REPORT: - aReturn.bEnabled = !isDataSourceReadOnly() - && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::WRITER); + aReturn.bEnabled = !isDataSourceReadOnly() && SvtModuleOptions().IsWriterInstalled(); if ( aReturn.bEnabled ) { Reference< XContentEnumerationAccess > xEnumAccess(m_xContext->getServiceManager(), UNO_QUERY); @@ -670,7 +669,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const case SID_REPORT_CREATE_REPWIZ_PRE_SEL: case SID_APP_NEW_REPORT_PRE_SEL: aReturn.bEnabled = !isDataSourceReadOnly() - && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::WRITER) + && SvtModuleOptions().IsWriterInstalled() && getContainer()->isALeafSelected(); if ( aReturn.bEnabled ) { diff --git a/dbaccess/source/ui/app/DocumentInfoPreview.cxx b/dbaccess/source/ui/app/DocumentInfoPreview.cxx index ed7f9f862c97..890e19eb2dc2 100644 --- a/dbaccess/source/ui/app/DocumentInfoPreview.cxx +++ b/dbaccess/source/ui/app/DocumentInfoPreview.cxx @@ -103,28 +103,18 @@ void ODocumentInfoPreview::fill( } } - m_xEditView->SetSelection(ESelection(0, 0, 0, 0)); -} - -namespace -{ - ESelection InsertAtEnd(const EditEngine& rEditEngine) - { - const sal_uInt32 nPara = rEditEngine.GetParagraphCount() -1; - sal_Int32 nLastLen = rEditEngine.GetText(nPara).getLength(); - return ESelection(nPara, nLastLen, nPara, nLastLen); - } + m_xEditView->SetSelection(ESelection(0, 0)); } void ODocumentInfoPreview::insertEntry( std::u16string_view title, OUString const & value) { - if (!m_xEditEngine->GetText().isEmpty()) { - m_xEditEngine->QuickInsertText(u"\n\n"_ustr, InsertAtEnd(*m_xEditEngine)); + if (m_xEditEngine->HasText()) { + m_xEditEngine->QuickInsertText(u"\n\n"_ustr, ESelection::AtEnd()); } OUString caption(OUString::Concat(title) + ":\n"); - m_xEditEngine->QuickInsertText(caption, InsertAtEnd(*m_xEditEngine)); + m_xEditEngine->QuickInsertText(caption, ESelection::AtEnd()); SfxItemSet aSet(m_xEditEngine->GetEmptyItemSet()); aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT)); @@ -133,7 +123,7 @@ void ODocumentInfoPreview::insertEntry( int nCaptionPara = m_xEditEngine->GetParagraphCount() - 2; m_xEditEngine->QuickSetAttribs(aSet, ESelection(nCaptionPara, 0, nCaptionPara, caption.getLength() - 1)); - m_xEditEngine->QuickInsertText(value, InsertAtEnd(*m_xEditEngine)); + m_xEditEngine->QuickInsertText(value, ESelection::AtEnd()); } void ODocumentInfoPreview::insertNonempty(tools::Long id, OUString const & value) diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index b616f1303ac8..70aa8b23aff2 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -203,7 +203,7 @@ void SQLEditView::UpdateData() { OUString aLine( rEditEngine.GetText( nLine ) ); - ESelection aAllLine(nLine, 0, nLine, EE_TEXTPOS_ALL); + ESelection aAllLine(nLine, 0, nLine, EE_TEXTPOS_MAX); rEditEngine.RemoveAttribs(aAllLine, false, EE_CHAR_COLOR); rEditEngine.RemoveAttribs(aAllLine, false, EE_CHAR_WEIGHT); rEditEngine.RemoveAttribs(aAllLine, false, EE_CHAR_WEIGHT_CJK); @@ -234,8 +234,8 @@ void SQLEditView::UpdateData() void SQLEditView::DoBracketHilight(sal_uInt16 nKey) { ESelection aCurrentPos = m_xEditView->GetSelection(); - sal_Int32 nStartPos = aCurrentPos.nStartPos; - const sal_uInt32 nStartPara = aCurrentPos.nStartPara; + sal_Int32 nStartPos = aCurrentPos.start.nIndex; + const sal_uInt32 nStartPara = aCurrentPos.start.nPara; sal_uInt16 nCount = 0; int nChar = -1; @@ -294,7 +294,7 @@ void SQLEditView::DoBracketHilight(sal_uInt16 nKey) aSet.Put(SvxWeightItem(WEIGHT_ULTRABOLD, EE_CHAR_WEIGHT_CTL)); m_xEditEngine->QuickSetAttribs(aSet, ESelection(nPara, i, nPara, i + 1)); - m_xEditEngine->QuickSetAttribs(aSet, ESelection(nStartPara, nStartPos, nStartPara, nStartPos)); + m_xEditEngine->QuickSetAttribs(aSet, ESelection(nStartPara, nStartPos)); return; } else @@ -415,11 +415,9 @@ bool SQLEditView::Command(const CommandEvent& rCEvt) pEditView->DeleteSelected(); else if (sCommand == "selectall") { - sal_Int32 nPar = m_xEditEngine->GetParagraphCount(); - if (nPar) + if (m_xEditEngine->GetParagraphCount()) { - sal_Int32 nLen = m_xEditEngine->GetTextLen(nPar - 1); - pEditView->SetSelection(ESelection(0, 0, nPar - 1, nLen)); + pEditView->SetSelection(ESelection::All()); } } else if (sCommand == "specialchar") diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 07891f773cfd..0e539a34cb38 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -507,7 +507,7 @@ void OSQLMessageBox::impl_addDetailsButton() if ( bMoreDetailsAvailable ) { m_xDialog->add_button(GetStandardText(StandardButtonType::More), RET_MORE); - m_xMoreButton.reset(m_xDialog->weld_widget_for_response(RET_MORE)); + m_xMoreButton = m_xDialog->weld_button_for_response(RET_MORE); m_xMoreButton->connect_clicked(LINK(this, OSQLMessageBox, ButtonClickHdl)); } } diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 31a72a0a5dfe..945be7009d0a 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -3677,9 +3677,10 @@ void DesktopLOKTest::testABI() CPPUNIT_ASSERT_EQUAL(documentClassOffset(75), offsetof(struct _LibreOfficeKitDocumentClass, createSlideRenderer)); CPPUNIT_ASSERT_EQUAL(documentClassOffset(76), offsetof(struct _LibreOfficeKitDocumentClass, postSlideshowCleanup)); CPPUNIT_ASSERT_EQUAL(documentClassOffset(77), offsetof(struct _LibreOfficeKitDocumentClass, renderNextSlideLayer)); + CPPUNIT_ASSERT_EQUAL(documentClassOffset(78), offsetof(struct _LibreOfficeKitDocumentClass, setViewOption)); // As above - CPPUNIT_ASSERT_EQUAL(documentClassOffset(78), sizeof(struct _LibreOfficeKitDocumentClass)); + CPPUNIT_ASSERT_EQUAL(documentClassOffset(79), sizeof(struct _LibreOfficeKitDocumentClass)); } CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index ec7d7f30a0c8..cb4a4de7db9e 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2177,13 +2177,13 @@ void Desktop::OpenClients() SvtModuleOptions aOpt; // Support command line parameters to start a module (as preselection) - if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (rArgs.IsWriter() && aOpt.IsWriterInstalled()) aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::WRITER ); - else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + else if (rArgs.IsCalc() && aOpt.IsCalcInstalled()) aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::CALC ); - else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + else if (rArgs.IsImpress() && aOpt.IsImpressInstalled()) aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::IMPRESS ); - else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) + else if (rArgs.IsDraw() && aOpt.IsDrawInstalled()) aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::DRAW ); } @@ -2230,21 +2230,21 @@ void Desktop::OpenDefault() if ( rArgs.HasModuleParam() ) { // Support new command line parameters to start a module - if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (rArgs.IsWriter() && aOpt.IsWriterInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITER ); - else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + else if (rArgs.IsCalc() && aOpt.IsCalcInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::CALC ); - else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + else if (rArgs.IsImpress() && aOpt.IsImpressInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS ); - else if ( rArgs.IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + else if (rArgs.IsBase() && aOpt.IsDataBaseInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE ); - else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) + else if (rArgs.IsDraw() && aOpt.IsDrawInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW ); - else if ( rArgs.IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) + else if (rArgs.IsMath() && aOpt.IsMathInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::MATH ); - else if ( rArgs.IsGlobal() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + else if (rArgs.IsGlobal() && aOpt.IsModuleInstalled(SvtModuleOptions::EModule::GLOBAL)) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITERGLOBAL ); - else if ( rArgs.IsWeb() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + else if (rArgs.IsWeb() && aOpt.IsModuleInstalled(SvtModuleOptions::EModule::WEB)) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITERWEB ); } @@ -2257,15 +2257,15 @@ void Desktop::OpenDefault() } // Old way to create a default document - if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (aOpt.IsWriterInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITER ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + else if (aOpt.IsCalcInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::CALC ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + else if (aOpt.IsImpressInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + else if (aOpt.IsDataBaseInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) + else if (aOpt.IsDrawInstalled()) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW ); else return; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 274a822fcc30..4029546fd666 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -1089,13 +1089,13 @@ bool IpcThread::process(OString const & arguments, bool * waitProcessed) { SvtModuleOptions aOpt; // Support command line parameters to start a module (as preselection) - if ( aCmdLineArgs->IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) + if (aCmdLineArgs->IsWriter() && aOpt.IsWriterInstalled()) pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::WRITER ); - else if ( aCmdLineArgs->IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) + else if (aCmdLineArgs->IsCalc() && aOpt.IsCalcInstalled()) pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::CALC ); - else if ( aCmdLineArgs->IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) + else if (aCmdLineArgs->IsImpress() && aOpt.IsImpressInstalled()) pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::IMPRESS ); - else if ( aCmdLineArgs->IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) + else if (aCmdLineArgs->IsDraw() && aOpt.IsDrawInstalled()) pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::DRAW ); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 7e8bb6a455eb..77c1c65a757c 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -433,6 +433,7 @@ void ExtensionBox_Impl::DrawRow(vcl::RenderContext& rRenderContext, const tools: auto aTextHeight = rRenderContext.GetTextHeight(); // Get max title width + // coverity[ tainted_data_return : FALSE ] version 2023.12.2 auto nMaxTitleWidth = rRect.GetWidth() - ICON_OFFSET; nMaxTitleWidth -= (2 * SMALL_ICON_SIZE) + (4 * SPACE_BETWEEN); rRenderContext.SetFont(aStdFont); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 7de039d56e58..d5ac74a2d14e 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -106,6 +106,8 @@ #include #include #include +#include +#include #include #include #include @@ -1337,6 +1339,8 @@ static void doc_postSlideshowCleanup(LibreOfficeKitDocument* pThis); static bool doc_renderNextSlideLayer( LibreOfficeKitDocument* pThis, unsigned char* pBuffer, bool* bIsBitmapLayer, char** pJsonMsg); +static void doc_setViewOption(LibreOfficeKitDocument* pDoc, const char* pOption, const char* pValue); + } // extern "C" namespace { @@ -1357,6 +1361,10 @@ rtl::Reference forceSetClipboardForCurrentView(LibreOfficeKitDocum { ITiledRenderable* pDoc = getTiledRenderable(pThis); rtl::Reference xClip(LOKClipboardFactory::getClipboardForCurView()); + if (!pDoc) + { + return xClip; + } SAL_INFO("lok", "Set to clipboard for view " << xClip.get()); // FIXME: using a hammer here - should not be necessary if all tests used createView. @@ -1538,6 +1546,7 @@ LibLODocument_Impl::LibLODocument_Impl(uno::Reference xC m_pDocumentClass->createSlideRenderer = doc_createSlideRenderer; m_pDocumentClass->postSlideshowCleanup = doc_postSlideshowCleanup; m_pDocumentClass->renderNextSlideLayer = doc_renderNextSlideLayer; + m_pDocumentClass->setViewOption = doc_setViewOption; gDocumentClass = m_pDocumentClass; } @@ -4327,6 +4336,7 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, // TODO: we could be clever and e.g. set to 0 when we change to/from // embedded object mode, and not when changing between slide/notes/combined // modes? + // TODO: Also now see ViewShellBase::setEditMode for a similar case if ( nCurrentPart < pDoc->getParts() ) { pDoc->setPart( nCurrentPart ); @@ -5274,9 +5284,9 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const char *pOption, const c SolarMutexGuard aGuard; OutputDevice *pDevice = Application::GetDefaultDevice(); - OutputDevice::ImplClearAllFontData(false); + OutputDevice::ImplClearAllFontData(true); pDevice->AddTempDevFont(sMagicFileName, u""_ustr); - OutputDevice::ImplRefreshAllFontData(false); + OutputDevice::ImplRefreshAllFontData(true); } #endif } @@ -5776,6 +5786,11 @@ static bool doc_renderNextSlideLayer( return bDone; } +static void doc_setViewOption(LibreOfficeKitDocument* /*pDoc*/, const char* /*pOption*/, const char* /*pValue*/) +{ + // placeholder for now +} + static bool getFromTransferable( const css::uno::Reference &xTransferable, const OString &aInMimeType, OString &aRet); @@ -7953,10 +7968,6 @@ static void preloadData() static SvtSysLocaleOptions aSvtSysLocaleOptions; static SvtUserOptions aSvtUserOptions; //static SvtViewOptions aSvtViewOptions; - static MouseSettings aMouseSettings; - static StyleSettings aStyleSettings; - static MiscSettings aMiscSettings; - static HelpSettings aHelpSettings; static AllSettings aAllSettings; #if defined __GNUC__ || defined __clang__ #pragma GCC diagnostic pop @@ -7981,6 +7992,9 @@ static void preloadData() // Set user profile's path back to the original one rtl::Bootstrap::set(u"UserInstallation"_ustr, sUserPath); + + // Note that unotools::Bootstrap has initialized from the temp UserInstallation at this point + // see Bootstrap::reloadData for when it gets resynced } namespace { @@ -8172,29 +8186,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char if (eStage != PRE_INIT) comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback, pLib); - if (pUserProfileUrl && eStage != PRE_INIT) - { - OUString url( - pUserProfileUrl, strlen(pUserProfileUrl), RTL_TEXTENCODING_UTF8); - OUString path; - if (url.startsWithIgnoreAsciiCase("vnd.sun.star.pathname:", &path)) - { - OUString url2; - osl::FileBase::RC e = osl::FileBase::getFileURLFromSystemPath( - path, url2); - if (e == osl::FileBase::E_None) - url = url2; - else - SAL_WARN("lok", "resolving <" << url << "> failed with " << +e); - } - rtl::Bootstrap::set(u"UserInstallation"_ustr, url); - if (eStage == SECOND_INIT) - { - comphelper::rng::reseed(); - utl::Bootstrap::reloadData(); - } - } - OUString aAppPath; if (pAppPath) { @@ -8226,6 +8217,48 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char if (osl::FileBase::getFileURLFromSystemPath(aAppPath, aAppURL) != osl::FileBase::E_None) return 0; + if (pUserProfileUrl && eStage != PRE_INIT) + { + OUString url( + pUserProfileUrl, strlen(pUserProfileUrl), RTL_TEXTENCODING_UTF8); + OUString path; + if (url.startsWithIgnoreAsciiCase("vnd.sun.star.pathname:", &path)) + { + OUString url2; + osl::FileBase::RC e = osl::FileBase::getFileURLFromSystemPath( + path, url2); + if (e == osl::FileBase::E_None) + url = url2; + else + SAL_WARN("lok", "resolving <" << url << "> failed with " << +e); + } + + rtl::Bootstrap::set(u"UserInstallation"_ustr, url); + rtl::Bootstrap::set(u"BRAND_BASE_DIR"_ustr, aAppURL + "/.."); + if (eStage == SECOND_INIT) + { + comphelper::rng::reseed(); + + utl::Bootstrap::reloadData(); + + // Now that bootstrap User/Shared installation paths have been (re)set to the final + // location, reinitialize the PathSubstitution rules and PathSettings so that + // $(userurl)/$(instdir) path variables will be expanded using these newly set + // paths and not the paths detected during preinit which used unorthodox throwaway + // temp locations + + // First reinitialize the PathSubstitution rules + uno::Reference xPathSubst(util::PathSubstitution::create(xContext)); + uno::Reference xReInitSubstitution(xPathSubst, uno::UNO_QUERY_THROW); + xReInitSubstitution->initialize({}); + + // PathSettings depend on PathSubstitution rules + uno::Reference xPathSettings = util::thePathSettings::get(xContext); + uno::Reference xReInitSettings(xPathSettings, uno::UNO_QUERY_THROW); + xReInitSettings->initialize({}); + } + } + #ifdef IOS // A LibreOffice-using iOS app should have the ICU data file in the app bundle. Initialize ICU // to use that. diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index a8d6b9ff0139..ee4358bc904d 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -516,6 +516,7 @@ static ProgressStatus read_percent(ChildInfo const *info, int *pPercent) memmove(pBuffer, pNext, nNotProcessed); /* read data */ + // coverity[ tainted_data_return : FALSE ] version 2023.12.2 ssize_t nThisRead = read(child_info_get_status_fd(info), pBuffer + nNotProcessed, BUFFER_LEN - nNotProcessed); diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index 6a296fd696e4..bb4ff2369c41 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -25,6 +25,7 @@ --without-system-frozen --without-system-glm --without-system-gpgmepp +--without-system-java-websocket --without-system-jfreereport --without-system-libabw --without-system-libatomic_ops diff --git a/download.lst b/download.lst index 81e5bcac70ae..74945585f4bc 100644 --- a/download.lst +++ b/download.lst @@ -48,8 +48,8 @@ CAIRO_TARBALL := cairo-1.17.$(CAIRO_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -CDR_SHA256SUM := 5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4 -CDR_TARBALL := libcdr-0.1.7.tar.xz +CDR_SHA256SUM := ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c +CDR_TARBALL := libcdr-0.1.8.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts @@ -108,8 +108,8 @@ EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a -ETONYEK_VERSION_MICRO := 10 +ETONYEK_SHA256SUM := b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83 +ETONYEK_VERSION_MICRO := 12 ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick @@ -170,13 +170,13 @@ FONT_NOTO_KUFI_ARABIC_TARBALL := NotoKufiArabic-v2.109.zip # three static lines # so that git cherry-pick # will not run into conflicts -FONT_NOTO_SANS_SHA256SUM := 1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1 -FONT_NOTO_SANS_TARBALL := NotoSans-v2.014.zip +FONT_NOTO_SANS_SHA256SUM := 0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5 +FONT_NOTO_SANS_TARBALL := NotoSans-v2.015.zip # three static lines # so that git cherry-pick # will not run into conflicts -FONT_NOTO_SERIF_SHA256SUM := 6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3 -FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.014.zip +FONT_NOTO_SERIF_SHA256SUM := 0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1 +FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.015.zip # three static lines # so that git cherry-pick # will not run into conflicts @@ -397,8 +397,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LANGTAGREG_SHA256SUM := 75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75 -LANGTAGREG_TARBALL := language-subtag-registry-2024-06-14.tar.bz2 +LANGTAGREG_SHA256SUM := 121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864 +LANGTAGREG_TARBALL := language-subtag-registry-2024-11-19.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts @@ -541,8 +541,8 @@ ONLINEUPDATE_TARBALL := onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2. # three static lines # so that git cherry-pick # will not run into conflicts -OPENLDAP_SHA256SUM := 48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e -OPENLDAP_TARBALL := openldap-2.6.8.tgz +OPENLDAP_SHA256SUM := 2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff +OPENLDAP_TARBALL := openldap-2.6.9.tgz # three static lines # so that git cherry-pick # will not run into conflicts @@ -588,8 +588,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -POSTGRESQL_SHA256SUM := 84727fbccdbd1efe01d8de64bc1b33095db773ad2457cefcedc2d8258ebc09d6 -POSTGRESQL_TARBALL := postgresql-14.14.tar.bz2 +POSTGRESQL_SHA256SUM := 02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5 +POSTGRESQL_TARBALL := postgresql-14.15.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 296e34a0def2..6550831214db 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -48,12 +48,6 @@ constexpr OUStringLiteral g_PropertyName_UseAntiAliasing = u"UseAntiAliasing"; constexpr OUStringLiteral g_PropertyName_PixelSnapHairline = u"PixelSnapHairline"; } -namespace -{ -bool bForwardsAreInitialized(false); -bool bForwardPixelSnapHairline(true); -} - class ImpViewInformation2D { private: @@ -123,8 +117,13 @@ public: , mbEditViewActive(false) , mbReducedDisplayQuality(false) , mbUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing()) - , mbPixelSnapHairline(mbUseAntiAliasing && bForwardPixelSnapHairline) { + if (comphelper::IsFuzzing()) + mbPixelSnapHairline = false; + else + mbPixelSnapHairline + = mbUseAntiAliasing + && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get(); } const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } @@ -250,18 +249,11 @@ ViewInformation2D::ImplType& theGlobalDefault() ViewInformation2D::ViewInformation2D() : mpViewInformation2D(theGlobalDefault()) { - if (!bForwardsAreInitialized) - { - bForwardsAreInitialized = true; - if (!comphelper::IsFuzzing()) - { - bForwardPixelSnapHairline - = officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get(); - } - } - setUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing()); - setPixelSnapHairline(bForwardPixelSnapHairline); + if (!comphelper::IsFuzzing()) + setPixelSnapHairline( + getUseAntiAliasing() + && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get()); } ViewInformation2D::ViewInformation2D(const ViewInformation2D&) = default; @@ -427,11 +419,6 @@ void ViewInformation2D::setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporar } bool ViewInformation2D::getGlobalAntiAliasing() { return globalAntiAliasing(); } -void ViewInformation2D::forwardPixelSnapHairline(bool bPixelSnapHairline) -{ - bForwardPixelSnapHairline = bPixelSnapHairline; -} - ViewInformation2D createViewInformation2D(const css::uno::Sequence& rViewParameters) { diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx index 985a586c7fe3..b416acfe2279 100644 --- a/editeng/inc/editattr.hxx +++ b/editeng/inc/editattr.hxx @@ -52,7 +52,6 @@ class OutputDevice; class SvxCaseMapItem; class SfxGrabBagItem; -#define CH_FEATURE_OLD (sal_uInt8) 0xFF #define CH_FEATURE u'\x0001' #define CH_SOFTHYPHEN u'\x00AD' @@ -61,8 +60,6 @@ class SfxGrabBagItem; // => To determine the DefMetric simply use GetMetric(0) #define DEF_METRIC 0 - - // bFeature: Attribute must not expand/shrink, length is always 1 // bEdge: Attribute will not expand, if you want to expand just on the edge class EditCharAttrib diff --git a/editeng/inc/editeng.hxx b/editeng/inc/editeng.hxx index 5b831efa3b5e..d7f95561eabb 100644 --- a/editeng/inc/editeng.hxx +++ b/editeng/inc/editeng.hxx @@ -19,8 +19,6 @@ #pragma once -#define MN_WORDLANGUAGE 998 -#define MN_PARALANGUAGE 999 #define MN_ALTSTART 1000 #define MN_AUTOSTART 2000 #define MN_DICTSTART 3000 diff --git a/editeng/qa/unit/ESelectionTest.cxx b/editeng/qa/unit/ESelectionTest.cxx index 27b9256b29d7..264a0aa2c7ac 100644 --- a/editeng/qa/unit/ESelectionTest.cxx +++ b/editeng/qa/unit/ESelectionTest.cxx @@ -20,42 +20,42 @@ CPPUNIT_TEST_FIXTURE(ESelectionTest, testConstruction) { { ESelection aNewSelection; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aNewSelection.end.nIndex); } { ESelection aNewSelection(1, 2, 3, 4); - CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aNewSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aNewSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aNewSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aNewSelection.end.nIndex); } { ESelection aNewSelection = { 1, 2, 3, 4 }; - CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aNewSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aNewSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aNewSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aNewSelection.end.nIndex); } { ESelection aNewSelection{ 1, 2, 3, 4 }; - CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aNewSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aNewSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aNewSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aNewSelection.end.nIndex); } { ESelection aNewSelection(1, 2); - CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aNewSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aNewSelection.end.nIndex); } } @@ -98,15 +98,6 @@ CPPUNIT_TEST_FIXTURE(ESelectionTest, testEquals) CPPUNIT_ASSERT_EQUAL(aSelection1, aSelection2); } -CPPUNIT_TEST_FIXTURE(ESelectionTest, testIsZero) -{ - ESelection aEmpty; - CPPUNIT_ASSERT_EQUAL(true, aEmpty.IsZero()); - - CPPUNIT_ASSERT_EQUAL(false, ESelection(1, 2, 1, 2).IsZero()); - CPPUNIT_ASSERT_EQUAL(true, ESelection(0, 0, 0, 0).IsZero()); -} - CPPUNIT_TEST_FIXTURE(ESelectionTest, testLess) { // Both equal diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index ac3c683c9204..029df4439dee 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -900,7 +900,7 @@ void Test::testHyperlinkSearch() { 21, 25, /* -> */ 21, 23 }, // the field is really just one char { 25, 27, /* -> */ 22, 23 }, { 50, 56, /* -> */ 40, 46 } }; - for (size_t n = 0; n < SAL_N_ELEMENTS(aTrickyOnes); n++) + for (size_t n = 0; n < std::size(aTrickyOnes); n++) { sal_Int32 nStart = aTrickyOnes[n].mnStart; sal_Int32 nEnd = aTrickyOnes[n].mnEnd; diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 26bee59e731d..a5c4c3b3bdb3 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -374,35 +374,35 @@ namespace accessibility if( !GetEditViewForwarder().GetSelection( aSelection ) ) return false; - if( aSelection.nStartPara < aSelection.nEndPara ) + if( aSelection.start.nPara < aSelection.end.nPara ) { - if( aSelection.nStartPara > nPara || - aSelection.nEndPara < nPara ) + if( aSelection.start.nPara > nPara || + aSelection.end.nPara < nPara ) return false; - if( nPara == aSelection.nStartPara ) - nStartPos = aSelection.nStartPos; + if( nPara == aSelection.start.nPara ) + nStartPos = aSelection.start.nIndex; else nStartPos = 0; - if( nPara == aSelection.nEndPara ) - nEndPos = aSelection.nEndPos; + if( nPara == aSelection.end.nPara ) + nEndPos = aSelection.end.nIndex; else nEndPos = GetTextLen(); } else { - if( aSelection.nStartPara < nPara || - aSelection.nEndPara > nPara ) + if( aSelection.start.nPara < nPara || + aSelection.end.nPara > nPara ) return false; - if( nPara == aSelection.nStartPara ) - nStartPos = aSelection.nStartPos; + if( nPara == aSelection.start.nPara ) + nStartPos = aSelection.start.nIndex; else nStartPos = GetTextLen(); - if( nPara == aSelection.nEndPara ) - nEndPos = aSelection.nEndPos; + if( nPara == aSelection.end.nPara ) + nEndPos = aSelection.end.nIndex; else nEndPos = 0; } @@ -983,7 +983,7 @@ namespace accessibility EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType == SVX_NUM_BITMAP ) { @@ -1119,19 +1119,19 @@ namespace accessibility ESelection aSelection; if( GetEditViewForwarder().GetSelection( aSelection ) && - GetParagraphIndex() == aSelection.nEndPara ) + GetParagraphIndex() == aSelection.end.nPara ) { // caret is always nEndPara,nEndPos EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { sal_Int32 nBulletLen = aBulletInfo.aText.getLength(); - if( aSelection.nEndPos - nBulletLen >= 0 ) - return aSelection.nEndPos - nBulletLen; + if( aSelection.end.nIndex - nBulletLen >= 0 ) + return aSelection.end.nIndex - nBulletLen; } - return aSelection.nEndPos; + return aSelection.end.nIndex; } // not within this paragraph @@ -2048,7 +2048,7 @@ namespace accessibility //Because bullet may occupy one or more characters, the TextAdapter will include bullet to calculate the selection. Add offset to handle bullet sal_Int32 nBulletLen = 0; EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible ) + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible ) nBulletLen = aBulletInfo.aText.getLength(); // save current selection ESelection aOldSelection; @@ -2091,7 +2091,7 @@ namespace accessibility // Because bullet may occupy one or more characters, the TextAdapter will include bullet to calculate the selection. Add offset to handle bullet sal_Int32 nBulletLen = 0; EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible ) + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible ) nBulletLen = aBulletInfo.aText.getLength(); ESelection aSelection = MakeSelection (nStartIndex + nBulletLen, nEndIndex + nBulletLen); //if( !rCacheTF.IsEditable( MakeSelection(nStartIndex, nEndIndex) ) ) @@ -2128,7 +2128,7 @@ namespace accessibility // Because bullet may occupy one or more characters, the TextAdapter will include bullet to calculate the selection. Add offset to handle bullet sal_Int32 nBulletLen = 0; EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible ) + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible ) nBulletLen = aBulletInfo.aText.getLength(); if( !rCacheTF.IsEditable( MakeSelection(nIndex + nBulletLen) ) ) return false; // non-editable area selected @@ -2165,7 +2165,7 @@ namespace accessibility // Because bullet may occupy one or more characters, the TextAdapter will include bullet to calculate the selection. Add offset to handle bullet sal_Int32 nBulletLen = 0; EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible ) + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible ) nBulletLen = aBulletInfo.aText.getLength(); ESelection aSelection = MakeSelection (nStartIndex + nBulletLen, nEndIndex + nBulletLen); @@ -2206,7 +2206,7 @@ namespace accessibility // Because bullet may occupy one or more characters, the TextAdapter will include bullet to calculate the selection. Add offset to handle bullet sal_Int32 nBulletLen = 0; EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible ) + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible ) nBulletLen = aBulletInfo.aText.getLength(); if( !rCacheTF.IsEditable( MakeSelection(nIndex + nBulletLen) ) ) @@ -2246,7 +2246,7 @@ namespace accessibility // Because bullet may occupy one or more characters, the TextAdapter will include bullet to calculate the selection. Add offset to handle bullet sal_Int32 nBulletLen = 0; EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo(GetParagraphIndex()); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible ) + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible ) nBulletLen = aBulletInfo.aText.getLength(); ESelection aSelection = MakeSelection (nStartIndex + nBulletLen, nEndIndex + nBulletLen); diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 5d07e71be0f9..5870e3300c95 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -231,7 +231,7 @@ namespace accessibility EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( GetParagraphIndex() ); tools::Rectangle aParentRect = rCacheTF.GetParaBounds( GetParagraphIndex() ); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType == SVX_NUM_BITMAP ) { diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 7d22150e1503..e318dc4eecba 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -131,19 +131,19 @@ namespace accessibility AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const; sal_Int32 GetParagraphCount() const; - EPosition Index2Internal( sal_Int32 nFlatIndex ) const + EPaM Index2Internal( sal_Int32 nFlatIndex ) const { return ImpCalcInternal( nFlatIndex, false ); } - EPosition Range2Internal( sal_Int32 nFlatIndex ) const + EPaM Range2Internal( sal_Int32 nFlatIndex ) const { return ImpCalcInternal( nFlatIndex, true ); } - sal_Int32 Internal2Index( EPosition nEEIndex ) const; + sal_Int32 Internal2Index( EPaM nEEIndex ) const; void CorrectTextSegment( TextSegment& aTextSegment, int nPara ) const; @@ -158,7 +158,7 @@ namespace accessibility private: - EPosition ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const; + EPaM ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const; // our frontend class (the one implementing the actual // interface). That's not necessarily the one containing the impl @@ -233,7 +233,7 @@ namespace accessibility return mxTextParagraph->GetTextForwarder().GetParagraphCount(); } - sal_Int32 AccessibleStaticTextBase_Impl::Internal2Index( EPosition nEEIndex ) const + sal_Int32 AccessibleStaticTextBase_Impl::Internal2Index(EPaM nEEIndex) const { // XXX checks for overflow and returns maximum if so sal_Int32 aRes(0); @@ -268,7 +268,7 @@ namespace accessibility } } - EPosition AccessibleStaticTextBase_Impl::ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const + EPaM AccessibleStaticTextBase_Impl::ImpCalcInternal(sal_Int32 nFlatIndex, bool bExclusive) const { if( nFlatIndex < 0 ) @@ -288,7 +288,7 @@ namespace accessibility nFlatIndex - nCurrIndex + nCurrCount >= 0, "AccessibleStaticTextBase_Impl::Index2Internal: index value overflow"); - return EPosition(nCurrPara, nFlatIndex - nCurrIndex + nCurrCount); + return EPaM(nCurrPara, nFlatIndex - nCurrIndex + nCurrCount); } } @@ -300,7 +300,7 @@ namespace accessibility nFlatIndex - nCurrIndex + nCurrCount >= 0, "AccessibleStaticTextBase_Impl::Index2Internal: index value overflow"); - return EPosition(nCurrPara-1, nFlatIndex - nCurrIndex + nCurrCount); + return EPaM(nCurrPara - 1, nFlatIndex - nCurrIndex + nCurrCount); } // not found? Out of bounds @@ -507,7 +507,7 @@ namespace accessibility { SolarMutexGuard aGuard; - EPosition aPos( mpImpl->Index2Internal(nIndex) ); + EPaM aPos(mpImpl->Index2Internal(nIndex)); return mpImpl->GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex ); } @@ -519,7 +519,7 @@ namespace accessibility //get the actual index without "\n" mpImpl->RemoveLineBreakCount( nIndex ); - EPosition aPos( mpImpl->Index2Internal(nIndex) ); + EPaM aPos(mpImpl->Index2Internal(nIndex)); return mpImpl->GetParagraph( aPos.nPara ).getCharacterAttributes( aPos.nIndex, aRequestedAttributes ); } @@ -530,7 +530,7 @@ namespace accessibility // #108900# Allow ranges for nIndex, as one-past-the-end // values are now legal, too. - EPosition aPos( mpImpl->Range2Internal(nIndex) ); + EPaM aPos(mpImpl->Range2Internal(nIndex)); // #i70916# Text in spread sheet cells return the wrong extents AccessibleEditableTextPara& rPara = mpImpl->GetParagraph( aPos.nPara ); @@ -575,7 +575,7 @@ namespace accessibility // #112814# Use correct index offset if ( ( nIndex = rPara.getIndexAtPoint( aPoint ) ) != -1 ) - return mpImpl->Internal2Index(EPosition(i, nIndex)); + return mpImpl->Internal2Index(EPaM(i, nIndex)); } return -1; @@ -627,8 +627,8 @@ namespace accessibility { SolarMutexGuard aGuard; - EPosition aStartIndex( mpImpl->Range2Internal(nStartIndex) ); - EPosition aEndIndex( mpImpl->Range2Internal(nEndIndex) ); + EPaM aStartIndex(mpImpl->Range2Internal(nStartIndex)); + EPaM aEndIndex(mpImpl->Range2Internal(nEndIndex)); return mpImpl->SetSelection( aStartIndex.nPara, aStartIndex.nIndex, aEndIndex.nPara, aEndIndex.nIndex ); @@ -682,8 +682,8 @@ namespace accessibility nEndIndex++; } OUStringBuffer aRes; - EPosition aStartIndex( mpImpl->Range2Internal(nStartIndex) ); - EPosition aEndIndex( mpImpl->Range2Internal(nEndIndex) ); + EPaM aStartIndex(mpImpl->Range2Internal(nStartIndex)); + EPaM aEndIndex(mpImpl->Range2Internal(nEndIndex)); // #102170# Special case: start and end paragraph are identical if( aStartIndex.nPara == aEndIndex.nPara ) @@ -733,7 +733,7 @@ namespace accessibility SolarMutexGuard aGuard; bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex ); - EPosition aPos( mpImpl->Range2Internal(nIndex) ); + EPaM aPos(mpImpl->Range2Internal(nIndex)); css::accessibility::TextSegment aResult; @@ -749,7 +749,7 @@ namespace accessibility aResult.SegmentText = mpImpl->GetParagraph( aPos.nPara ).getText(); // #112814# Adapt the start index with the paragraph offset - aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara, 0 ) ); + aResult.SegmentStart = mpImpl->Internal2Index(EPaM(aPos.nPara, 0)); aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength(); } else if ( AccessibleTextType::ATTRIBUTE_RUN == aTextType ) @@ -785,7 +785,7 @@ namespace accessibility sal_Int32 nOldIdx = nIndex; bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex ); - EPosition aPos( mpImpl->Range2Internal(nIndex) ); + EPaM aPos(mpImpl->Range2Internal(nIndex)); css::accessibility::TextSegment aResult; @@ -797,14 +797,14 @@ namespace accessibility aResult.SegmentText = mpImpl->GetParagraph( aPos.nPara ).getText(); // #112814# Adapt the start index with the paragraph offset - aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara, 0 ) ); + aResult.SegmentStart = mpImpl->Internal2Index(EPaM(aPos.nPara, 0)); } else if( aPos.nPara > 0 ) { aResult.SegmentText = mpImpl->GetParagraph( aPos.nPara - 1 ).getText(); // #112814# Adapt the start index with the paragraph offset - aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara - 1, 0 ) ); + aResult.SegmentStart = mpImpl->Internal2Index(EPaM(aPos.nPara - 1, 0)); } aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength(); @@ -832,7 +832,7 @@ namespace accessibility sal_Int32 nTemp = nIndex+1; bool bLineBreak = mpImpl->RemoveLineBreakCount( nTemp ); mpImpl->RemoveLineBreakCount( nIndex ); - EPosition aPos( mpImpl->Range2Internal(nIndex) ); + EPaM aPos(mpImpl->Range2Internal(nIndex)); css::accessibility::TextSegment aResult; @@ -846,7 +846,7 @@ namespace accessibility aResult.SegmentText = mpImpl->GetParagraph( aPos.nPara + 1 ).getText(); // #112814# Adapt the start index with the paragraph offset - aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara + 1, 0 ) ); + aResult.SegmentStart = mpImpl->Internal2Index(EPaM(aPos.nPara + 1, 0)); aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength(); } } @@ -873,8 +873,8 @@ namespace accessibility if( nStartIndex > nEndIndex ) std::swap(nStartIndex, nEndIndex); - EPosition aStartIndex( mpImpl->Range2Internal(nStartIndex) ); - EPosition aEndIndex( mpImpl->Range2Internal(nEndIndex) ); + EPaM aStartIndex(mpImpl->Range2Internal(nStartIndex)); + EPaM aEndIndex(mpImpl->Range2Internal(nEndIndex)); return mpImpl->CopyText( aStartIndex.nPara, aStartIndex.nIndex, aEndIndex.nPara, aEndIndex.nIndex ); @@ -926,7 +926,7 @@ namespace accessibility SolarMutexGuard aGuard; - EPosition aPos( mpImpl->Index2Internal( nIndex ) ); + EPaM aPos(mpImpl->Index2Internal(nIndex)); AccessibleEditableTextPara& rPara = mpImpl->GetParagraph( aPos.nPara ); uno::Sequence< beans::PropertyValue > aDefAttrSeq = rPara.getDefaultAttributes( RequestedAttributes ); uno::Sequence< beans::PropertyValue > aRunAttrSeq = rPara.getRunAttributes( aPos.nIndex, RequestedAttributes ); diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 0ff602376509..2b4d3956eefd 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -480,7 +480,7 @@ void ImpEditEngine::DumpData(bool bInfoBox) fprintf( fp, "\n VisArea: nX=%" SAL_PRIdINT64 ", nY=%" SAL_PRIdINT64 ", dX=%" SAL_PRIdINT64 ", dY=%" SAL_PRIdINT64, sal_Int64(aR.Left()), sal_Int64(aR.Top()), sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) ); ESelection aSel = pV->GetSelection(); - fprintf( fp, "\n Selection: Start=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32 ", End=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32, aSel.nStartPara, aSel.nStartPos, aSel.nEndPara, aSel.nEndPos ); + fprintf( fp, "\n Selection: Start=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32 ", End=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32, aSel.start.nPara, aSel.start.nIndex, aSel.end.nPara, aSel.end.nIndex ); } if ( GetActiveView() ) { diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index fdc52e57a7fc..63961daefe27 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -451,7 +451,7 @@ sal_Int32 FastGetPos(const Array& rArray, const Val* p, sal_Int32& rLastPos) } // XXX "not found" condition for sal_Int32 indexes - return EE_PARA_NOT_FOUND; + return EE_PARA_MAX; } } @@ -537,7 +537,7 @@ sal_Int32 ParaPortionList::FindParagraph(tools::Long nYOffset) const if ( nY > nYOffset ) return i <= SAL_MAX_INT32 ? static_cast(i) : SAL_MAX_INT32; } - return EE_PARA_NOT_FOUND; + return EE_PARA_MAX; } #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG @@ -1043,7 +1043,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, bool bKeepEndingAttribs ) assert(aPaM.GetNode()); ContentNode* pCurNode = aPaM.GetNode(); sal_Int32 nPos = GetPos( pCurNode ); - assert(nPos != EE_PARA_NOT_FOUND); + assert(nPos != EE_PARA_MAX); OUString aStr = aPaM.GetNode()->Copy( aPaM.GetIndex() ); aPaM.GetNode()->Erase( aPaM.GetIndex() ); diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index b2f0b6c0b4f1..15dcc2d7dc5a 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -321,7 +321,7 @@ EEHorizontalTextDirection EditEngine::GetDefaultHorizontalTextDirection() const SvtScriptType EditEngine::GetScriptType( const ESelection& rSelection ) const { - return getImpl().GetScriptType( rSelection ); + return getImpl().GetItemScriptType(getImpl().CreateSel(rSelection)); } editeng::LanguageSpan EditEngine::GetLanguage(const EditPaM& rPaM) const @@ -336,7 +336,7 @@ editeng::LanguageSpan EditEngine::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) void EditEngine::TransliterateText( const ESelection& rSelection, TransliterationFlags nTransliterationMode ) { - getImpl().TransliterateText(getImpl().CreateSel( rSelection ), nTransliterationMode); + TransliterateText(CreateSelection(rSelection), nTransliterationMode); } EditSelection EditEngine::TransliterateText(const EditSelection& rSelection, TransliterationFlags nTransliterationMode) @@ -457,22 +457,19 @@ sal_uInt32 EditEngine::GetTextHeight( sal_Int32 nParagraph ) const return nHeight; } -OUString EditEngine::GetWord( sal_Int32 nPara, sal_Int32 nIndex ) +OUString EditEngine::GetWord(const EPaM& rPos) { - ESelection aESel( nPara, nIndex, nPara, nIndex ); - EditSelection aSel(getImpl().CreateSel(aESel)); - aSel = getImpl().SelectWord(aSel); - return getImpl().GetSelected(aSel); + EditSelection aSel(CreateSelection(ESelection(rPos))); + aSel = SelectWord(aSel); + return GetSelected(aSel); } ESelection EditEngine::GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const { // ImpEditEngine-Iteration-Methods should be const! - EditEngine* pNonConstEditEngine = const_cast(this); - - EditSelection aSel(pNonConstEditEngine->getImpl().CreateSel( rSelection ) ); - aSel = pNonConstEditEngine->getImpl().SelectWord( aSel, nWordType ); - return pNonConstEditEngine->getImpl().CreateESel( aSel ); + EditSelection aSel(getImpl().CreateSel(rSelection)); + aSel = getImpl().SelectWord(aSel, nWordType); + return CreateESelection(aSel); } void EditEngine::CheckIdleFormatter() @@ -737,6 +734,19 @@ EditSelection EditEngine::CreateSelection(const ESelection& rSel) return getImpl().CreateSel(rSel); } +ESelection EditEngine::NormalizeESelection(const ESelection& rSel) const +{ + return CreateESelection(getImpl().CreateNormalizedSel(rSel)); +} + +EPaM EditEngine::GetEnd() const +{ + auto para = GetEditDoc().Count(); + if (para) + --para; + return { para, GetTextLen(para) }; +} + const SfxItemSet& EditEngine::GetBaseParaAttribs(sal_Int32 nPara) const { return getImpl().GetParaAttribs(nPara); @@ -851,8 +861,7 @@ std::unique_ptr EditEngine::CreateTextObject() std::unique_ptr EditEngine::CreateTextObject( const ESelection& rESelection ) { - EditSelection aSel(getImpl().CreateSel(rESelection)); - return getImpl().CreateTextObject(aSel); + return getImpl().CreateTextObject(CreateSelection(rESelection)); } std::unique_ptr EditEngine::GetEmptyTextObject() @@ -1038,8 +1047,7 @@ void EditEngine::GetCharAttribs( sal_Int32 nPara, std::vector& rLi SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) { - EditSelection aSel(getImpl().ConvertSelection(rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos)); - return getImpl().GetAttribs(aSel, nOnlyHardAttrib); + return getImpl().GetAttribs(getImpl().CreateNormalizedSel(rSel), nOnlyHardAttrib); } SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, GetAttribsFlags nFlags ) const @@ -1207,15 +1215,14 @@ SfxItemPool* EditEngine::GetEditTextObjectPool() const void EditEngine::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) { - EditSelection aSel(getImpl().ConvertSelection(rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos)); - getImpl().SetAttribs(aSel, rSet); + getImpl().SetAttribs(getImpl().CreateNormalizedSel(rSel), rSet); } void EditEngine::QuickMarkInvalid( const ESelection& rSel ) { - DBG_ASSERT(rSel.nStartPara < getImpl().GetEditDoc().Count(), "MarkInvalid: Start out of Range!"); - DBG_ASSERT(rSel.nEndPara < getImpl().GetEditDoc().Count(), "MarkInvalid: End out of Range!"); - for (sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++) + DBG_ASSERT(rSel.start.nPara < getImpl().GetEditDoc().Count(), "MarkInvalid: Start out of Range!"); + DBG_ASSERT(rSel.end.nPara < getImpl().GetEditDoc().Count(), "MarkInvalid: End out of Range!"); + for (sal_Int32 nPara = rSel.start.nPara; nPara <= rSel.end.nPara; nPara++) { ParaPortion* pPortion = getImpl().GetParaPortions().SafeGetObject(nPara); if ( pPortion ) @@ -1225,14 +1232,12 @@ void EditEngine::QuickMarkInvalid( const ESelection& rSel ) void EditEngine::QuickInsertText(const OUString& rText, const ESelection& rSel) { - EditSelection aSel(getImpl().ConvertSelection(rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos)); - getImpl().ImpInsertText(aSel, rText); + getImpl().ImpInsertText(getImpl().CreateNormalizedSel(rSel), rText); } void EditEngine::QuickDelete( const ESelection& rSel ) { - EditSelection aSel(getImpl().ConvertSelection(rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos)); - getImpl().ImpDeleteSelection( aSel ); + getImpl().ImpDeleteSelection(getImpl().CreateNormalizedSel(rSel)); } void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara ) @@ -1244,15 +1249,12 @@ void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara ) void EditEngine::QuickInsertLineBreak( const ESelection& rSel ) { - EditSelection aSel(getImpl().ConvertSelection(rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos)); - getImpl().InsertLineBreak( aSel ); + getImpl().InsertLineBreak(getImpl().CreateNormalizedSel(rSel)); } void EditEngine::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) { - - EditSelection aSel(getImpl().ConvertSelection(rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos)); - getImpl().ImpInsertFeature(aSel, rFld); + getImpl().ImpInsertFeature(getImpl().CreateNormalizedSel(rSel), rFld); } void EditEngine::QuickFormatDoc( bool bFull ) @@ -1519,20 +1521,16 @@ sal_Int32 EditEngine::FindParagraph( tools::Long nDocPosY ) return getImpl().GetParaPortions().FindParagraph(nDocPosY); } -EPosition EditEngine::FindDocPosition( const Point& rDocPos ) const +EPaM EditEngine::FindDocPosition(const Point& rDocPos) const { - EPosition aPos; // From the point of the API, this is const... EditPaM aPaM = getImpl().GetPaM(rDocPos, false); if ( aPaM.GetNode() ) - { - aPos.nPara = getImpl().maEditDoc.GetPos(aPaM.GetNode()); - aPos.nIndex = aPaM.GetIndex(); - } - return aPos; + return getImpl().CreateEPaM(aPaM); + return EPaM::NotFound(); } -tools::Rectangle EditEngine::GetCharacterBounds( const EPosition& rPos ) const +tools::Rectangle EditEngine::GetCharacterBounds(const EPaM& rPos) const { tools::Rectangle aBounds; ContentNode* pNode = getImpl().GetEditDoc().GetObject(rPos.nPara); @@ -1574,8 +1572,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara ) uno::Reference EditEngine::CreateTransferable(const ESelection& rSelection) { - EditSelection aSel(getImpl().CreateSel(rSelection)); - return getImpl().CreateTransferable(aSel); + return getImpl().CreateTransferable(CreateSelection(rSelection)); } diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 9b17e434e53d..6f7182f383af 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -382,10 +382,10 @@ ContentInfo* EditTextObjectImpl::CreateAndInsertContent() sal_Int32 EditTextObjectImpl::GetParagraphCount() const { size_t nSize = maContents.size(); - if (nSize > EE_PARA_MAX_COUNT) + if (nSize > EE_PARA_MAX) { SAL_WARN( "editeng", "EditTextObjectImpl::GetParagraphCount - overflow " << nSize); - return EE_PARA_MAX_COUNT; + return EE_PARA_MAX; } return static_cast(nSize); } diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index f785c7057df0..47f5ac5b246f 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -524,9 +524,9 @@ void EditUndoSetAttribs::Undo() DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); EditEngine* pEE = GetEditEngine(); bool bFields = false; - for ( sal_Int32 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ ) + for ( sal_Int32 nPara = aESel.start.nPara; nPara <= aESel.end.nPara; nPara++ ) { - const ContentAttribsInfo& rInf = *aPrevAttribs[nPara-aESel.nStartPara]; + const ContentAttribsInfo& rInf = *aPrevAttribs[nPara-aESel.start.nPara]; // first the paragraph attributes ... pEE->SetParaAttribsOnly(nPara, rInf.GetPrevParaAttribs()); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 7176e3961985..4791c5e7c0fb 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -274,7 +274,7 @@ void EditView::SetSelection( const ESelection& rESel ) if (nullptr != pNode) pNode->checkAndDeleteEmptyAttribs(); } - EditSelection aNewSelection(getImpEditEngine().ConvertSelection(rESel.nStartPara, rESel.nStartPos, rESel.nEndPara, rESel.nEndPos)); + EditSelection aNewSelection(getImpEditEngine().CreateNormalizedSel(rESel)); // If the selection is manipulated after a KeyInput: getEditEngine().CheckIdleFormatter(); @@ -309,15 +309,7 @@ void EditView::SetSelection( const ESelection& rESel ) ESelection EditView::GetSelection() const { - ESelection aSelection; - - aSelection.nStartPara = getEditEngine().GetEditDoc().GetPos( getImpl().GetEditSelection().Min().GetNode() ); - aSelection.nEndPara = getEditEngine().GetEditDoc().GetPos( getImpl().GetEditSelection().Max().GetNode() ); - - aSelection.nStartPos = getImpl().GetEditSelection().Min().GetIndex(); - aSelection.nEndPos = getImpl().GetEditSelection().Max().GetIndex(); - - return aSelection; + return getEditEngine().CreateESelection(getImpl().GetEditSelection()); } bool EditView::HasSelection() const @@ -734,7 +726,7 @@ void EditView::MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos ) void EditView::MoveParagraphs( tools::Long nDiff ) { ESelection aSel = GetSelection(); - Range aRange( aSel.nStartPara, aSel.nEndPara ); + Range aRange( aSel.start.nPara, aSel.end.nPara ); aRange.Normalize(); tools::Long nDest = ( nDiff > 0 ? aRange.Max() : aRange.Min() ) + nDiff; if ( nDiff > 0 ) @@ -1226,8 +1218,8 @@ bool EditView::ExecuteSpellPopup(const Point& rPosPixel, const Link aPortions; rEditEngine.GetPortions( nPara, aPortions ); @@ -1541,8 +1533,8 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) if( aPortions.empty() ) aPortions.push_back( rEditEngine.GetTextLen(nPara) ); - const sal_Int32 nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0; - const sal_Int32 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : EE_TEXTPOS_ALL; + const sal_Int32 nBeginPos = (nPara == aSel.start.nPara) ? aSel.start.nIndex : 0; + const sal_Int32 nEndPos = (nPara == aSel.end.nPara) ? aSel.end.nIndex : EE_TEXTPOS_MAX; for ( size_t nPos = 0; nPos < aPortions.size(); ++nPos ) { @@ -1689,22 +1681,22 @@ Selection EditView::GetSurroundingTextSelection() const // Stop reconversion if the selected text includes a line break. if ( aStr.indexOf( 0x0A ) == -1 ) - return Selection( 0, aSelection.nEndPos - aSelection.nStartPos ); + return Selection(0, aSelection.end.nIndex - aSelection.start.nIndex); else return Selection( 0, 0 ); } else { - return Selection( aSelection.nStartPos, aSelection.nEndPos ); + return Selection(aSelection.start.nIndex, aSelection.end.nIndex); } } bool EditView::DeleteSurroundingText(const Selection& rRange) { ESelection aSel(GetSelection()); - aSel.nEndPara = aSel.nStartPara; - aSel.nStartPos = rRange.Min(); - aSel.nEndPos = rRange.Max(); + aSel.end.nPara = aSel.start.nPara; + aSel.start.nIndex = rRange.Min(); + aSel.end.nIndex = rRange.Max(); SetSelection(aSel); DeleteSelected(); return true; diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 0dbcfedd55a0..8eef9af2bbe7 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -715,7 +715,7 @@ LanguageType EdtAutoCorrDoc::GetLanguage( sal_Int32 nPos ) const void EdtAutoCorrDoc::ImplStartUndoAction() { sal_Int32 nPara = mpEditEngine->GetEditDoc().GetPos( pCurNode ); - ESelection aSel( nPara, nCursor, nPara, nCursor ); + ESelection aSel(nPara, nCursor); mpEditEngine->UndoActionStart( EDITUNDO_INSERT, aSel ); bUndoAction = true; bAllowUndoAction = false; diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 615147f4c148..3170279eb7e9 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include #include @@ -365,8 +367,8 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) ContentNode* pEN = aEndPaM.GetNode(); sal_Int32 nStartNode = mpEditEngine->GetEditDoc().GetPos( pSN ); sal_Int32 nEndNode = mpEditEngine->GetEditDoc().GetPos( pEN ); - assert(nStartNode != EE_PARA_NOT_FOUND); - assert(nEndNode != EE_PARA_NOT_FOUND); + assert(nStartNode != EE_PARA_MAX); + assert(nEndNode != EE_PARA_MAX); sal_Int16 nOutlLevel = 0xff; if (rSet.StyleNo() && mpEditEngine->GetStyleSheetPool() && mpEditEngine->IsImportRTFStyleSheetsSet()) @@ -517,12 +519,16 @@ void EditRTFParser::ReadField() int _nOpenBrackets = 1; // the first was already detected earlier bool bFldInst = false; bool bFldRslt = false; + bool bUnderline = false; + Color aColor; + bool bColor = false; OUString aFldInst; OUString aFldRslt; while( _nOpenBrackets && IsParserWorking() ) { - switch( GetNextToken() ) + auto nNextToken = GetNextToken(); + switch( nNextToken ) { case '}': { @@ -555,6 +561,21 @@ void EditRTFParser::ReadField() aFldRslt += aToken; } break; + case RTF_CF: + { + if (bFldRslt) + { + aColor = GetColor(sal_uInt16(nTokenValue)); + bColor = true; + } + } + break; + case RTF_UL: + { + if (bFldRslt) + bUnderline = true; + } + break; } } if ( !aFldInst.isEmpty() ) @@ -572,6 +593,17 @@ void EditRTFParser::ReadField() SvxFieldItem aField( SvxURLField( aFldInst, aFldRslt, SvxURLFormat::Repr ), EE_FEATURE_FIELD ); aCurSel = mpEditEngine->InsertField(aCurSel, aField); + if (bUnderline || bColor ) + { + SfxItemSet aAttribs( mpEditEngine->GetEmptyItemSet() ); + if (bUnderline) + aAttribs.Put(SvxUnderlineItem(LINESTYLE_SINGLE, EE_CHAR_UNDERLINE)); + if (bColor) + aAttribs.Put(SvxColorItem(aColor, EE_CHAR_COLOR)); + EditSelection aAttribSelection(aCurSel.Min(), aCurSel.Max()); + aAttribSelection.Min().SetIndex(aAttribSelection.Min().GetIndex() - 1); + mpEditEngine->SetAttribs(aAttribSelection, aAttribs, SetAttribsMode::Edge); + } mpEditEngine->UpdateFieldsOnly(); bLastActionInsertParaBreak = false; } diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index a7497f629868..f67073380470 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -519,7 +519,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, vcl::Region* pRegion, ContentNode* pEndNode = aTmpSel.Max().GetNode(); const sal_Int32 nStartPara = getEditEngine().GetEditDoc().GetPos(pStartNode); const sal_Int32 nEndPara = getEditEngine().GetEditDoc().GetPos(pEndNode); - if (nStartPara == EE_PARA_NOT_FOUND || nEndPara == EE_PARA_NOT_FOUND) + if (nStartPara == EE_PARA_MAX || nEndPara == EE_PARA_MAX) return; bool bStartHandleVisible = false; @@ -1146,7 +1146,7 @@ tools::Rectangle ImpEditView::GetEditCursor() const sal_Int32 nTextPortionStart = 0; sal_Int32 nPara = getEditEngine().GetEditDoc().GetPos( aPaM.GetNode() ); - if (nPara == EE_PARA_NOT_FOUND) // #i94322 + if (nPara == EE_PARA_MAX) // #i94322 return tools::Rectangle(); ParaPortion const& rParaPortion = getEditEngine().GetParaPortions().getRef(nPara); @@ -1192,7 +1192,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor ) sal_Int32 nTextPortionStart = 0; sal_Int32 nPara = getEditEngine().GetEditDoc().GetPos( aPaM.GetNode() ); - if (nPara == EE_PARA_NOT_FOUND) // #i94322 + if (nPara == EE_PARA_MAX) // #i94322 return; ParaPortion const& rParaPortion = getEditEngine().GetParaPortions().getRef(nPara); @@ -1876,7 +1876,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara, bool ImpEditView::IsBulletArea( const Point& rPos, sal_Int32* pPara ) { if ( pPara ) - *pPara = EE_PARA_NOT_FOUND; + *pPara = EE_PARA_MAX; if( !GetOutputArea().Contains( rPos ) ) return false; @@ -2304,7 +2304,7 @@ void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestur aSz = GetOutputDevice().PixelToLogic( aSz ); mpDragAndDropInfo->nSensibleRange = static_cast(aSz.Width()); mpDragAndDropInfo->nCursorWidth = static_cast(aSz.Width()) / 2; - mpDragAndDropInfo->aBeginDragSel = getImpEditEngine().CreateESel( aCopySel ); + mpDragAndDropInfo->aBeginDragSel = getEditEngine().CreateESelection( aCopySel ); uno::Reference xData = getEditEngine().CreateTransferable(aCopySel); @@ -2330,62 +2330,61 @@ void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent if (mpDragAndDropInfo->bStarterOfDD && mpDragAndDropInfo->bDroppedInMe ) { // DropPos: Where was it dropped, irrespective of length. - ESelection aDropPos(mpDragAndDropInfo->aDropSel.nStartPara, mpDragAndDropInfo->aDropSel.nStartPos, mpDragAndDropInfo->aDropSel.nStartPara, mpDragAndDropInfo->aDropSel.nStartPos ); + ESelection aDropPos(mpDragAndDropInfo->aDropSel.start); ESelection aToBeDelSel = mpDragAndDropInfo->aBeginDragSel; - ESelection aNewSel( mpDragAndDropInfo->aDropSel.nEndPara, mpDragAndDropInfo->aDropSel.nEndPos, - mpDragAndDropInfo->aDropSel.nEndPara, mpDragAndDropInfo->aDropSel.nEndPos ); + ESelection aNewSel(mpDragAndDropInfo->aDropSel.end); bool bBeforeSelection = aDropPos < mpDragAndDropInfo->aBeginDragSel; - sal_Int32 nParaDiff = mpDragAndDropInfo->aBeginDragSel.nEndPara - mpDragAndDropInfo->aBeginDragSel.nStartPara; + sal_Int32 nParaDiff = mpDragAndDropInfo->aBeginDragSel.end.nPara - mpDragAndDropInfo->aBeginDragSel.start.nPara; if ( bBeforeSelection ) { // Adjust aToBeDelSel. - DBG_ASSERT(mpDragAndDropInfo->aBeginDragSel.nStartPara >= mpDragAndDropInfo->aDropSel.nStartPara, "But not before? "); - aToBeDelSel.nStartPara = aToBeDelSel.nStartPara + nParaDiff; - aToBeDelSel.nEndPara = aToBeDelSel.nEndPara + nParaDiff; + DBG_ASSERT(mpDragAndDropInfo->aBeginDragSel.start.nPara >= mpDragAndDropInfo->aDropSel.start.nPara, "But not before? "); + aToBeDelSel.start.nPara = aToBeDelSel.start.nPara + nParaDiff; + aToBeDelSel.end.nPara = aToBeDelSel.end.nPara + nParaDiff; // To correct the character? - if ( aToBeDelSel.nStartPara == mpDragAndDropInfo->aDropSel.nEndPara ) + if ( aToBeDelSel.start.nPara == mpDragAndDropInfo->aDropSel.end.nPara ) { sal_uInt16 nMoreChars; - if (mpDragAndDropInfo->aDropSel.nStartPara == mpDragAndDropInfo->aDropSel.nEndPara ) - nMoreChars = mpDragAndDropInfo->aDropSel.nEndPos - mpDragAndDropInfo->aDropSel.nStartPos; + if (mpDragAndDropInfo->aDropSel.start.nPara == mpDragAndDropInfo->aDropSel.end.nPara ) + nMoreChars = mpDragAndDropInfo->aDropSel.end.nIndex - mpDragAndDropInfo->aDropSel.start.nIndex; else - nMoreChars = mpDragAndDropInfo->aDropSel.nEndPos; - aToBeDelSel.nStartPos = - aToBeDelSel.nStartPos + nMoreChars; - if ( aToBeDelSel.nStartPara == aToBeDelSel.nEndPara ) - aToBeDelSel.nEndPos = - aToBeDelSel.nEndPos + nMoreChars; + nMoreChars = mpDragAndDropInfo->aDropSel.end.nIndex; + aToBeDelSel.start.nIndex = + aToBeDelSel.start.nIndex + nMoreChars; + if ( aToBeDelSel.start.nPara == aToBeDelSel.end.nPara ) + aToBeDelSel.end.nIndex = + aToBeDelSel.end.nIndex + nMoreChars; } } else { // aToBeDelSel is ok, but the selection of the View // has to be adapted, if it was deleted before! - DBG_ASSERT(mpDragAndDropInfo->aBeginDragSel.nStartPara <= mpDragAndDropInfo->aDropSel.nStartPara, "But not before? "); - aNewSel.nStartPara = aNewSel.nStartPara - nParaDiff; - aNewSel.nEndPara = aNewSel.nEndPara - nParaDiff; + DBG_ASSERT(mpDragAndDropInfo->aBeginDragSel.start.nPara <= mpDragAndDropInfo->aDropSel.start.nPara, "But not before? "); + aNewSel.start.nPara = aNewSel.start.nPara - nParaDiff; + aNewSel.end.nPara = aNewSel.end.nPara - nParaDiff; // To correct the character? - if (mpDragAndDropInfo->aBeginDragSel.nEndPara == mpDragAndDropInfo->aDropSel.nStartPara ) + if (mpDragAndDropInfo->aBeginDragSel.end.nPara == mpDragAndDropInfo->aDropSel.start.nPara ) { sal_uInt16 nLessChars; - if (mpDragAndDropInfo->aBeginDragSel.nStartPara == mpDragAndDropInfo->aBeginDragSel.nEndPara ) - nLessChars = mpDragAndDropInfo->aBeginDragSel.nEndPos - mpDragAndDropInfo->aBeginDragSel.nStartPos; + if (mpDragAndDropInfo->aBeginDragSel.start.nPara == mpDragAndDropInfo->aBeginDragSel.end.nPara ) + nLessChars = mpDragAndDropInfo->aBeginDragSel.end.nIndex - mpDragAndDropInfo->aBeginDragSel.start.nIndex; else - nLessChars = mpDragAndDropInfo->aBeginDragSel.nEndPos; - aNewSel.nStartPos = aNewSel.nStartPos - nLessChars; - if ( aNewSel.nStartPara == aNewSel.nEndPara ) - aNewSel.nEndPos = aNewSel.nEndPos - nLessChars; + nLessChars = mpDragAndDropInfo->aBeginDragSel.end.nIndex; + aNewSel.start.nIndex = aNewSel.start.nIndex - nLessChars; + if ( aNewSel.start.nPara == aNewSel.end.nPara ) + aNewSel.end.nIndex = aNewSel.end.nIndex - nLessChars; } } DrawSelectionXOR(); - EditSelection aDelSel(getImpEditEngine().CreateSel(aToBeDelSel)); + EditSelection aDelSel(getEditEngine().CreateSelection(aToBeDelSel)); DBG_ASSERT( !aDelSel.DbgIsBuggy(getEditEngine().GetEditDoc()), "ToBeDel is buggy!"); getEditEngine().DeleteSelection(aDelSel); if ( !bBeforeSelection ) { - DBG_ASSERT(!getImpEditEngine().CreateSel(aNewSel).DbgIsBuggy(getEditEngine().GetEditDoc()), "Bad"); - SetEditSelection(getImpEditEngine().CreateSel(aNewSel)); + DBG_ASSERT(!getEditEngine().CreateSelection(aNewSel).DbgIsBuggy(getEditEngine().GetEditDoc()), "Bad"); + SetEditSelection(getEditEngine().CreateSelection(aNewSel)); } getImpEditEngine().FormatAndLayout(getImpEditEngine().GetActiveView()); DrawSelectionXOR(); @@ -2430,7 +2429,7 @@ void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE if (mpDragAndDropInfo->bOutlinerMode) { bChanges = true; - GetEditViewPtr()->MoveParagraphs(Range(mpDragAndDropInfo->aBeginDragSel.nStartPara, mpDragAndDropInfo->aBeginDragSel.nEndPara ), mpDragAndDropInfo->nOutlinerDropDest); + GetEditViewPtr()->MoveParagraphs(Range(mpDragAndDropInfo->aBeginDragSel.start.nPara, mpDragAndDropInfo->aBeginDragSel.end.nPara ), mpDragAndDropInfo->nOutlinerDropDest); } else { @@ -2457,10 +2456,8 @@ void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE if (mpDragAndDropInfo->bStarterOfDD) { // Only set if the same engine! - mpDragAndDropInfo->aDropSel.nStartPara = getEditEngine().GetEditDoc().GetPos( aPaM.GetNode() ); - mpDragAndDropInfo->aDropSel.nStartPos = aPaM.GetIndex(); - mpDragAndDropInfo->aDropSel.nEndPara = getEditEngine().GetEditDoc().GetPos( aNewSel.Max().GetNode() ); - mpDragAndDropInfo->aDropSel.nEndPos = aNewSel.Max().GetIndex(); + mpDragAndDropInfo->aDropSel.start = getImpEditEngine().CreateEPaM(aPaM); + mpDragAndDropInfo->aDropSel.end = getImpEditEngine().CreateEPaM(aNewSel.Max()); mpDragAndDropInfo->bDroppedInMe = true; } } @@ -2578,8 +2575,8 @@ void ImpEditView::dragOver(const css::datatransfer::dnd::DropTargetDragEvent& rD mpDragAndDropInfo->nOutlinerDropDest = nPara+1; } - if ((mpDragAndDropInfo->nOutlinerDropDest >= mpDragAndDropInfo->aBeginDragSel.nStartPara) && - (mpDragAndDropInfo->nOutlinerDropDest <= (mpDragAndDropInfo->aBeginDragSel.nEndPara + 1))) + if ((mpDragAndDropInfo->nOutlinerDropDest >= mpDragAndDropInfo->aBeginDragSel.start.nPara) && + (mpDragAndDropInfo->nOutlinerDropDest <= (mpDragAndDropInfo->aBeginDragSel.end.nPara + 1))) { bAccept = false; } @@ -2589,8 +2586,8 @@ void ImpEditView::dragOver(const css::datatransfer::dnd::DropTargetDragEvent& rD { // it must not be dropped into a selection EPaM aP = getImpEditEngine().CreateEPaM( aPaM ); - ESelection aDestSel( aP.nPara, aP.nIndex, aP.nPara, aP.nIndex); - ESelection aCurSel = getImpEditEngine().CreateESel( GetEditSelection() ); + ESelection aDestSel(aP); + ESelection aCurSel = getEditEngine().CreateESelection(GetEditSelection()); aCurSel.Adjust(); if ( !(aDestSel < aCurSel) && !(aDestSel > aCurSel) ) { diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index a76d50855d9c..029ae6a9e223 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -88,9 +88,6 @@ namespace editeng { #define MAXCHARSINPARA 0x3FFF-CHARPOSGROW // Max 16K, because WYSIWYG array #define LINE_SEP '\x0A' -#define ATTRSPECIAL_WHOLEWORD 1 -#define ATTRSPECIAL_EDGE 2 - struct CursorFlags { bool bTextOnly : 1 = false; @@ -751,7 +748,6 @@ private: void InitScriptTypes( sal_Int32 nPara ); sal_uInt16 GetI18NScriptType( const EditPaM& rPaM, sal_Int32* pEndPos = nullptr ) const; - SvtScriptType GetScriptType( const ESelection& rSel ); SvtScriptType GetItemScriptType( const EditSelection& rSel ) const; bool IsScriptChange( const EditPaM& rPaM ) const; bool HasScriptType( sal_Int32 nPara, sal_uInt16 nType ) const; @@ -1120,8 +1116,7 @@ public: EPaM CreateEPaM( const EditPaM& rPaM ) const { - const ContentNode* pNode = rPaM.GetNode(); - return EPaM(maEditDoc.GetPos(pNode), rPaM.GetIndex()); + return EPaM(maEditDoc.GetPos(rPaM.GetNode()), rPaM.GetIndex()); } EditPaM CreateEditPaM( const EPaM& rEPaM ) @@ -1133,28 +1128,24 @@ public: ESelection CreateESel(const EditSelection& rSel) const { - const ContentNode* pStartNode = rSel.Min().GetNode(); - const ContentNode* pEndNode = rSel.Max().GetNode(); ESelection aESel; - aESel.nStartPara = maEditDoc.GetPos( pStartNode ); - aESel.nStartPos = rSel.Min().GetIndex(); - aESel.nEndPara = maEditDoc.GetPos( pEndNode ); - aESel.nEndPos = rSel.Max().GetIndex(); + aESel.start = CreateEPaM(rSel.Min()); + aESel.end = CreateEPaM(rSel.Max()); return aESel; } EditSelection CreateSel(const ESelection& rSel) { - DBG_ASSERT( rSel.nStartPara < maEditDoc.Count(), "CreateSel: invalid start paragraph" ); - DBG_ASSERT( rSel.nEndPara < maEditDoc.Count(), "CreateSel: invalid end paragraph" ); - EditSelection aSel; - aSel.Min().SetNode(maEditDoc.GetObject(rSel.nStartPara)); - aSel.Min().SetIndex( rSel.nStartPos ); - aSel.Max().SetNode(maEditDoc.GetObject(rSel.nEndPara)); - aSel.Max().SetIndex( rSel.nEndPos ); + DBG_ASSERT( rSel.start.nPara < maEditDoc.Count(), "CreateSel: invalid start paragraph" ); + DBG_ASSERT( rSel.end.nPara < maEditDoc.Count(), "CreateSel: invalid end paragraph" ); + EditSelection aSel(CreateEditPaM(rSel.start), CreateEditPaM(rSel.end)); DBG_ASSERT( !aSel.DbgIsBuggy( maEditDoc ), "CreateSel: incorrect selection!" ); return aSel; + } + EditSelection CreateNormalizedSel(const ESelection& rSel) + { + return ConvertSelection(rSel.start.nPara, rSel.start.nIndex, rSel.end.nPara, rSel.end.nIndex); } void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 88b047f1e8e4..95ea82178989 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -248,7 +248,7 @@ void ImpEditEngine::InitDoc(bool bKeepParaAttribs) if ( IsCallParaInsertedOrDeleted() ) { - GetEditEnginePtr()->ParagraphDeleted( EE_PARA_ALL ); + GetEditEnginePtr()->ParagraphDeleted(EE_PARA_MAX); GetEditEnginePtr()->ParagraphInserted( 0 ); } @@ -264,8 +264,7 @@ EditPaM ImpEditEngine::DeleteSelected(const EditSelection& rSel) OUString ImpEditEngine::GetText( const ESelection& rESelection ) { - EditSelection aSel = CreateSel(rESelection); - return GetSelected(aSel); + return GetSelected(CreateSel(rESelection)); } OUString ImpEditEngine::GetSelected( const EditSelection& rSel ) const @@ -526,14 +525,14 @@ bool ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) if( pView->HasSelection() ) { - aSelection.nEndPos = aSelection.nStartPos; - aSelection.nStartPos += pData->GetStart(); - aSelection.nEndPos += pData->GetEnd(); + aSelection.end.nIndex = aSelection.start.nIndex; + aSelection.start.nIndex += pData->GetStart(); + aSelection.end.nIndex += pData->GetEnd(); } else { - aSelection.nStartPos = pData->GetStart(); - aSelection.nEndPos = pData->GetEnd(); + aSelection.start.nIndex = pData->GetStart(); + aSelection.end.nIndex = pData->GetEnd(); } pView->SetSelection( aSelection ); } @@ -544,11 +543,11 @@ bool ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) ESelection aSelection = pView->GetSelection(); aSelection.Adjust(); - if ( aSelection.nStartPara != aSelection.nEndPara ) + if ( aSelection.start.nPara != aSelection.end.nPara ) { - sal_Int32 aParaLen = mpEditEngine->GetTextLen( aSelection.nStartPara ); - aSelection.nEndPara = aSelection.nStartPara; - aSelection.nEndPos = aParaLen; + sal_Int32 aParaLen = mpEditEngine->GetTextLen( aSelection.start.nPara ); + aSelection.end.nPara = aSelection.start.nPara; + aSelection.end.nIndex = aParaLen; pView->SetSelection( aSelection ); } } @@ -790,7 +789,7 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode const * pNode, bool bIgnoreU pPortion->MarkSelectionInvalid( 0 ); sal_Int32 nPara = maEditDoc.GetPos( pNode ); - assert( nPara != EE_PARA_NOT_FOUND ); + assert(nPara != EE_PARA_MAX); if (bIgnoreUndoCheck || mpEditEngine->IsInUndo()) mpEditEngine->ParaAttribsChanged( nPara ); @@ -1858,12 +1857,6 @@ sal_uInt16 ImpEditEngine::GetI18NScriptType( const EditPaM& rPaM, sal_Int32* pEn return nScriptType ? nScriptType : SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetDefaultLanguage() ); } -SvtScriptType ImpEditEngine::GetScriptType( const ESelection& rSel ) -{ - EditSelection aSel(CreateSel(rSel)); - return GetItemScriptType( aSel ); -} - SvtScriptType ImpEditEngine::GetItemScriptType( const EditSelection& rSel ) const { EditSelection aSel( rSel ); @@ -2257,7 +2250,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n // Determine the new location for paragraphs sal_Int32 nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count(); - assert( nRealNewPos != EE_PARA_NOT_FOUND && "ImpMoveParagraphs: Invalid Position!" ); + assert(nRealNewPos != EE_PARA_MAX && "ImpMoveParagraphs: Invalid Position!"); // Add the paragraph portions and content nodes to a new position sal_Int32 i = 0; @@ -2307,8 +2300,8 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, bool bBackward ) { OSL_ENSURE( pLeft != pRight, "Join together the same paragraph ?" ); - OSL_ENSURE( maEditDoc.GetPos( pLeft ) != EE_PARA_NOT_FOUND, "Inserted node not found (1)" ); - OSL_ENSURE( maEditDoc.GetPos( pRight ) != EE_PARA_NOT_FOUND, "Inserted node not found (2)" ); + OSL_ENSURE(maEditDoc.GetPos(pLeft) != EE_PARA_MAX, "Inserted node not found (1)"); + OSL_ENSURE(maEditDoc.GetPos(pRight) != EE_PARA_MAX, "Inserted node not found (2)"); // #i120020# it is possible that left and right are *not* in the desired order (left/right) // so correct it. This correction is needed, else an invalid SfxLinkUndoAction will be @@ -2506,7 +2499,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel) sal_Int32 nStartNode = maEditDoc.GetPos( aStartPaM.GetNode() ); sal_Int32 nEndNode = maEditDoc.GetPos( aEndPaM.GetNode() ); - assert( nEndNode != EE_PARA_NOT_FOUND && "Start > End ?!" ); + assert(nEndNode != EE_PARA_MAX && "Start > End ?!"); assert( nStartNode <= nEndNode && "Start > End ?!" ); // Remove all nodes in between... @@ -2630,7 +2623,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c, ESelection aESel( CreateESel(aSel) ); EditSelection aFirstWordSel; EditSelection aSecondWordSel; - if (aESel.nEndPara == 0) // is this the first para? + if (aESel.end.nPara == 0) // is this the first para? { // select first word... // start by checking if para starts with word. @@ -2650,7 +2643,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c, EditPaM aRight2Word( WordRight( aFirstWordSel.Max() ) ); aSecondWordSel = SelectWord( EditSelection( aRight2Word ) ); } - bool bIsFirstWordInFirstPara = aESel.nEndPara == 0 && + bool bIsFirstWordInFirstPara = aESel.end.nPara == 0 && aFirstWordSel.Max().GetIndex() <= aSel.Max().GetIndex() && aSel.Max().GetIndex() <= aSecondWordSel.Min().GetIndex(); @@ -2986,10 +2979,10 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel ) EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttribs ) { - if ( maEditDoc.Count() >= EE_PARA_MAX_COUNT ) + if (maEditDoc.Count() >= EE_PARA_MAX) { SAL_WARN( "editeng", "ImpEditEngine::ImpInsertParaBreak - can't process more than " - << EE_PARA_MAX_COUNT << " paragraphs!"); + << EE_PARA_MAX << " paragraphs!"); return rPaM; } @@ -3037,7 +3030,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttrib // Optimization: Do not place unnecessarily many getPos to Listen! // Here, as in undo, but also in all other methods. sal_Int32 nPos = GetParaPortions().GetPos( pPortion ); - assert(nPos != EE_PARA_NOT_FOUND); + assert(nPos != EE_PARA_MAX); ParaPortion* pNewPortion = new ParaPortion( aPaM.GetNode() ); GetParaPortions().Insert(nPos+1, std::unique_ptr(pNewPortion)); ParaAttribsChanged( pNewPortion->GetNode() ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 049cb1527008..b060d35fbc0a 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4385,7 +4385,7 @@ const ParaPortion* ImpEditEngine::GetPrevVisPortion( const ParaPortion* pCurPort const ParaPortion* ImpEditEngine::GetNextVisPortion( const ParaPortion* pCurPortion ) const { sal_Int32 nPara = GetParaPortions().GetPos( pCurPortion ); - if (nPara == EE_PARA_NOT_FOUND) + if (nPara == EE_PARA_MAX) { SAL_WARN("editeng", "Portion not found: GetPrevVisNode" ); return nullptr; @@ -4449,7 +4449,7 @@ void ImpEditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxt { if ( nPara > maEditDoc.Count() ) { - SAL_WARN_IF( nPara != EE_PARA_APPEND, "editeng", "Paragraph number too large, but not EE_PARA_APPEND!" ); + SAL_WARN_IF( nPara != EE_PARA_MAX, "editeng", "Paragraph number too large, but not EE_PARA_MAX!" ); nPara = maEditDoc.Count(); } @@ -4475,7 +4475,7 @@ void ImpEditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt) { if ( nPara > maEditDoc.Count() ) { - SAL_WARN_IF( nPara != EE_PARA_APPEND, "editeng", "Paragraph number too large, but not EE_PARA_APPEND!" ); + SAL_WARN_IF( nPara != EE_PARA_MAX, "editeng", "Paragraph number too large, but not EE_PARA_MAX!" ); nPara = maEditDoc.Count(); } @@ -4605,8 +4605,8 @@ const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode { // get index of paragraph sal_Int32 nPara = GetEditDoc().GetPos( pNode ); - DBG_ASSERT( nPara < EE_PARA_NOT_FOUND, "node not found in array" ); - if (nPara < EE_PARA_NOT_FOUND) + DBG_ASSERT( nPara < EE_PARA_MAX, "node not found in array" ); + if (nPara < EE_PARA_MAX) { // the called function may be overridden by an OutlinerEditEng // object to provide diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 6d444749092c..50d7f6fe9669 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1628,7 +1628,7 @@ void ImpEditEngine::CreateSpellInfo( bool bMultipleDocs ) // (spelling in only a selection or not starting with the top requires // further changes elsewhere to work properly) mpSpellInfo->aSpellStart = EPaM(); - mpSpellInfo->aSpellTo = EPaM( EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND ); + mpSpellInfo->aSpellTo = EPaM(EE_PARA_MAX, EE_TEXTPOS_MAX); } @@ -1852,7 +1852,7 @@ void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, mpEditEngine->GetText(mpConvInfo->aConvContinue.nPara).isEmpty()) { sal_Int32 nPara = mpConvInfo->aConvContinue.nPara; - ESelection aESel( nPara, 0, nPara, 0 ); + ESelection aESel(nPara, 0); // see comment for below same function call SetLanguageAndFont( aESel, nTargetLang, EE_CHAR_LANGUAGE_CJK, diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 6dd01d1d349e..9abcc1350c06 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -599,8 +599,7 @@ void ImpEditEngine::RemoveAttribs( const ESelection& rSelection, bool bRemovePar EERemoveParaAttribsMode::RemoveCharItems; UndoActionStart(EDITUNDO_RESETATTRIBS); - EditSelection aSel(ConvertSelection(rSelection.nStartPara, rSelection.nStartPos, rSelection.nEndPara, rSelection.nEndPos)); - RemoveCharAttribs(aSel, eMode, nWhich); + RemoveCharAttribs(CreateNormalizedSel(rSelection), eMode, nWhich); UndoActionEnd(); if (IsUpdateLayout()) FormatAndLayout(); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 3d4c03e1ddeb..9582c2b2e74b 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -121,8 +121,7 @@ bool TextConvWrapper::ConvMore_impl() bool bMore = false; EditEngine& rEditEngine = m_pEditView->getEditEngine(); - ImpEditEngine& rImpEditEngine = m_pEditView->getImpEditEngine(); - ConvInfo* pConvInfo = rImpEditEngine.GetConvInfo(); + ConvInfo* pConvInfo = rEditEngine.getImpl().GetConvInfo(); if ( pConvInfo->bMultipleDoc ) { bMore = rEditEngine.ConvertNextDocument(); @@ -169,8 +168,7 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea ) if (m_aConvSel.HasRange()) { // user selection: convert to end of selection - pConvInfo->aConvTo.nPara = m_aConvSel.nEndPara; - pConvInfo->aConvTo.nIndex = m_aConvSel.nEndPos; + pConvInfo->aConvTo = m_aConvSel.end; pConvInfo->bConvToEnd = false; } else @@ -248,10 +246,10 @@ void TextConvWrapper::SelectNewUnit_impl( return; ESelection aSelection = m_pEditView->GetSelection(); - DBG_ASSERT( aSelection.nStartPara == aSelection.nEndPara, + DBG_ASSERT( aSelection.start.nPara == aSelection.end.nPara, "paragraph mismatch in selection" ); - aSelection.nStartPos = (m_nLastPos + m_nUnitOffset + nUnitStart); - aSelection.nEndPos = (m_nLastPos + m_nUnitOffset + nUnitEnd); + aSelection.start.nIndex = (m_nLastPos + m_nUnitOffset + nUnitStart); + aSelection.end.nIndex = (m_nLastPos + m_nUnitOffset + nUnitEnd); m_pEditView->SetSelection( aSelection ); } @@ -269,11 +267,11 @@ void TextConvWrapper::GetNextPortion( m_nUnitOffset = 0; ESelection aSelection = m_pEditView->GetSelection(); - DBG_ASSERT( aSelection.nStartPara == aSelection.nEndPara, + DBG_ASSERT( aSelection.start.nPara == aSelection.end.nPara, "paragraph mismatch in selection" ); - DBG_ASSERT( aSelection.nStartPos <= aSelection.nEndPos, + DBG_ASSERT( aSelection.start.nIndex <= aSelection.end.nIndex, "start pos > end pos" ); - m_nLastPos = aSelection.nStartPos; + m_nLastPos = aSelection.start.nIndex; } @@ -336,15 +334,15 @@ void TextConvWrapper::ReplaceUnit( m_nUnitOffset = m_nUnitOffset + nUnitStart + aNewTxt.getLength(); // remember current original language for later use - ImpEditEngine& rImpEditEngine = m_pEditView->getImpEditEngine(); + EditEngine& rEditEngine = m_pEditView->getEditEngine(); ESelection aOldSel = m_pEditView->GetSelection(); //EditSelection aOldEditSel = pEditView->getImpl().GetEditSelection(); #ifdef DBG_UTIL - LanguageType nOldLang = rImpEditEngine.GetLanguage(rImpEditEngine.CreateSel( aOldSel ).Min() ).nLang; + LanguageType nOldLang = rEditEngine.GetLanguage(rEditEngine.CreateSelection( aOldSel ).Min() ).nLang; #endif - rImpEditEngine.UndoActionStart( EDITUNDO_INSERT ); + rEditEngine.UndoActionStart( EDITUNDO_INSERT ); // according to FT we should currently not bother about keeping // attributes in Hangul/Hanja conversion and leave that untouched. @@ -362,7 +360,7 @@ void TextConvWrapper::ReplaceUnit( "TextConvWrapper::ReplaceUnit : unexpected target language" ); ESelection aNewSel( aOldSel ); - aNewSel.nStartPos = aNewSel.nStartPos - aNewTxt.getLength(); + aNewSel.start.nIndex -= aNewTxt.getLength(); if (pNewUnitLanguage) { @@ -375,10 +373,10 @@ void TextConvWrapper::ReplaceUnit( } } - rImpEditEngine.UndoActionEnd(); + rEditEngine.UndoActionEnd(); // adjust ConvContinue / ConvTo if necessary - ConvInfo* pConvInfo = rImpEditEngine.GetConvInfo(); + ConvInfo* pConvInfo = rEditEngine.getImpl().GetConvInfo(); sal_Int32 nDelta = aNewTxt.getLength() - aOrigTxt.getLength(); if (nDelta != 0) { @@ -410,7 +408,7 @@ void TextConvWrapper::ChangeText( const OUString &rNewText, pESelection->Adjust(); // remember cursor start position for later setting of the cursor - const sal_Int32 nStartIndex = pESelection->nStartPos; + const sal_Int32 nStartIndex = pESelection->start.nIndex; const sal_Int32 nIndices = pOffsets->getLength(); const sal_Int32 *pIndices = pOffsets->getConstArray(); @@ -453,8 +451,8 @@ void TextConvWrapper::ChangeText( const OUString &rNewText, // set selection to sub string to be replaced in original text ESelection aSel( *pESelection ); sal_Int32 nChgInNodeStartIndex = nStartIndex + nCorrectionOffset + nChgPos; - aSel.nStartPos = nChgInNodeStartIndex; - aSel.nEndPos = nChgInNodeStartIndex + nChgLen; + aSel.start.nIndex = nChgInNodeStartIndex; + aSel.end.nIndex = nChgInNodeStartIndex + nChgLen; m_pEditView->SetSelection( aSel ); // replace selected sub string with the corresponding @@ -485,7 +483,7 @@ void TextConvWrapper::ChangeText( const OUString &rNewText, // set cursor to the end of the inserted text // (as it would happen after ChangeText_impl (Delete and Insert) // of the whole text in the 'else' branch below) - pESelection->nStartPos = pESelection->nEndPos = nStartIndex + nConvTextLen; + pESelection->start.nIndex = pESelection->end.nIndex = nStartIndex + nConvTextLen; } else { diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 930fdd70f2e2..8b4e10e25c83 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -4739,6 +4739,13 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co return nullptr; } + INetURLObject aGraphicURL( maStrLink ); + if (aGraphicURL.IsExoticProtocol()) + { + SAL_WARN("editeng", "Ignore exotic protocol: " << maStrLink); + return nullptr; + } + // tdf#94088 prepare graphic and state Graphic aGraphic; bool bGraphicLoaded = false; @@ -4759,8 +4766,6 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co // a 'data:' scheme url and try to load that (embedded graphics) if(!bGraphicLoaded) { - INetURLObject aGraphicURL( maStrLink ); - if( INetProtocol::Data == aGraphicURL.GetProtocol() ) { std::unique_ptr const xMemStream(aGraphicURL.getData()); diff --git a/editeng/source/misc/urlfieldhelper.cxx b/editeng/source/misc/urlfieldhelper.cxx index 16303c064d50..7dafeb2c9628 100644 --- a/editeng/source/misc/urlfieldhelper.cxx +++ b/editeng/source/misc/urlfieldhelper.cxx @@ -30,12 +30,7 @@ bool URLFieldHelper::IsCursorAtURLField(const EditView& pEditView, bool bAlsoChe { // tdf#128666 Make sure only URL field (or nothing) is selected ESelection aSel = pEditView.GetSelection(); - auto nSelectedParas = aSel.nEndPara - aSel.nStartPara; - auto nSelectedChars = aSel.nEndPos - aSel.nStartPos; - bool bIsValidSelection - = nSelectedParas == 0 - && (nSelectedChars == 0 || nSelectedChars == 1 || nSelectedChars == -1); - if (!bIsValidSelection) + if (aSel.start.nPara != aSel.end.nPara || std::abs(aSel.end.nIndex - aSel.start.nIndex) > 1) return false; const SvxFieldData* pField diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 6c9aeda64a4c..0e791eee9a36 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -158,9 +158,9 @@ OUString const & Outliner::GetWordDelimiters() const return pEditEngine->GetWordDelimiters(); } -OUString Outliner::GetWord( sal_Int32 nPara, sal_Int32 nIndex ) +OUString Outliner::GetWord(const EPaM& rPos) { - return pEditEngine->GetWord( nPara, nIndex ); + return pEditEngine->GetWord(rPos); } void Outliner::Draw( OutputDevice& rOutDev, const tools::Rectangle& rOutRect ) @@ -423,7 +423,7 @@ bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, bool* pbBu { Point aDocPos = GetDocPos( rPaperPos ); sal_Int32 nPara = pEditEngine->FindParagraph( aDocPos.Y() ); - if ( ( nPara != EE_PARA_NOT_FOUND ) && ImplHasNumberFormat( nPara ) ) + if ((nPara != EE_PARA_MAX) && ImplHasNumberFormat(nPara)) { tools::Rectangle aBulArea = ImpCalcBulletArea( nPara, true, true ); if ( aBulArea.Contains( rPaperPos ) ) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 171c296beaa1..e23ee74ff09f 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -150,7 +150,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara ) void Outliner::ParagraphDeleted( sal_Int32 nPara ) { - if ( nBlockInsCallback || ( nPara == EE_PARA_ALL ) ) + if (nBlockInsCallback || (nPara == EE_PARA_MAX)) return; Paragraph* pPara = pParaList->GetParagraph( nPara ); @@ -606,7 +606,7 @@ void Outliner::AddText( const OutlinerParaObject& rPObj, bool bAppend ) else { nPara = pParaList->GetParagraphCount(); - pEditEngine->InsertParagraph( EE_PARA_APPEND, rPObj.GetTextObject(), bAppend ); + pEditEngine->InsertParagraph(EE_PARA_MAX, rPObj.GetTextObject(), bAppend); } bFirstParaIsEmpty = false; @@ -816,7 +816,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const vcl::Font aStdFont; if ( !pEditEngine->IsFlatMode() ) { - ESelection aSel( nPara, 0, nPara, 0 ); + ESelection aSel(nPara, 0); aStdFont = EditEngine::CreateFontFromItemSet( pEditEngine->GetAttribs( aSel ), pEditEngine->GetScriptType( aSel ) ); } else @@ -1470,7 +1470,7 @@ void Outliner::StyleSheetChanged( SfxStyleSheet const * pStyle ) ImplCalcBulletText( nPara, false, false ); // EditEngine formats changed paragraphs before calling this method, // so they are not reformatted now and use wrong bullet indent - pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) ); + pEditEngine->QuickMarkInvalid(ESelection(nPara, 0)); } } } @@ -2029,7 +2029,7 @@ std::optional Outliner::GetNonOverflowingText() const bool bItAllOverflew = nCount == 0 && nOverflowLine == 0; if ( bItAllOverflew ) { - ESelection aEmptySel(0,0,0,0); + ESelection aEmptySel; //EditTextObject *pTObj = pEditEngine->CreateTextObject(aEmptySel); bool const bLastParaInterrupted = true; // Last Para was interrupted since everything overflew return NonOverflowingText(aEmptySel, bLastParaInterrupted); diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx index e6dc6e691c6c..91f89a8e3e8c 100644 --- a/editeng/source/outliner/outlobj.cxx +++ b/editeng/source/outliner/outlobj.cxx @@ -166,10 +166,10 @@ TextRotation OutlinerParaObject::GetRotation() const sal_Int32 OutlinerParaObject::Count() const { size_t nSize = mpImpl->maParagraphDataVector.size(); - if (nSize > EE_PARA_MAX_COUNT) + if (nSize > o3tl::make_unsigned(EE_PARA_MAX)) { SAL_WARN( "editeng", "OutlinerParaObject::Count - overflow " << nSize); - return EE_PARA_MAX_COUNT; + return EE_PARA_MAX; } return static_cast(nSize); } diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index e4f06d4548a0..62fa083b0321 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -123,12 +123,12 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra { if( !bReadOnly && !bSelection && ( pOwner->GetOutlinerMode() != OutlinerMode::TextObject ) ) { - if( aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) ) + if (aSel.end.nIndex == pOwner->pEditEngine->GetTextLen(aSel.end.nPara)) { - Paragraph* pNext = pOwner->pParaList->GetParagraph( aSel.nEndPara+1 ); + Paragraph* pNext = pOwner->pParaList->GetParagraph(aSel.end.nPara + 1); if( pNext && pNext->HasFlag(ParaFlag::ISPAGE) ) { - if( !pOwner->ImpCanDeleteSelectedPages( this, aSel.nEndPara, 1 ) ) + if (!pOwner->ImpCanDeleteSelectedPages(this, aSel.end.nPara, 1)) return false; } } @@ -149,13 +149,13 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra { if ( ( pOwner->GetOutlinerMode() != OutlinerMode::TextObject ) && ( pOwner->GetOutlinerMode() != OutlinerMode::TitleObject ) && - ( bSelection || !aSel.nStartPos ) ) + ( bSelection || !aSel.start.nIndex ) ) { Indent( aKeyCode.IsShift() ? -1 : +1 ); bKeyProcessed = true; } else if ( ( pOwner->GetOutlinerMode() == OutlinerMode::TextObject ) && - !bSelection && !aSel.nEndPos && pOwner->ImplHasNumberFormat( aSel.nEndPara ) ) + !bSelection && !aSel.end.nIndex && pOwner->ImplHasNumberFormat( aSel.end.nPara ) ) { Indent( aKeyCode.IsShift() ? -1 : +1 ); bKeyProcessed = true; @@ -165,15 +165,15 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra break; case KEY_BACKSPACE: { - if( !bReadOnly && !bSelection && aSel.nEndPara && !aSel.nEndPos ) + if (!bReadOnly && !bSelection && aSel.end.nPara && !aSel.end.nIndex) { - Paragraph* pPara = pOwner->pParaList->GetParagraph( aSel.nEndPara ); - Paragraph* pPrev = pOwner->pParaList->GetParagraph( aSel.nEndPara-1 ); + Paragraph* pPara = pOwner->pParaList->GetParagraph(aSel.end.nPara); + Paragraph* pPrev = pOwner->pParaList->GetParagraph(aSel.end.nPara - 1); if( !pPrev->IsVisible() ) return true; if( !pPara->GetDepth() ) { - if(!pOwner->ImpCanDeleteSelectedPages(this, aSel.nEndPara , 1 ) ) + if (!pOwner->ImpCanDeleteSelectedPages(this, aSel.end.nPara, 1)) return true; } } @@ -185,26 +185,26 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra { // Special treatment: hard return at the end of a paragraph, // which has collapsed subparagraphs. - Paragraph* pPara = pOwner->pParaList->GetParagraph( aSel.nEndPara ); + Paragraph* pPara = pOwner->pParaList->GetParagraph(aSel.end.nPara); if( !aKeyCode.IsShift() ) { // Don't let insert empty paragraph with numbering. Instead end numbering. if (pPara->GetDepth() > -1 && - pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) == 0) + pOwner->pEditEngine->GetTextLen( aSel.end.nPara ) == 0) { ToggleBullets(); return true; } // ImpGetCursor again??? if( !bSelection && - aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) ) + aSel.end.nIndex == pOwner->pEditEngine->GetTextLen( aSel.end.nPara ) ) { sal_Int32 nChildren = pOwner->pParaList->GetChildCount(pPara); if( nChildren && !pOwner->pParaList->HasVisibleChildren(pPara)) { pOwner->UndoActionStart( OLUNDO_INSERT ); - sal_Int32 nTemp = aSel.nEndPara; + sal_Int32 nTemp = aSel.end.nPara; nTemp += nChildren; nTemp++; // insert above next Non-Child SAL_WARN_IF( nTemp < 0, "editeng", "OutlinerView::PostKeyEvent - overflow"); @@ -212,7 +212,7 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra { pOwner->Insert( OUString(),nTemp,pPara->GetDepth()); // Position the cursor - ESelection aTmpSel(nTemp,0,nTemp,0); + ESelection aTmpSel(nTemp, 0); pEditView->SetSelection( aTmpSel ); } pEditView->ShowCursor(); @@ -223,15 +223,15 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra } if( !bKeyProcessed && !bSelection && !aKeyCode.IsShift() && aKeyCode.IsMod1() && - ( aSel.nEndPos == pOwner->pEditEngine->GetTextLen(aSel.nEndPara) ) ) + ( aSel.end.nIndex == pOwner->pEditEngine->GetTextLen(aSel.end.nPara) ) ) { pOwner->UndoActionStart( OLUNDO_INSERT ); - sal_Int32 nTemp = aSel.nEndPara; + sal_Int32 nTemp = aSel.end.nPara; nTemp++; pOwner->Insert( OUString(), nTemp, pPara->GetDepth()+1 ); // Position the cursor - ESelection aTmpSel(nTemp,0,nTemp,0); + ESelection aTmpSel(nTemp, 0); pEditView->SetSelection( aTmpSel ); pEditView->ShowCursor(); pOwner->UndoActionEnd(); @@ -248,7 +248,7 @@ bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFra sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget) { - sal_Int32 nPara = EE_PARA_NOT_FOUND; + sal_Int32 nPara = EE_PARA_MAX; Point aMousePosWin = pEditView->GetOutputDevice().PixelToLogic( rPosPix ); if( !pEditView->GetOutputArea().Contains( aMousePosWin ) ) @@ -328,7 +328,7 @@ bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) if ( bHasChildren && pOwner->pParaList->HasVisibleChildren(pPara) ) nEndPara += pOwner->pParaList->GetChildCount( pPara ); // The selection is inverted, so that EditEngine does not scroll - ESelection aSel(nEndPara, EE_TEXTPOS_ALL, nPara, 0 ); + ESelection aSel(nEndPara, EE_TEXTPOS_MAX, nPara, 0); pEditView->SetSelection( aSel ); } else if( rMEvt.GetClicks() == 2 && bHasChildren ) @@ -338,10 +338,10 @@ bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) } // special case for outliner view in impress, check if double click hits the page icon for toggle - if( (nPara == EE_PARA_NOT_FOUND) && (pOwner->GetOutlinerMode() == OutlinerMode::OutlineView) && (eTarget == MouseTarget::Text) && (rMEvt.GetClicks() == 2) ) + if( (nPara == EE_PARA_MAX) && (pOwner->GetOutlinerMode() == OutlinerMode::OutlineView) && (eTarget == MouseTarget::Text) && (rMEvt.GetClicks() == 2) ) { ESelection aSel( pEditView->GetSelection() ); - nPara = aSel.nStartPara; + nPara = aSel.start.nPara; Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); if( (pPara && pOwner->pParaList->HasChildren(pPara)) && pPara->HasFlag(ParaFlag::ISPAGE) ) { @@ -375,7 +375,7 @@ void OutlinerView::ReleaseMouse() void OutlinerView::ImpToggleExpand( Paragraph const * pPara ) { sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pPara ); - pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) ); + pEditView->SetSelection(ESelection(nPara, 0)); ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChildren( pPara ) ); pEditView->ShowCursor(); } @@ -401,8 +401,8 @@ sal_Int16 OutlinerView::GetDepth() const { ESelection aESelection = GetSelection(); aESelection.Adjust(); - sal_Int16 nDepth = pOwner->GetDepth(aESelection.nStartPara); - for (sal_Int32 nPara = aESelection.nStartPara + 1; nPara <= aESelection.nEndPara; ++nPara) + sal_Int16 nDepth = pOwner->GetDepth(aESelection.start.nPara); + for (sal_Int32 nPara = aESelection.start.nPara + 1; nPara <= aESelection.end.nPara; ++nPara) { if (nDepth != pOwner->GetDepth(nPara)) return -2; @@ -440,7 +440,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs ) ParaRange OutlinerView::ImpGetSelectedParagraphs( bool bIncludeHiddenChildren ) { ESelection aSel = pEditView->GetSelection(); - ParaRange aParas( aSel.nStartPara, aSel.nEndPara ); + ParaRange aParas(aSel.start.nPara, aSel.end.nPara); aParas.Adjust(); // Record the invisible Children of the last Parents in the selection @@ -497,7 +497,7 @@ void OutlinerView::Indent( short nDiff ) pPara->SetFlag( ParaFlag::ISPAGE ); pOwner->DepthChangedHdl(pPara, nPrevFlags); - pOwner->pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) ); + pOwner->pEditEngine->QuickMarkInvalid(ESelection(nPara, 0)); if( bUndo ) pOwner->InsertUndo( std::make_unique( pOwner, nPara, nPrevFlags, pPara->nFlags ) ); @@ -566,7 +566,7 @@ void OutlinerView::Indent( short nDiff ) else { // Needs at least a repaint... - pOwner->pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) ); + pOwner->pEditEngine->QuickMarkInvalid(ESelection(nPara, 0)); } } @@ -790,8 +790,8 @@ sal_Int32 OutlinerView::ImpInitPaste( sal_Int32& rStart ) pOwner->bPasting = true; ESelection aSelection( pEditView->GetSelection() ); aSelection.Adjust(); - rStart = aSelection.nStartPara; - sal_Int32 nSize = aSelection.nEndPara - aSelection.nStartPara + 1; + rStart = aSelection.start.nPara; + sal_Int32 nSize = aSelection.end.nPara - aSelection.start.nPara + 1; return nSize; } @@ -814,11 +814,7 @@ bool OutlinerView::Command(const CommandEvent& rCEvt) void OutlinerView::SelectRange( sal_Int32 nFirst, sal_Int32 nCount ) { - sal_Int32 nLast = nFirst+nCount; - nCount = pOwner->pParaList->GetParagraphCount(); - if( nLast <= nCount ) - nLast = nCount - 1; - ESelection aSel( nFirst, 0, nLast, EE_TEXTPOS_ALL ); + ESelection aSel(nFirst, 0, nFirst + nCount, EE_TEXTPOS_MAX); pEditView->SetSelection( aSel ); } @@ -829,18 +825,18 @@ sal_Int32 OutlinerView::ImpCalcSelectedPages( bool bIncludeFirstSelected ) aSel.Adjust(); sal_Int32 nPages = 0; - sal_Int32 nFirstPage = EE_PARA_MAX_COUNT; - sal_Int32 nStartPara = aSel.nStartPara; + sal_Int32 nFirstPage = EE_PARA_MAX; + sal_Int32 nStartPara = aSel.start.nPara; if ( !bIncludeFirstSelected ) nStartPara++; // All paragraphs after StartPara will be deleted - for ( sal_Int32 nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ ) + for (sal_Int32 nPara = nStartPara; nPara <= aSel.end.nPara; nPara++) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); assert(pPara && "ImpCalcSelectedPages: invalid Selection?"); if( pPara->HasFlag(ParaFlag::ISPAGE) ) { nPages++; - if( nFirstPage == EE_PARA_MAX_COUNT ) + if (nFirstPage == EE_PARA_MAX) nFirstPage = nPara; } } @@ -867,7 +863,7 @@ void OutlinerView::ToggleBullets() sal_Int16 nNewDepth = -2; const SvxNumRule* pDefaultBulletNumRule = nullptr; - for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) + for (sal_Int32 nPara = aSel.start.nPara; nPara <= aSel.end.nPara; nPara++) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?"); @@ -920,10 +916,10 @@ void OutlinerView::ToggleBullets() } const sal_Int32 nParaCount = pOwner->pParaList->GetParagraphCount(); - pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount ); + pOwner->ImplCheckParagraphs(aSel.start.nPara, nParaCount); sal_Int32 nEndPara = (nParaCount > 0) ? nParaCount-1 : nParaCount; - pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nEndPara, 0 ) ); + pOwner->pEditEngine->QuickMarkInvalid(ESelection(aSel.start.nPara, 0, nEndPara, 0)); pOwner->pEditEngine->SetUpdateLayout( bUpdate ); @@ -943,7 +939,7 @@ void OutlinerView::ToggleBulletsNumbering( if ( bToggle ) { bToggleOn = false; - const sal_Int16 nBulletNumberingStatus( pOwner->GetBulletsNumberingStatus( aSel.nStartPara, aSel.nEndPara ) ); + const sal_Int16 nBulletNumberingStatus( pOwner->GetBulletsNumberingStatus( aSel.start.nPara, aSel.end.nPara ) ); if ( nBulletNumberingStatus != 0 && bHandleBullets ) { // not all paragraphs have bullets and method called to toggle bullets --> bullets on @@ -977,7 +973,7 @@ void OutlinerView::EnsureNumberingIsOn() const bool bUpdate = pOwner->pEditEngine->IsUpdateLayout(); pOwner->pEditEngine->SetUpdateLayout(false); - for (sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++) + for (sal_Int32 nPara = aSel.start.nPara; nPara <= aSel.end.nPara; nPara++) { Paragraph* pPara = pOwner->pParaList->GetParagraph(nPara); DBG_ASSERT(pPara, "OutlinerView::EnableBullets(), illegal selection?"); @@ -987,10 +983,10 @@ void OutlinerView::EnsureNumberingIsOn() } sal_Int32 nParaCount = pOwner->pParaList->GetParagraphCount(); - pOwner->ImplCheckParagraphs(aSel.nStartPara, nParaCount); + pOwner->ImplCheckParagraphs(aSel.start.nPara, nParaCount); const sal_Int32 nEndPara = (nParaCount > 0) ? nParaCount-1 : nParaCount; - pOwner->pEditEngine->QuickMarkInvalid(ESelection(aSel.nStartPara, 0, nEndPara, 0)); + pOwner->pEditEngine->QuickMarkInvalid(ESelection(aSel.start.nPara, 0, nEndPara, 0)); pOwner->pEditEngine->SetUpdateLayout(bUpdate); @@ -1017,8 +1013,8 @@ void OutlinerView::ApplyBulletsNumbering( { ESelection aSel( pEditView->GetSelection() ); aSel.Adjust(); - nStartPara = aSel.nStartPara; - nEndPara = aSel.nEndPara; + nStartPara = aSel.start.nPara; + nEndPara = aSel.end.nPara; } else { @@ -1135,8 +1131,8 @@ void OutlinerView::SwitchOffBulletsNumbering( { ESelection aSel( pEditView->GetSelection() ); aSel.Adjust(); - nStartPara = aSel.nStartPara; - nEndPara = aSel.nEndPara; + nStartPara = aSel.start.nPara; + nEndPara = aSel.end.nPara; } else { @@ -1193,7 +1189,7 @@ void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, bool bKeepLanguages ) // Loop through all paragraphs and set indentation and level ESelection aSel = pEditView->GetSelection(); aSel.Adjust(); - for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) + for (sal_Int32 nPara = aSel.start.nPara; nPara <= aSel.end.nPara; nPara++) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); pOwner->ImplInitDepth( nPara, pPara->GetDepth(), false ); @@ -1414,8 +1410,8 @@ void OutlinerView::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueItera pEditView->Read( rInput, eFormat, pHTTPHeaderAttrs ); tools::Long nParaDiff = pEditView->getEditEngine().GetParagraphCount() - nOldParaCount; - sal_Int32 nChangesStart = aOldSel.nStartPara; - sal_Int32 nChangesEnd = nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara); + sal_Int32 nChangesStart = aOldSel.start.nPara; + sal_Int32 nChangesEnd = nChangesStart + nParaDiff + (aOldSel.end.nPara-aOldSel.start.nPara); for ( sal_Int32 n = nChangesStart; n <= nChangesEnd; n++ ) { @@ -1505,7 +1501,7 @@ bool GetStatusValueForThesaurusFromContext( if (!isSingleScriptType(rEditEngine.GetScriptType(aTextSel))) return false; - LanguageType nLang = rEditEngine.GetLanguage( aTextSel.nStartPara, aTextSel.nStartPos ).nLang; + LanguageType nLang = rEditEngine.GetLanguage(aTextSel.start.nPara, aTextSel.start.nIndex).nLang; OUString aLangText( LanguageTag::convertToBcp47( nLang ) ); // set word and locale to look up as status value diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index 0a17cd609100..b54706b9f059 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -126,9 +126,9 @@ bool NonOverflowingText::IsLastParaInterrupted() const std::optional NonOverflowingText::RemoveOverflowingText(Outliner *pOutliner) const { pOutliner->QuickDelete(maContentSel); - SAL_INFO("editeng.chaining", "Deleting selection from (Para: " << maContentSel.nStartPara - << ", Pos: " << maContentSel.nStartPos << ") to (Para: " << maContentSel.nEndPara - << ", Pos: " << maContentSel.nEndPos << ")"); + SAL_INFO("editeng.chaining", "Deleting selection from (Para: " << maContentSel.start.nPara + << ", Pos: " << maContentSel.start.nIndex << ") to (Para: " << maContentSel.end.nPara + << ", Pos: " << maContentSel.end.nIndex << ")"); return pOutliner->CreateParaObject(); } @@ -137,7 +137,7 @@ ESelection NonOverflowingText::GetOverflowPointSel() const //return getLastPositionSel(mpContentTextObj); // return the starting point of the selection we are removing - return ESelection(maContentSel.nStartPara, maContentSel.nStartPos); //XXX + return ESelection(maContentSel.start); //XXX } // The equivalent of ToParaObject for OverflowingText. Here we are prepending the overflowing text to the old dest box's text diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index 5b9f21449854..d25a00b18207 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -97,15 +97,15 @@ void ParagraphList::Clear() void ParagraphList::Append( std::unique_ptr pPara) { - SAL_WARN_IF( maEntries.size() >= EE_PARA_MAX_COUNT, "editeng", "ParagraphList::Append - overflow"); + SAL_WARN_IF( maEntries.size() >= EE_PARA_MAX, "editeng", "ParagraphList::Append - overflow"); maEntries.push_back(std::move(pPara)); } void ParagraphList::Insert( std::unique_ptr pPara, sal_Int32 nAbsPos) { - SAL_WARN_IF( nAbsPos < 0 || (maEntries.size() < o3tl::make_unsigned(nAbsPos) && nAbsPos != EE_PARA_APPEND), + SAL_WARN_IF( nAbsPos < 0 || (maEntries.size() < o3tl::make_unsigned(nAbsPos) && nAbsPos != EE_PARA_MAX), "editeng", "ParagraphList::Insert - bad insert position " << nAbsPos); - SAL_WARN_IF( maEntries.size() >= EE_PARA_MAX_COUNT, "editeng", "ParagraphList::Insert - overflow"); + SAL_WARN_IF( maEntries.size() >= EE_PARA_MAX, "editeng", "ParagraphList::Insert - overflow"); if (nAbsPos < 0 || maEntries.size() <= o3tl::make_unsigned(nAbsPos)) Append( std::move(pPara) ); @@ -242,7 +242,7 @@ sal_Int32 ParagraphList::GetAbsPos( Paragraph const * pParent ) const ++pos; } - return EE_PARA_NOT_FOUND; + return EE_PARA_MAX; } void ParagraphList::dumpAsXml(xmlTextWriterPtr pWriter) const diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index 304acd50de13..12a67e1353fe 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -160,7 +160,7 @@ void SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nE if ( !bInCell ) return; - EPosition aStartPos( nPara, nStartIndex ), aEndPos( nPara, nEndIndex ); + EPaM aStartPos(nPara, nStartIndex), aEndPos(nPara, nEndIndex); sal_Int32 nParaCount = rEE.GetParagraphCount(); sal_Int32 nCrrntParaLen = rEE.GetTextLen(nPara); //need to find closest index in front of nIndex in the previous paragraphs diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 15342e874753..a99039cbe780 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -186,7 +186,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_Int32 nEEIndex, const SvxTextForwar EBulletInfo aBulletInfo = rTF.GetBulletInfo( GetParagraph() ); // any text bullets? - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { @@ -232,7 +232,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& EBulletInfo aBulletInfo = rTF.GetBulletInfo( GetParagraph() ); // any text bullets? - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { @@ -431,12 +431,11 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); // normalize selection - if( rSel.nStartPara > rSel.nEndPara || - (rSel.nStartPara == rSel.nEndPara && rSel.nStartPos > rSel.nEndPos) ) + if (!rSel.IsAdjusted()) { std::swap( aStartIndex, aEndIndex ); } @@ -495,8 +494,8 @@ SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, EditEng SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); return mpTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex), nOnlyHardAttrib ); } @@ -547,8 +546,8 @@ SfxItemState SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, sal SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); return mpTextForwarder->GetItemState( MakeEESelection(aStartIndex, aEndIndex), nWhich ); @@ -568,8 +567,8 @@ void SvxAccessibleTextAdapter::QuickInsertText( const OUString& rText, const ESe SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); mpTextForwarder->QuickInsertText( rText, MakeEESelection(aStartIndex, aEndIndex) ); @@ -582,8 +581,8 @@ void SvxAccessibleTextAdapter::QuickInsertField( const SvxFieldItem& rFld, const SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); mpTextForwarder->QuickInsertField( rFld, MakeEESelection(aStartIndex, aEndIndex) ); @@ -596,8 +595,8 @@ void SvxAccessibleTextAdapter::QuickSetAttribs( const SfxItemSet& rSet, const ES SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); mpTextForwarder->QuickSetAttribs( rSet, MakeEESelection(aStartIndex, aEndIndex) ); @@ -610,8 +609,8 @@ void SvxAccessibleTextAdapter::QuickInsertLineBreak( const ESelection& rSel ) SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); mpTextForwarder->QuickInsertLineBreak( MakeEESelection(aStartIndex, aEndIndex) ); } @@ -745,7 +744,7 @@ tools::Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_Int32 nPara ) cons EBulletInfo aBulletInfo = GetBulletInfo( nPara ); - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { @@ -792,7 +791,7 @@ bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32& EBulletInfo aBulletInfo = GetBulletInfo( nPara ); // any text bullets? - if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + if( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { @@ -993,8 +992,8 @@ bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel ) SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); return mpTextForwarder->Delete( MakeEESelection(aStartIndex, aEndIndex ) ); } @@ -1006,8 +1005,8 @@ bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelectio SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); return mpTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) ); } @@ -1019,6 +1018,13 @@ bool SvxAccessibleTextAdapter::QuickFormatDoc( bool bFull ) return mpTextForwarder->QuickFormatDoc( bFull ); } +bool SvxAccessibleTextAdapter::SupportsOutlineDepth() const +{ + assert(mpTextForwarder && "SvxAccessibleTextAdapter: no forwarder"); + + return mpTextForwarder->SupportsOutlineDepth(); +} + sal_Int16 SvxAccessibleTextAdapter::GetDepth( sal_Int32 nPara ) const { assert(mpTextForwarder && "SvxAccessibleTextAdapter: no forwarder"); @@ -1042,7 +1048,7 @@ bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const { EBulletInfo aBulletInfo = GetBulletInfo( nPara ); - return ( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + return ( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType == SVX_NUM_BITMAP ); } @@ -1051,7 +1057,7 @@ bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const { EBulletInfo aBulletInfo = GetBulletInfo( nPara ); - return ( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && + return ( aBulletInfo.nParagraph != EE_PARA_MAX && aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ); } @@ -1061,12 +1067,11 @@ bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel ) const SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *this ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *this ); // normalize selection - if( rSel.nStartPara > rSel.nEndPara || - (rSel.nStartPara == rSel.nEndPara && rSel.nStartPos > rSel.nEndPos) ) + if (!rSel.IsAdjusted()) { std::swap( aStartIndex, aEndIndex ); } @@ -1141,8 +1146,8 @@ bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetEEIndex( aSelection.nStartPara, aSelection.nStartPos, *mpTextForwarder ); - aEndIndex.SetEEIndex( aSelection.nEndPara, aSelection.nEndPos, *mpTextForwarder ); + aStartIndex.SetEEIndex( aSelection.start.nPara, aSelection.start.nIndex, *mpTextForwarder ); + aEndIndex.SetEEIndex( aSelection.end.nPara, aSelection.end.nIndex, *mpTextForwarder ); DBG_ASSERT(aStartIndex.GetIndex() >= 0 && aEndIndex.GetIndex() >= 0, @@ -1161,8 +1166,8 @@ bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel ) SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aEndIndex; - aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *mpTextForwarder ); - aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *mpTextForwarder ); + aStartIndex.SetIndex( rSel.start.nPara, rSel.start.nIndex, *mpTextForwarder ); + aEndIndex.SetIndex( rSel.end.nPara, rSel.end.nIndex, *mpTextForwarder ); return mpViewForwarder->SetSelection( MakeEESelection(aStartIndex, aEndIndex) ); } diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index c24f9ff965b1..c8728c6255a5 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -63,7 +63,7 @@ OUString SvxEditEngineForwarder::GetText( const ESelection& rSel ) const SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const { - if( rSel.nStartPara == rSel.nEndPara ) + if (rSel.start.nPara == rSel.end.nPara) { GetAttribsFlags nFlags = GetAttribsFlags::NONE; switch( nOnlyHardAttrib ) @@ -78,7 +78,7 @@ SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, EditEngin OSL_FAIL("unknown flags for SvxOutlinerForwarder::GetAttribs"); } - return rEditEngine.GetAttribs( rSel.nStartPara, rSel.nStartPos, rSel.nEndPos, nFlags ); + return rEditEngine.GetAttribs( rSel.start.nPara, rSel.start.nIndex, rSel.end.nIndex, nFlags ); } else { @@ -184,17 +184,17 @@ SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ES SfxItemState eState = SfxItemState::DEFAULT; // check all paragraphs inside the selection - for( sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ ) + for (sal_Int32 nPara = rSel.start.nPara; nPara <= rSel.end.nPara; nPara++) { SfxItemState eParaState = SfxItemState::DEFAULT; // calculate start and endpos for this paragraph sal_Int32 nPos = 0; - if( rSel.nStartPara == nPara ) - nPos = rSel.nStartPos; + if (rSel.start.nPara == nPara) + nPos = rSel.start.nIndex; - sal_Int32 nEndPos = rSel.nEndPos; - if( rSel.nEndPara != nPara ) + sal_Int32 nEndPos = rSel.end.nIndex; + if (rSel.end.nPara != nPara) nEndPos = rEditEngine.GetTextLen( nPara ); @@ -313,7 +313,7 @@ tools::Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int if( nIndex ) { // use last character, if possible - aLast = rEditEngine.GetCharacterBounds( EPosition(nPara, nIndex-1) ); + aLast = rEditEngine.GetCharacterBounds(EPaM(nPara, nIndex - 1)); // move at end of this last character, make one pixel wide aLast.Move( aLast.Right() - aLast.Left(), 0 ); @@ -339,7 +339,7 @@ tools::Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int } else { - return SvxEditSourceHelper::EEToUserSpace( rEditEngine.GetCharacterBounds( EPosition(nPara, nIndex) ), + return SvxEditSourceHelper::EEToUserSpace( rEditEngine.GetCharacterBounds( EPaM(nPara, nIndex) ), aSize, bIsVertical ); } } @@ -391,7 +391,7 @@ bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPar aSize, rEditEngine.IsEffectivelyVertical() )); - EPosition aDocPos = rEditEngine.FindDocPosition( aEEPos ); + EPaM aDocPos = rEditEngine.FindDocPosition(aEEPos); nPara = aDocPos.nPara; nIndex = aDocPos.nIndex; @@ -403,11 +403,11 @@ bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, { ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD ); - if( aRes.nStartPara == nPara && - aRes.nStartPara == aRes.nEndPara ) + if( aRes.start.nPara == nPara && + aRes.start.nPara == aRes.end.nPara ) { - nStart = aRes.nStartPos; - nEnd = aRes.nEndPos; + nStart = aRes.start.nIndex; + nEnd = aRes.end.nIndex; return true; } @@ -465,6 +465,12 @@ bool SvxEditEngineForwarder::InsertText( const OUString& rStr, const ESelection& return true; } +bool SvxEditEngineForwarder::SupportsOutlineDepth() const +{ + // EditEngine does not support outline depth indirectly - directly supports EE_PARA_OUTLLEVEL + return false; +} + sal_Int16 SvxEditEngineForwarder::GetDepth( sal_Int32 ) const { // EditEngine does not support outline depth @@ -496,7 +502,7 @@ sal_Int32 SvxEditEngineForwarder::AppendTextPortion( sal_Int32 nPara, const OUSt if (0 <= nPara && nPara < nParaCount) { nLen = rEditEngine.GetTextLen( nPara ); - rEditEngine.QuickInsertText( rText, ESelection( nPara, nLen, nPara, nLen ) ); + rEditEngine.QuickInsertText(rText, ESelection(nPara, nLen)); } return nLen; diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index a04885190050..fe56a08e9086 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -69,7 +69,7 @@ OUString SvxOutlinerForwarder::GetText( const ESelection& rSel ) const static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib, EditEngine& rEditEngine ) { - if( rSel.nStartPara == rSel.nEndPara ) + if (rSel.start.nPara == rSel.end.nPara) { GetAttribsFlags nFlags = GetAttribsFlags::NONE; @@ -84,7 +84,7 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, EditE default: OSL_FAIL("unknown flags for SvxOutlinerForwarder::GetAttribs"); } - return rEditEngine.GetAttribs( rSel.nStartPara, rSel.nStartPos, rSel.nEndPos, nFlags ); + return rEditEngine.GetAttribs( rSel.start.nPara, rSel.start.nIndex, rSel.end.nIndex, nFlags ); } else { @@ -121,7 +121,7 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, EditEngineA maAttribCacheSelection = rSel; } - SfxStyleSheet* pStyle = rEditEngine.GetStyleSheet( rSel.nStartPara ); + SfxStyleSheet* pStyle = rEditEngine.GetStyleSheet(rSel.start.nPara); if( pStyle ) aSet.SetParent( &(pStyle->GetItemSet() ) ); @@ -299,7 +299,7 @@ tools::Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 if( nIndex ) { // use last character, if possible - aLast = rOutliner.GetEditEngine().GetCharacterBounds( EPosition(nPara, nIndex-1) ); + aLast = rOutliner.GetEditEngine().GetCharacterBounds(EPaM(nPara, nIndex - 1)); // move at end of this last character, make one pixel wide aLast.Move( aLast.Right() - aLast.Left(), 0 ); @@ -325,7 +325,7 @@ tools::Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 } else { - return SvxEditSourceHelper::EEToUserSpace( rOutliner.GetEditEngine().GetCharacterBounds( EPosition(nPara, nIndex) ), + return SvxEditSourceHelper::EEToUserSpace( rOutliner.GetEditEngine().GetCharacterBounds( EPaM(nPara, nIndex) ), aSize, bIsVertical ); } } @@ -356,7 +356,7 @@ bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, aSize, rOutliner.IsVertical() )); - EPosition aDocPos = rOutliner.GetEditEngine().FindDocPosition( aEEPos ); + EPaM aDocPos = rOutliner.GetEditEngine().FindDocPosition(aEEPos); nPara = aDocPos.nPara; nIndex = aDocPos.nIndex; @@ -366,13 +366,13 @@ bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const { - ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD ); + ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD ); - if( aRes.nStartPara == nPara && - aRes.nStartPara == aRes.nEndPara ) + if( aRes.start.nPara == nPara && + aRes.start.nPara == aRes.end.nPara ) { - nStart = aRes.nStartPos; - nEnd = aRes.nEndPos; + nStart = aRes.start.nIndex; + nEnd = aRes.end.nIndex; return true; } @@ -431,6 +431,11 @@ bool SvxOutlinerForwarder::InsertText( const OUString& rStr, const ESelection& r return true; } +bool SvxOutlinerForwarder::SupportsOutlineDepth() const +{ + return true; +} + sal_Int16 SvxOutlinerForwarder::GetDepth( sal_Int32 nPara ) const { DBG_ASSERT( 0 <= nPara && nPara < GetParagraphCount(), "SvxOutlinerForwarder::GetDepth: Invalid paragraph index"); @@ -539,7 +544,7 @@ sal_Int32 SvxOutlinerForwarder::AppendTextPortion( sal_Int32 nPara, const OUStri if (0 <= nPara && nPara < nParaCount) { nLen = rEditEngine.GetTextLen( nPara ); - rEditEngine.QuickInsertText( rText, ESelection( nPara, nLen, nPara, nLen ) ); + rEditEngine.QuickInsertText(rText, ESelection(nPara, nLen)); } return nLen; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 64c00e802888..6f149cdc67e1 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -60,10 +60,10 @@ namespace { ESelection toESelection(const text::TextRangeSelection& rSel) { ESelection aESel; - aESel.nStartPara = rSel.Start.Paragraph; - aESel.nStartPos = rSel.Start.PositionInParagraph; - aESel.nEndPara = rSel.End.Paragraph; - aESel.nEndPos = rSel.End.PositionInParagraph; + aESel.start.nPara = rSel.Start.Paragraph; + aESel.start.nIndex = rSel.Start.PositionInParagraph; + aESel.end.nPara = rSel.End.Paragraph; + aESel.end.nIndex = rSel.End.PositionInParagraph; return aESel; } @@ -151,7 +151,7 @@ void CheckSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarde if( !pForwarder ) return; - if( rSel.nStartPara == EE_PARA_MAX_COUNT ) + if (rSel.start.nPara == EE_PARA_MAX) { ::GetSelection( rSel, pForwarder ); } @@ -161,35 +161,31 @@ void CheckSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarde GetSelection( aMaxSelection, pForwarder ); // check start position - if( rSel.nStartPara < aMaxSelection.nStartPara ) + if (rSel.start.nPara < aMaxSelection.start.nPara) { - rSel.nStartPara = aMaxSelection.nStartPara; - rSel.nStartPos = aMaxSelection.nStartPos; + rSel.start = aMaxSelection.start; } - else if( rSel.nStartPara > aMaxSelection.nEndPara ) + else if (rSel.start.nPara > aMaxSelection.end.nPara) { - rSel.nStartPara = aMaxSelection.nEndPara; - rSel.nStartPos = aMaxSelection.nEndPos; + rSel.start = aMaxSelection.end; } - else if( rSel.nStartPos > pForwarder->GetTextLen( rSel.nStartPara ) ) + else if (rSel.start.nIndex > pForwarder->GetTextLen(rSel.start.nPara)) { - rSel.nStartPos = pForwarder->GetTextLen( rSel.nStartPara ); + rSel.start.nIndex = pForwarder->GetTextLen(rSel.start.nPara); } // check end position - if( rSel.nEndPara < aMaxSelection.nStartPara ) + if (rSel.end.nPara < aMaxSelection.start.nPara) { - rSel.nEndPara = aMaxSelection.nStartPara; - rSel.nEndPos = aMaxSelection.nStartPos; + rSel.end = aMaxSelection.start; } - else if( rSel.nEndPara > aMaxSelection.nEndPara ) + else if (rSel.end.nPara > aMaxSelection.end.nPara) { - rSel.nEndPara = aMaxSelection.nEndPara; - rSel.nEndPos = aMaxSelection.nEndPos; + rSel.end = aMaxSelection.end; } - else if( rSel.nEndPos > pForwarder->GetTextLen( rSel.nEndPara ) ) + else if (rSel.end.nIndex > pForwarder->GetTextLen(rSel.end.nPara)) { - rSel.nEndPos = pForwarder->GetTextLen( rSel.nEndPara ); + rSel.end.nIndex = pForwarder->GetTextLen(rSel.end.nPara); } } } @@ -270,7 +266,7 @@ void SvxUnoTextRangeBase::SetEditSource( SvxEditSource* pSource ) noexcept mpEditSource.reset( pSource ); - maSelection.nStartPara = EE_PARA_MAX_COUNT; + maSelection.start.nPara = EE_PARA_MAX; if( mpEditSource ) mpEditSource->addRange( this ); @@ -320,8 +316,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart() xRange = pRange; ESelection aNewSel = maSelection; - aNewSel.nEndPara = aNewSel.nStartPara; - aNewSel.nEndPos = aNewSel.nStartPos; + aNewSel.CollapseToStart(); pRange->SetSelection( aNewSel ); } @@ -348,8 +343,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd() xRet = pNew; ESelection aNewSel = maSelection; - aNewSel.nStartPara = aNewSel.nEndPara; - aNewSel.nStartPos = aNewSel.nEndPos; + aNewSel.CollapseToEnd(); pNew->SetSelection( aNewSel ); } return xRet; @@ -439,8 +433,8 @@ void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const if( nPara == -1 ) { - nPara = aSel.nStartPara; - nEndPara = aSel.nEndPara; + nPara = aSel.start.nPara; + nEndPara = aSel.end.nPara; } else { @@ -471,8 +465,8 @@ void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const if( nPara == -1 ) { - nPara = aSel.nStartPara; - nEndPara = aSel.nEndPara; + nPara = aSel.start.nPara; + nEndPara = aSel.end.nPara; } else { @@ -535,11 +529,14 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertyMapEntry* SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr; if(pForwarder && pSelection) { + if (!pForwarder->SupportsOutlineDepth()) + return false; + sal_Int16 nLevel = sal_Int16(); if( aValue >>= nLevel ) { // #101004# Call interface method instead of unsafe cast - if(! pForwarder->SetDepth( pSelection->nStartPara, nLevel ) ) + if (!pForwarder->SetDepth(pSelection->start.nPara, nLevel)) throw lang::IllegalArgumentException(); // If valid, then not yet finished. Also needs to be added to paragraph props. @@ -556,7 +553,7 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertyMapEntry* sal_Int16 nStartValue = -1; if( aValue >>= nStartValue ) { - pForwarder->SetNumberingStartValue( pSelection->nStartPara, nStartValue ); + pForwarder->SetNumberingStartValue(pSelection->start.nPara, nStartValue); return true; } } @@ -570,7 +567,7 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertyMapEntry* bool bParaIsNumberingRestart = false; if( aValue >>= bParaIsNumberingRestart ) { - pForwarder->SetParaIsNumberingRestart( pSelection->nStartPara, bParaIsNumberingRestart ); + pForwarder->SetParaIsNumberingRestart( pSelection->start.nPara, bParaIsNumberingRestart ); return true; } } @@ -601,10 +598,10 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property { const ESelection& rSel = GetSelection(); text::TextRangeSelection aSel; - aSel.Start.Paragraph = rSel.nStartPara; - aSel.Start.PositionInParagraph = rSel.nStartPos; - aSel.End.Paragraph = rSel.nEndPara; - aSel.End.PositionInParagraph = rSel.nEndPos; + aSel.Start.Paragraph = rSel.start.nPara; + aSel.Start.PositionInParagraph = rSel.start.nIndex; + aSel.End.Paragraph = rSel.end.nPara; + aSel.End.PositionInParagraph = rSel.end.nIndex; return uno::Any(aSel); } @@ -659,7 +656,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertyMapEntry* pMap, std::optional pFldLineStyle; SvxTextForwarder* pForwarder = mpEditSource->GetTextForwarder(); - OUString aPresentation( pForwarder->CalcFieldValue( SvxFieldItem(*pData, EE_FEATURE_FIELD), maSelection.nStartPara, maSelection.nStartPos, pTColor, pFColor, pFldLineStyle ) ); + OUString aPresentation( pForwarder->CalcFieldValue( SvxFieldItem(*pData, EE_FEATURE_FIELD), maSelection.start.nPara, maSelection.start.nIndex, pTColor, pFColor, pFldLineStyle ) ); uno::Reference< text::XTextField > xField( new SvxUnoTextField( xAnchor, aPresentation, pData ) ); rAny <<= xField; @@ -679,7 +676,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertyMapEntry* pMap, case WID_PARASTYLENAME: { - rAny <<= GetEditSource()->GetTextForwarder()->GetStyleSheet(maSelection.nStartPara); + rAny <<= GetEditSource()->GetTextForwarder()->GetStyleSheet(maSelection.start.nPara); } break; @@ -721,7 +718,10 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, cons SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr; if(pForwarder && pSelection) { - sal_Int16 nLevel = pForwarder->GetDepth( pSelection->nStartPara ); + if (!pForwarder->SupportsOutlineDepth()) + return false; + + sal_Int16 nLevel = pForwarder->GetDepth(pSelection->start.nPara); if( nLevel >= 0 ) aAny <<= nLevel; } @@ -731,14 +731,14 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, cons { SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr; if(pForwarder && pSelection) - aAny <<= pForwarder->GetNumberingStartValue( pSelection->nStartPara ); + aAny <<= pForwarder->GetNumberingStartValue(pSelection->start.nPara); } break; case WID_PARAISNUMBERINGRESTART: { SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr; if(pForwarder && pSelection) - aAny <<= pForwarder->IsParaIsNumberingRestart( pSelection->nStartPara ); + aAny <<= pForwarder->IsParaIsNumberingRestart(pSelection->start.nPara); } break; @@ -800,8 +800,8 @@ void SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& a if( nTempPara == -1 ) { - nTempPara = aSel.nStartPara; - nEndPara = aSel.nEndPara; + nTempPara = aSel.start.nPara; + nEndPara = aSel.end.nPara; } std::optional pOldAttrSet; @@ -1287,11 +1287,11 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co } else if( pMap->nWID == WID_NUMBERINGSTARTVALUE ) { - pForwarder->SetNumberingStartValue( maSelection.nStartPara, -1 ); + pForwarder->SetNumberingStartValue(maSelection.start.nPara, -1); } else if( pMap->nWID == WID_PARAISNUMBERINGRESTART ) { - pForwarder->SetParaIsNumberingRestart( maSelection.nStartPara, false ); + pForwarder->SetParaIsNumberingRestart(maSelection.start.nPara, false); } else { @@ -1397,24 +1397,21 @@ void SvxUnoTextRangeBase::CollapseToStart() noexcept { CheckSelection( maSelection, mpEditSource.get() ); - maSelection.nEndPara = maSelection.nStartPara; - maSelection.nEndPos = maSelection.nStartPos; + maSelection.CollapseToStart(); } void SvxUnoTextRangeBase::CollapseToEnd() noexcept { CheckSelection( maSelection, mpEditSource.get() ); - maSelection.nStartPara = maSelection.nEndPara; - maSelection.nStartPos = maSelection.nEndPos; + maSelection.CollapseToEnd(); } bool SvxUnoTextRangeBase::IsCollapsed() noexcept { CheckSelection( maSelection, mpEditSource.get() ); - return ( maSelection.nStartPara == maSelection.nEndPara && - maSelection.nStartPos == maSelection.nEndPos ); + return !maSelection.HasRange(); } bool SvxUnoTextRangeBase::GoLeft(sal_Int32 nCount, bool Expand) noexcept @@ -1422,8 +1419,8 @@ bool SvxUnoTextRangeBase::GoLeft(sal_Int32 nCount, bool Expand) noexcept CheckSelection( maSelection, mpEditSource.get() ); // #75098# use end position, as in Writer (start is anchor, end is cursor) - sal_Int32 nNewPos = maSelection.nEndPos; - sal_Int32 nNewPar = maSelection.nEndPara; + sal_Int32 nNewPos = maSelection.end.nIndex; + sal_Int32 nNewPar = maSelection.end.nPara; bool bOk = true; SvxTextForwarder* pForwarder = nullptr; @@ -1445,8 +1442,8 @@ bool SvxUnoTextRangeBase::GoLeft(sal_Int32 nCount, bool Expand) noexcept if ( bOk ) { nNewPos = nNewPos - nCount; - maSelection.nStartPara = nNewPar; - maSelection.nStartPos = nNewPos; + maSelection.start.nPara = nNewPar; + maSelection.start.nIndex = nNewPos; } if (!Expand) @@ -1465,8 +1462,8 @@ bool SvxUnoTextRangeBase::GoRight(sal_Int32 nCount, bool Expand) noexcept CheckSelection( maSelection, pForwarder ); - sal_Int32 nNewPos = maSelection.nEndPos + nCount; - sal_Int32 nNewPar = maSelection.nEndPara; + sal_Int32 nNewPos = maSelection.end.nIndex + nCount; + sal_Int32 nNewPar = maSelection.end.nPara; bool bOk = true; sal_Int32 nParCount = pForwarder->GetParagraphCount(); @@ -1485,8 +1482,8 @@ bool SvxUnoTextRangeBase::GoRight(sal_Int32 nCount, bool Expand) noexcept if (bOk) { - maSelection.nEndPara = nNewPar; - maSelection.nEndPos = nNewPos; + maSelection.end.nPara = nNewPar; + maSelection.end.nIndex = nNewPos; } if (!Expand) @@ -1497,8 +1494,8 @@ bool SvxUnoTextRangeBase::GoRight(sal_Int32 nCount, bool Expand) noexcept void SvxUnoTextRangeBase::GotoStart(bool Expand) noexcept { - maSelection.nStartPara = 0; - maSelection.nStartPos = 0; + maSelection.start.nPara = 0; + maSelection.start.nIndex = 0; if (!Expand) CollapseToStart(); @@ -1516,8 +1513,8 @@ void SvxUnoTextRangeBase::GotoEnd(bool Expand) noexcept if (nPar) --nPar; - maSelection.nEndPara = nPar; - maSelection.nEndPos = pForwarder->GetTextLen( nPar ); + maSelection.end.nPara = nPar; + maSelection.end.nIndex = pForwarder->GetTextLen(nPar); if (!Expand) CollapseToEnd(); @@ -1553,17 +1550,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Referenc const ESelection& r1 = pR1->maSelection; const ESelection& r2 = pR2->maSelection; - if( r1.nStartPara == r2.nStartPara ) - { - if( r1.nStartPos == r2.nStartPos ) - return 0; - else - return r1.nStartPos < r2.nStartPos ? 1 : -1; - } - else - { - return r1.nStartPara < r2.nStartPara ? 1 : -1; - } + return r1.start == r2.start ? 0 : r1.start < r2.start ? 1 : -1; } sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) @@ -1577,17 +1564,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< const ESelection& r1 = pR1->maSelection; const ESelection& r2 = pR2->maSelection; - if( r1.nEndPara == r2.nEndPara ) - { - if( r1.nEndPos == r2.nEndPos ) - return 0; - else - return r1.nEndPos < r2.nEndPos ? 1 : -1; - } - else - { - return r1.nEndPara < r2.nEndPara ? 1 : -1; - } + return r1.end == r2.end ? 0 : r1.end < r2.end ? 1 : -1; } SvxUnoTextRange::SvxUnoTextRange(const SvxUnoTextBase& rParent, bool bPortion /* = false */) @@ -1850,21 +1827,19 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text { pForwarder->QuickInsertText( u""_ustr, aRange ); - aRange.nEndPos = aRange.nStartPos; - aRange.nEndPara = aRange.nStartPara; + aRange.CollapseToStart(); } else { - aRange.nStartPara = aRange.nEndPara; - aRange.nStartPos = aRange.nEndPos; + aRange.CollapseToEnd(); } pForwarder->QuickInsertLineBreak( aRange ); GetEditSource()->UpdateData(); - aRange.nEndPos += 1; + aRange.end.nIndex += 1; if( !bAbsorb ) - aRange.nStartPos += 1; + aRange.start.nIndex += 1; pRange->SetSelection( aRange ); } @@ -1878,19 +1853,18 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text ESelection aRange = pRange->GetSelection(); // ESelection aOldSelection = aRange; - aRange.nStartPos = pForwarder->GetTextLen( aRange.nStartPara ); + aRange.start.nIndex = pForwarder->GetTextLen( aRange.start.nPara ); - aRange.nEndPara = aRange.nStartPara; - aRange.nEndPos = aRange.nStartPos; + aRange.CollapseToStart(); pRange->SetSelection( aRange ); static constexpr OUStringLiteral CR = u"\x0D"; pRange->setString( CR ); - aRange.nStartPos = 0; - aRange.nStartPara += 1; - aRange.nEndPos = 0; - aRange.nEndPara += 1; + aRange.start.nIndex = 0; + aRange.start.nPara += 1; + aRange.end.nIndex = 0; + aRange.end.nPara += 1; pRange->SetSelection( aRange ); @@ -1989,7 +1963,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumera if (!GetEditSource()) return uno::Reference< container::XEnumeration >(); - if( maSelection == ESelection(0,0,0,0) || maSelection == ESelection(EE_PARA_MAX_COUNT,0,0,0) ) + if (maSelection == ESelection(0, 0, 0, 0) || maSelection == ESelection(EE_PARA_MAX, 0, 0, 0)) { ESelection aSelection; ::GetSelection( aSelection, GetEditSource()->GetTextForwarder() ); @@ -2108,7 +2082,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( // set properties for the previously last paragraph sal_Int32 nPara = nParaCount - 1; - ESelection aSel( nPara, 0, nPara, 0 ); + ESelection aSel(nPara, 0); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), pTextForwarder, nPara ); @@ -2151,7 +2125,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, - ImplGetSvxTextPortionSfxPropertySet(), pTextForwarder, aSelection.nStartPara ); + ImplGetSvxTextPortionSfxPropertySet(), pTextForwarder, aSelection.start.nPara ); pTextForwarder->QuickSetAttribs( aItemSet, aSelection); rtl::Reference pNewRange = new SvxUnoTextRange( *this ); xRet = pNewRange; @@ -2516,6 +2490,11 @@ bool SvxDummyTextSource::QuickFormatDoc( bool ) return false; } +bool SvxDummyTextSource::SupportsOutlineDepth() const +{ + return false; +} + sal_Int16 SvxDummyTextSource::GetDepth( sal_Int32 ) const { return -1; diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index d56981cc5ece..520aa65c74bf 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -51,18 +51,18 @@ SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase return; const SvxTextForwarder* pTextForwarder = rText.GetEditSource()->GetTextForwarder(); - const sal_Int32 maxParaIndex = std::min( rSel.nEndPara + 1, pTextForwarder->GetParagraphCount() ); + const sal_Int32 maxParaIndex = std::min( rSel.end.nPara + 1, pTextForwarder->GetParagraphCount() ); - for( sal_Int32 currentPara = rSel.nStartPara; currentPara < maxParaIndex; currentPara++ ) + for (sal_Int32 currentPara = rSel.start.nPara; currentPara < maxParaIndex; currentPara++) { const SvxUnoTextRangeBaseVec& rRanges( mpEditSource->getRanges() ); rtl::Reference pContent; sal_Int32 nStartPos = 0; sal_Int32 nEndPos = pTextForwarder->GetTextLen( currentPara ); - if( currentPara == rSel.nStartPara ) - nStartPos = std::max(nStartPos, rSel.nStartPos); - if( currentPara == rSel.nEndPara ) - nEndPos = std::min(nEndPos, rSel.nEndPos); + if (currentPara == rSel.start.nPara) + nStartPos = std::max(nStartPos, rSel.start.nIndex); + if (currentPara == rSel.end.nPara) + nEndPos = std::min(nEndPos, rSel.end.nIndex); ESelection aCurrentParaSel( currentPara, nStartPos, currentPara, nEndPos ); for (auto const& elemRange : rRanges) { @@ -374,24 +374,24 @@ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rPa if (rParentText.GetEditSource()) mpEditSource = rParentText.GetEditSource()->Clone(); - if( !(mpEditSource && mpEditSource->GetTextForwarder() && (nParagraph == rSel.nStartPara && nParagraph == rSel.nEndPara)) ) + if( !(mpEditSource && mpEditSource->GetTextForwarder() && (nParagraph == rSel.start.nPara && nParagraph == rSel.end.nPara)) ) return; std::vector aPortions; mpEditSource->GetTextForwarder()->GetPortions( nParagraph, aPortions ); for( size_t aPortionIndex = 0; aPortionIndex < aPortions.size(); aPortionIndex++ ) { - sal_uInt16 nStartPos = 0; + sal_Int32 nStartPos = 0; if ( aPortionIndex > 0 ) nStartPos = aPortions.at( aPortionIndex - 1 ); - if( nStartPos > rSel.nEndPos ) + if (nStartPos > rSel.end.nIndex) continue; - sal_uInt16 nEndPos = aPortions.at( aPortionIndex ); - if( nEndPos < rSel.nStartPos ) + sal_Int32 nEndPos = aPortions.at(aPortionIndex); + if (nEndPos < rSel.start.nIndex) continue; - nStartPos = std::max(nStartPos, rSel.nStartPos); - nEndPos = std::min(nEndPos, rSel.nEndPos); + nStartPos = std::max(nStartPos, rSel.start.nIndex); + nEndPos = std::min(nEndPos, rSel.end.nIndex); ESelection aSel( nParagraph, nStartPos, nParagraph, nEndPos ); const SvxUnoTextRangeBaseVec& rRanges( mpEditSource->getRanges() ); @@ -572,8 +572,7 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRang if( bExpand ) { const ESelection& rOldSel = GetSelection(); - aNewSel.nStartPara = rOldSel.nStartPara; - aNewSel.nStartPos = rOldSel.nStartPos; + aNewSel.start = rOldSel.start; } SetSelection( aNewSel ); diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index ba2c8ba5002d..4be391ed72dc 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -153,7 +153,7 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection // Init return PaM. EditPaM aPaM( rEditEngine.CreateSelection( rSel ).Max()); - ESelection aSel(rSel.nStartPara+1, 0, rSel.nEndPara+1, 0); + ESelection aSel(rSel.start.nPara + 1, 0, rSel.end.nPara + 1, 0); uno::Reference xParent; rtl::Reference pUnoText = new SvxUnoText( &aEditSource, &aSvxXMLTextImportComponentPropertySet, xParent ); pUnoText->SetSelection( aSel ); @@ -209,16 +209,16 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection //remove the extra para breaks EditDoc& pDoc = rEditEngine.GetEditDoc(); - rEditEngine.ParaAttribsToCharAttribs( pDoc.GetObject( rSel.nEndPara ) ); - rEditEngine.ConnectParagraphs( pDoc.GetObject( rSel.nEndPara ), - pDoc.GetObject( rSel.nEndPara + 1 ), true ); - rEditEngine.ParaAttribsToCharAttribs( pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.nEndPara - 2 ) ); - rEditEngine.ConnectParagraphs( pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.nEndPara - 2 ), - pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.nEndPara -1 ), true ); + rEditEngine.ParaAttribsToCharAttribs(pDoc.GetObject(rSel.end.nPara)); + rEditEngine.ConnectParagraphs(pDoc.GetObject(rSel.end.nPara), + pDoc.GetObject(rSel.end.nPara + 1), true); + rEditEngine.ParaAttribsToCharAttribs( pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.end.nPara - 2 ) ); + rEditEngine.ConnectParagraphs( pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.end.nPara - 2 ), + pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.end.nPara -1 ), true ); // The final join is to be returned. - aPaM = rEditEngine.ConnectParagraphs( pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.nEndPara - 2 ), - pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.nEndPara -1 ), true ); + aPaM = rEditEngine.ConnectParagraphs( pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.end.nPara - 2 ), + pDoc.GetObject( pDoc.Count() - initialParaCount + aSel.end.nPara -1 ), true ); } catch( const uno::Exception& ) { diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 15ad2ea51e89..53c27b3a9ac9 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -403,11 +404,19 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() uno::Sequence< beans::PropertyValue > aArgs( m_aDocMediaDescriptor.getLength() + nLen ); auto pArgs = aArgs.getArray(); - pArgs[0].Name = "URL"; - if(m_aLinkTempFile.is()) - pArgs[0].Value <<= m_aLinkTempFile->getUri(); + OUString sURL; + if (m_aLinkTempFile.is()) + sURL = m_aLinkTempFile->getUri(); else - pArgs[0].Value <<= m_aLinkURL; + sURL = m_aLinkURL; + if (INetURLObject(sURL).IsExoticProtocol()) + { + SAL_WARN("embeddedobj.common", "Ignore exotic protocol: " << pArgs[0].Value); + return nullptr; + } + + pArgs[0].Name = "URL"; + pArgs[0].Value <<= sURL; pArgs[1].Name = "FilterName"; pArgs[1].Value <<= m_aLinkFilterName; diff --git a/extensions/inc/strings.hrc b/extensions/inc/strings.hrc index a14f66ef78a2..17e2ad7caa76 100644 --- a/extensions/inc/strings.hrc +++ b/extensions/inc/strings.hrc @@ -253,7 +253,7 @@ #define RID_STR_HEADERBACKGROUNDCOLOR NC_("RID_STR_HEADERBACKGROUNDCOLOR", "Header background color") #define RID_STR_HEADERTEXTCOLOR NC_("RID_STR_HEADERTEXTCOLOR", "Header text color") #define RID_STR_ACTIVESELECTIONBACKGROUNDCOLOR NC_("RID_STR_ACTIVESELECTIONBACKGROUNDCOLOR", "Active selection background color") -#define RID_STR_ACTIVESELECTIONTEXTCOLOR NC_("ID_STR_ACTIVESELECTIONTEXTCOLOR", "Active selection text color") +#define RID_STR_ACTIVESELECTIONTEXTCOLOR NC_("RID_STR_ACTIVESELECTIONTEXTCOLOR", "Active selection text color") #define RID_STR_INACTIVESELECTIONBACKGROUNDCOLOR NC_("RID_STR_INACTIVESELECTIONBACKGROUNDCOLOR", "Inactive selection background color") #define RID_STR_INACTIVESELECTIONTEXTCOLOR NC_("RID_STR_INACTIVESELECTIONTEXTCOLOR", "Inactive selection text color") #define RID_STR_STANDARD NC_("RID_STR_STANDARD", "Default") diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 0f97ef6ec418..aa224fd18981 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -853,13 +853,13 @@ namespace pcr case PROPERTY_ID_LISTSOURCE: // no cursor source if no Base is installed. - if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (SvtModuleOptions().IsDataBaseInstalled()) const_cast< FormComponentPropertyHandler* >( this )->m_bHaveListSource = true; break; case PROPERTY_ID_COMMAND: // no cursor source if no Base is installed. - if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (SvtModuleOptions().IsDataBaseInstalled()) const_cast< FormComponentPropertyHandler* >( this )->m_bHaveCommand = true; break; } // switch ( nPropId ) @@ -2283,7 +2283,7 @@ namespace pcr // no data properties if no Base is installed. if ( ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0 ) - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (!SvtModuleOptions().IsDataBaseInstalled()) return true; if ((nPropertyUIFlags & PROP_FLAG_REPORT_INVISIBLE) != 0 && isReportModel()) diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index f0e80f06f05f..fd227a2f7445 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr)) $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ external/libcdr/libcdr-visibility-win.patch \ - external/libcdr/ax_gcc_func_attribute.m4.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/ax_gcc_func_attribute.m4.patch b/external/libcdr/ax_gcc_func_attribute.m4.patch deleted file mode 100644 index 37f4edf0bd46..000000000000 --- a/external/libcdr/ax_gcc_func_attribute.m4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -19167,7 +19167,7 @@ - - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : -- if test -s conftest.err; then : -+ if grep -- -Wattributes conftest.err; then : - ax_cv_have_func_attribute_visibility=no - else - ax_cv_have_func_attribute_visibility=yes diff --git a/external/libcdr/libcdr-visibility-win.patch b/external/libcdr/libcdr-visibility-win.patch index 7700cfd32f2f..5333b5e44b1f 100644 --- a/external/libcdr/libcdr-visibility-win.patch +++ b/external/libcdr/libcdr-visibility-win.patch @@ -1,11 +1,11 @@ --- configure.dt 2018-12-29 16:23:02.355271146 +0100 +++ configure 2018-12-29 16:23:21.644060142 +0100 -@@ -19116,6 +19116,8 @@ +@@ -23329,6 +23329,8 @@ - - if test $platform_win32 = yes; then : + if test $platform_win32 = yes + then : + HAVE_VISIBILITY_TRUE='#' + HAVE_VISIBILITY_FALSE= - else + else $as_nop diff --git a/external/libetonyek/0001-allow-0-size-message.patch.1 b/external/libetonyek/0001-allow-0-size-message.patch.1 deleted file mode 100644 index 62e584b815a0..000000000000 --- a/external/libetonyek/0001-allow-0-size-message.patch.1 +++ /dev/null @@ -1,30 +0,0 @@ -From 54762245feee35ce6885f7443da8f8443fccd5b5 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 26 May 2021 20:39:41 +0200 -Subject: [PATCH] allow 0-size message - -It likely means the input is broken, but there is no need to reject it. -Let's just produce a dummy, empty message. - -Change-Id: I03a1e9827f21f6a0ce69d7e16dfcf2e9a0f2d44f ---- - src/lib/IWAMessage.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lib/IWAMessage.cpp b/src/lib/IWAMessage.cpp -index c01b1b6..9456444 100644 ---- a/src/lib/IWAMessage.cpp -+++ b/src/lib/IWAMessage.cpp -@@ -42,7 +42,8 @@ IWAMessage::IWAMessage(const RVNGInputStreamPtr_t &input, unsigned long length) - : m_input(input) - , m_fields() - { -- assert(length > 0); -+ if (length == 0) -+ return; - - parse(length); - } --- -2.31.1 - diff --git a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 b/external/libetonyek/0001-fix-build-with-MSVC.patch.1 deleted file mode 100644 index 2a72844dc79a..000000000000 --- a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 +++ /dev/null @@ -1,28 +0,0 @@ -From 1aa22c746b41a688296f4daf4fc35710d2045a33 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 19 May 2021 19:43:43 +0200 -Subject: [PATCH] fix build with MSVC - -error C2664: 'libetonyek::IWORKFormula::IWORKFormula(const boost::optional &)': cannot convert argument 1 from 'int' to 'const boost::optional &' - -Change-Id: Iaa3de2d0ef8f960495e5d5afebb75c5063955177 ---- - src/lib/IWAParser.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp -index 7fd95c3..a2bd292 100644 ---- a/src/lib/IWAParser.cpp -+++ b/src/lib/IWAParser.cpp -@@ -3403,7 +3403,7 @@ bool IWAParser::parseFormula(const IWAMessage &msg, IWORKFormulaPtr_t &formula) - } - else - { -- formula.reset(new IWORKFormula(0)); -+ formula.reset(new IWORKFormula(boost::make_optional(0u))); - formula->parse(stack[0]); - } - return ok; --- -2.31.1 - diff --git a/external/libetonyek/0002-fix-build-with-MSVC.patch.1 b/external/libetonyek/0002-fix-build-with-MSVC.patch.1 deleted file mode 100644 index 0eadb0912f6a..000000000000 --- a/external/libetonyek/0002-fix-build-with-MSVC.patch.1 +++ /dev/null @@ -1,55 +0,0 @@ -From 7b69af66227309e9c258beca3bc3934be454a221 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 19 May 2021 21:11:40 +0200 -Subject: [PATCH] fix build with MSVC - -C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xutility(138): error C2668: 'libetonyek::IWORKStyle::IWORKStyle': ambiguous call to overloaded function -C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\libetonyek\src\lib\IWORKStyle.h(32): note: could be 'libetonyek::IWORKStyle::IWORKStyle(const libetonyek::IWORKPropertyMap &,const boost::optional &,const libetonyek::IWORKStylePtr_t &)' -C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\libetonyek\src\lib\IWORKStyle.h(31): note: or 'libetonyek::IWORKStyle::IWORKStyle(const libetonyek::IWORKPropertyMap &,const boost::optional &,const boost::optional &)' -C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xutility(137): note: while trying to match the argument list '(libetonyek::IWORKPropertyMap, const boost::none_t, _Ty)' - with - [ - _Ty=nullptr - ] -C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2186): note: see reference to function template instantiation 'void std::_Construct_in_place<_Ty,libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(_Ty &,libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&) noexcept(false)' being compiled - with - [ - _Ty=libetonyek::IWORKStyle - ] -C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2906): note: see reference to function template instantiation 'std::_Ref_count_obj2<_Ty>::_Ref_count_obj2(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled - with - [ - _Ty=libetonyek::IWORKStyle - ] -C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2907): note: see reference to function template instantiation 'std::_Ref_count_obj2<_Ty>::_Ref_count_obj2(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled - with - [ - _Ty=libetonyek::IWORKStyle - ] -C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/libetonyek/src/lib/IWAParser.cpp(2358): note: see reference to function template instantiation 'std::shared_ptr std::make_shared(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled - -Change-Id: Idf871474b2a20f252073846388d018cccc15bc11 ---- - src/lib/IWAParser.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp -index a2bd292..1fdeae7 100644 ---- a/src/lib/IWAParser.cpp -+++ b/src/lib/IWAParser.cpp -@@ -2355,10 +2355,10 @@ void IWAParser::parseAuthorInComment(unsigned id) - IWORKPropertyMap props; - // normally yellow, but blue may be better in LO - props.put(IWORKColor(0,0,1,1)); -- spans[0]=std::make_shared(props, boost::none, nullptr); -+ spans[0]=std::make_shared(props, boost::none, IWORKStylePtr_t()); - // reset color to default, if not, comment will be blue colored - props.put(IWORKColor(0,0,0,1)); -- spans[unsigned(len)]=std::make_shared(props, boost::none, nullptr); -+ spans[unsigned(len)]=std::make_shared(props, boost::none, IWORKStylePtr_t()); - text.setSpans(spans); - text.parse(*m_currentText); - } --- -2.31.1 - diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 788cf7607710..e13737cbe6a8 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -19,12 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/win_build.patch.1 \ external/libetonyek/ubsan.patch \ external/libetonyek/rpath.patch \ - external/libetonyek/warnings.patch \ - external/libetonyek/0001-fix-build-with-MSVC.patch.1 \ - external/libetonyek/0002-fix-build-with-MSVC.patch.1 \ - external/libetonyek/0001-allow-0-size-message.patch.1 \ external/libetonyek/enumarith.patch \ - external/libetonyek/include.patch \ )) ifneq ($(OS),MACOSX) diff --git a/external/libetonyek/include.patch b/external/libetonyek/include.patch deleted file mode 100644 index 4052d8093e0f..000000000000 --- a/external/libetonyek/include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/IWORKShape.cpp -+++ src/lib/IWORKShape.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/external/libetonyek/warnings.patch b/external/libetonyek/warnings.patch deleted file mode 100644 index 841d70cb68e8..000000000000 --- a/external/libetonyek/warnings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/IWORKXMLContext.cpp -+++ src/lib/IWORKXMLContext.cpp -@@ -18,7 +18,7 @@ - { - } - --void IWORKXMLContext::CDATA(const char */*value*/) -+void IWORKXMLContext::CDATA(const char * /*value*/) - { - ETONYEK_DEBUG_MSG(("IWORKXMLContext::cData: find unexpected CDATA block\n")); - } diff --git a/external/libqxp/UnpackedTarball_libqxp.mk b/external/libqxp/UnpackedTarball_libqxp.mk index 9f111bcb2b81..54d3e36addd4 100644 --- a/external/libqxp/UnpackedTarball_libqxp.mk +++ b/external/libqxp/UnpackedTarball_libqxp.mk @@ -17,7 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0)) $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \ external/libqxp/android-workaround.patch.1 \ - external/libcdr/ax_gcc_func_attribute.m4.patch \ + external/libqxp/ax_gcc_func_attribute.m4.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk index dbce7aec4bdd..3ba6bfef583f 100644 --- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1)) $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\ external/mariadb-connector-c/clang-cl.patch.0 \ + external/mariadb-connector-c/c23.patch.0 \ )) # TODO are any "plugins" needed? diff --git a/external/mariadb-connector-c/c23.patch.0 b/external/mariadb-connector-c/c23.patch.0 new file mode 100644 index 000000000000..d19d6be4cdae --- /dev/null +++ b/external/mariadb-connector-c/c23.patch.0 @@ -0,0 +1,11 @@ +--- include/ma_global.h ++++ include/ma_global.h +@@ -683,7 +683,7 @@ + typedef int myf; /* Type of MyFlags in my_funcs */ + typedef char my_bool; /* Small bool */ + typedef unsigned long long my_ulonglong; +-#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) ++#if !defined(bool) && !defined(bool_defined) && !(defined(__cplusplus) || __STDC_VERSION__ >= 202311L) + typedef char bool; /* Ordinary boolean values 0 1 */ + #endif + /* Macros for converting *constants* to the right type */ diff --git a/external/postgresql/0001-Assume-that-stdbool.h-conforms-to-the-C-standard.patch.1 b/external/postgresql/0001-Assume-that-stdbool.h-conforms-to-the-C-standard.patch.1 new file mode 100644 index 000000000000..73c6461033cc --- /dev/null +++ b/external/postgresql/0001-Assume-that-stdbool.h-conforms-to-the-C-standard.patch.1 @@ -0,0 +1,429 @@ +From d5fb5a35816df670d329600e44fe22617b578415 Mon Sep 17 00:00:00 2001 +From: Thomas Munro +Date: Mon, 25 Nov 2024 13:11:28 +1300 +Subject: Assume that conforms to the C standard. + +Previously we checked "for that conforms to C99" using +autoconf's AC_HEADER_STDBOOL macro. We've required C99 since PostgreSQL +12, so the test was redundant, and under C23 it was broken: autoconf +2.69's implementation doesn't understand C23's new empty header (the +macros it's looking for went away, replaced by language keywords). +Later autoconf versions fixed that, but let's just remove the +anachronistic test. + +HAVE_STDBOOL_H and HAVE__BOOL will no longer be defined, but they +weren't directly tested in core or likely extensions (except in 11, see +below). PG_USE_STDBOOL (or USE_STDBOOL in 11 and 12) is still defined +when sizeof(bool) is 1, which should be true on all modern systems. +Otherwise we define our own bool type and values of size 1, which would +fail to compile under C23 as revealed by the broken test. (We'll +probably clean that dead code up in master, but here we want a minimal +back-patchable change.) + +This came to our attention when GCC 15 recently started using using C23 +by default and failed to compile the replacement code, as reported by +Sam James and build farm animal alligator. + +Back-patch to all supported releases, and then two older versions that +also know about , per the recently-out-of-support policy[1]. +12 requires C99 so it's much like the supported releases, but 11 only +assumes C89 so it now uses AC_CHECK_HEADERS instead of the overly picky +AC_HEADER_STDBOOL. (I could find no discussion of which historical +systems had but failed the conformance test; if they ever +existed, they surely aren't relevant to that policy's goals.) + +[1] https://wiki.postgresql.org/wiki/Committing_checklist#Policies + +Reported-by: Sam James +Reviewed-by: Peter Eisentraut (master version) +Reviewed-by: Tom Lane (approach) +Discussion: https://www.postgresql.org/message-id/flat/87o72eo9iu.fsf%40gentoo.org +(cherry picked from commit bc5a4dfcf7390145dc3ba3c1c18c5ce561b778cd) +Conflicts: + configure + meson.build + src/include/pg_config.h.in + src/tools/msvc/Solution.pm +--- + configure | 182 +++++++++---------------------------- + configure.ac | 13 +-- + src/include/c.h | 2 +- + src/include/pg_config.h.in | 6 -- + src/tools/msvc/Solution.pm | 2 - + 5 files changed, 48 insertions(+), 157 deletions(-) + +diff --git a/configure b/configure +index 7e6030e9e1..7a5bdeddbd 100755 +--- a/configure ++++ b/configure +@@ -2085,116 +2085,116 @@ $as_echo "$ac_res" >&6; } + + } # ac_fn_c_check_func + +-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +-# ------------------------------------------- +-# Tests whether TYPE exists after having included INCLUDES, setting cache +-# variable VAR accordingly. +-ac_fn_c_check_type () ++# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES ++# ---------------------------------------------------- ++# Tries to find if the field MEMBER exists in type AGGR, after including ++# INCLUDES, setting cache variable VAR accordingly. ++ac_fn_c_check_member () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 ++$as_echo_n "checking for $2.$3... " >&6; } ++if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 + else +- eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$4 ++$5 + int + main () + { +-if (sizeof ($2)) +- return 0; ++static $2 ac_aggr; ++if (ac_aggr.$3) ++return 0; + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$4=yes" ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$4 ++$5 + int + main () + { +-if (sizeof (($2))) +- return 0; ++static $2 ac_aggr; ++if (sizeof ac_aggr.$3) ++return 0; + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ++ eval "$4=yes" + else +- eval "$3=yes" ++ eval "$4=no" + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-eval ac_res=\$$3 ++eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +-} # ac_fn_c_check_type ++} # ac_fn_c_check_member + +-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +-# ---------------------------------------------------- +-# Tries to find if the field MEMBER exists in type AGGR, after including +-# INCLUDES, setting cache variable VAR accordingly. +-ac_fn_c_check_member () ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +-$as_echo_n "checking for $2.$3... " >&6; } +-if eval \${$4+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else ++ eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$5 ++$4 + int + main () + { +-static $2 ac_aggr; +-if (ac_aggr.$3) +-return 0; ++if (sizeof ($2)) ++ return 0; + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- eval "$4=yes" +-else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$5 ++$4 + int + main () + { +-static $2 ac_aggr; +-if (sizeof ac_aggr.$3) +-return 0; ++if (sizeof (($2))) ++ return 0; + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- eval "$4=yes" ++ + else +- eval "$4=no" ++ eval "$3=yes" + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-eval ac_res=\$$4 ++eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +-} # ac_fn_c_check_member ++} # ac_fn_c_check_type + + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES + # -------------------------------------------- +@@ -13746,100 +13746,6 @@ fi + ## Header files + ## + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } +-if ${ac_cv_header_stdbool_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include +- #ifndef bool +- "error: bool is not defined" +- #endif +- #ifndef false +- "error: false is not defined" +- #endif +- #if false +- "error: false is not 0" +- #endif +- #ifndef true +- "error: true is not defined" +- #endif +- #if true != 1 +- "error: true is not 1" +- #endif +- #ifndef __bool_true_false_are_defined +- "error: __bool_true_false_are_defined is not defined" +- #endif +- +- struct s { _Bool s: 1; _Bool t; } s; +- +- char a[true == 1 ? 1 : -1]; +- char b[false == 0 ? 1 : -1]; +- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; +- char d[(bool) 0.5 == true ? 1 : -1]; +- /* See body of main program for 'e'. */ +- char f[(_Bool) 0.0 == false ? 1 : -1]; +- char g[true]; +- char h[sizeof (_Bool)]; +- char i[sizeof s.t]; +- enum { j = false, k = true, l = false * true, m = true * 256 }; +- /* The following fails for +- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ +- _Bool n[m]; +- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; +- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; +- /* Catch a bug in an HP-UX C compiler. See +- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html +- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html +- */ +- _Bool q = true; +- _Bool *pq = &q; +- +-int +-main () +-{ +- +- bool e = &s; +- *pq |= q; +- *pq |= ! q; +- /* Refer to every declared value, to avoid compiler optimizations. */ +- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l +- + !m + !n + !o + !p + !q + !pq); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_header_stdbool_h=yes +-else +- ac_cv_header_stdbool_h=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +-$as_echo "$ac_cv_header_stdbool_h" >&6; } +- ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +-if test "x$ac_cv_type__Bool" = xyes; then : +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE__BOOL 1 +-_ACEOF +- +- +-fi +- +- +-if test $ac_cv_header_stdbool_h = yes; then +- +-$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h +- +-fi +- +- + for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/personality.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/signalfd.h sys/sockio.h sys/tas.h sys/uio.h sys/un.h termios.h ucred.h wctype.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +@@ -15711,9 +15617,7 @@ $as_echo_n "checking size of bool... " >&6; } + if ${ac_cv_sizeof_bool+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (bool))" "ac_cv_sizeof_bool" "#ifdef HAVE_STDBOOL_H +-#include +-#endif ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (bool))" "ac_cv_sizeof_bool" "#include + "; then : + + else +@@ -15739,7 +15643,7 @@ _ACEOF + + + +-if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then ++if test "$ac_cv_sizeof_bool" = 1; then + + $as_echo "#define PG_USE_STDBOOL 1" >>confdefs.h + +diff --git a/configure.ac b/configure.ac +index 7a75d6e37c..5484c910f6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1418,8 +1418,6 @@ AC_SUBST(UUID_LIBS) + ## Header files + ## + +-AC_HEADER_STDBOOL +- + AC_CHECK_HEADERS(m4_normalize([ + atomic.h + copyfile.h +@@ -1734,14 +1732,11 @@ if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then + AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) + fi + +-AC_CHECK_SIZEOF([bool], [], +-[#ifdef HAVE_STDBOOL_H +-#include +-#endif]) ++AC_CHECK_SIZEOF([bool], [], [#include ]) + +-dnl We use if we have it and it declares type bool as having +-dnl size 1. Otherwise, c.h will fall back to declaring bool as unsigned char. +-if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then ++dnl We use if bool has size 1 after including it. Otherwise, c.h ++dnl will fall back to declaring bool as unsigned char. ++if test "$ac_cv_sizeof_bool" = 1; then + AC_DEFINE([PG_USE_STDBOOL], 1, + [Define to 1 to use to define type bool.]) + fi +diff --git a/src/include/c.h b/src/include/c.h +index dd2e3b0f3e..cc19c23fb6 100644 +--- a/src/include/c.h ++++ b/src/include/c.h +@@ -398,7 +398,7 @@ typedef void (*pg_funcptr_t) (void); + * bool + * Boolean value, either true or false. + * +- * We use stdbool.h if available and its bool has size 1. That's useful for ++ * We use stdbool.h if bool has size 1 after including it. That's useful for + * better compiler and debugger output and for compatibility with third-party + * libraries. But PostgreSQL currently cannot deal with bool of other sizes; + * there are static assertions around the code to prevent that. +diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in +index 99e3731813..d9ef9a41bf 100644 +--- a/src/include/pg_config.h.in ++++ b/src/include/pg_config.h.in +@@ -517,9 +517,6 @@ + /* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */ + #undef HAVE_SSL_CTX_SET_NUM_TICKETS + +-/* Define to 1 if stdbool.h conforms to C99. */ +-#undef HAVE_STDBOOL_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H + +@@ -730,9 +727,6 @@ + /* Define to 1 if the assembler supports X86_64's POPCNTQ instruction. */ + #undef HAVE_X86_64_POPCNTQ + +-/* Define to 1 if the system has the type `_Bool'. */ +-#undef HAVE__BOOL +- + /* Define to 1 if your compiler understands __builtin_bswap16. */ + #undef HAVE__BUILTIN_BSWAP16 + +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index 07cc7b7ba2..f0ce2ac804 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -365,7 +365,6 @@ sub GenerateFiles + HAVE_SPINLOCKS => 1, + HAVE_SSL_CTX_SET_NUM_TICKETS => undef, + HAVE_SRANDOM => undef, +- HAVE_STDBOOL_H => 1, + HAVE_STDINT_H => 1, + HAVE_STDLIB_H => 1, + HAVE_STRCHRNUL => undef, +@@ -436,7 +435,6 @@ sub GenerateFiles + HAVE_X509_GET_SIGNATURE_NID => 1, + HAVE_X509_GET_SIGNATURE_INFO => undef, + HAVE_X86_64_POPCNTQ => undef, +- HAVE__BOOL => undef, + HAVE__BUILTIN_BSWAP16 => undef, + HAVE__BUILTIN_BSWAP32 => undef, + HAVE__BUILTIN_BSWAP64 => undef, +-- +2.47.0 + diff --git a/external/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk index 11fb603ef34f..44528b78d26f 100644 --- a/external/postgresql/UnpackedTarball_postgresql.mk +++ b/external/postgresql/UnpackedTarball_postgresql.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \ external/postgresql/windows.patch.0 \ external/postgresql/postgresql.exit.patch.0 \ external/postgresql/postgres-msvc-build.patch.1 \ + external/postgresql/0001-Assume-that-stdbool.h-conforms-to-the-C-standard.patch.1 \ $(if $(filter WNT_AARCH64,$(OS)_$(CPUNAME)), external/postgresql/arm64.patch.1) \ )) diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk index 6dc6491132df..92a05f08bc31 100644 --- a/external/redland/UnpackedTarball_raptor.mk +++ b/external/redland/UnpackedTarball_raptor.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\ external/redland/raptor/xml2-config.patch \ external/redland/raptor/raptor-libxml2-11.patch.1 \ $(if $(SYSTEM_ICU),,external/redland/raptor/raptor-icu.patch) \ + external/redland/raptor/disable-libxml-cleanup.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/redland/raptor/disable-libxml-cleanup.patch.1 b/external/redland/raptor/disable-libxml-cleanup.patch.1 new file mode 100644 index 000000000000..d42b2f3b8b9e --- /dev/null +++ b/external/redland/raptor/disable-libxml-cleanup.patch.1 @@ -0,0 +1,14 @@ +diff -ur raptor.org/src/raptor_libxml.c raptor/src/raptor_libxml.c +--- raptor.org/src/raptor_libxml.c 2024-11-26 10:21:41.759955398 +0200 ++++ raptor/src/raptor_libxml.c 2024-11-26 10:23:43.891720421 +0200 +@@ -657,7 +657,10 @@ + xmlSetGenericErrorFunc(world->libxml_saved_generic_error_context, + world->libxml_saved_generic_error_handler); + ++// I have logged a feature request to have a flag to turn this off, at https://github.com/dajobe/raptor/issues/69 ++#if 0 + xmlCleanupParser(); ++#endif + } + + diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk index 9754985f1a59..a0661e96b356 100644 --- a/extras/CustomTarget_templates.mk +++ b/extras/CustomTarget_templates.mk @@ -17,7 +17,7 @@ $(call gb_Trace_StartRange,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@ cd $(dir $<) && \ $(call gb_Helper_wsl_path,\ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ -$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^)) +$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^)) -x mimetype $(call gb_Trace_EndRange,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),ZIP) endef diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 0c04202e8a20..f78c226cd401 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_labels \ $(if $(filter WNT,$(OS)),Package_newfiles) \ Package_palettes \ + Package_tplpresnt \ Package_tplwizdesktop \ Package_wordbook \ )) @@ -51,7 +52,6 @@ endif ifneq ($(WITH_TEMPLATES),) $(eval $(call gb_Module_add_targets,extras,\ Package_templates \ - Package_tplpresnt \ Package_tplwizard \ Package_tplwizbitmap \ )) diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk index cb3cf2562245..a9e0b723cbf8 100644 --- a/extras/Package_tplpresnt.mk +++ b/extras/Package_tplpresnt.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt)) +ifneq ($(WITH_TEMPLATES),) + $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\ Candy.otp \ DNA.otp \ @@ -35,4 +37,11 @@ $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/templat Yellow_Idea.otp \ )) +else + +# For without-templates, still include the empty directory +$(eval $(call gb_Package_add_empty_directory,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt)) + +endif + # vim: set noet sw=4 ts=4: diff --git a/filter/qa/unit/data/tdf91315.fodp b/filter/qa/unit/data/tdf91315.fodp new file mode 100644 index 000000000000..a3d472fc1613 --- /dev/null +++ b/filter/qa/unit/data/tdf91315.fodp @@ -0,0 +1,429 @@ + + + 2015-05-16T06:24:54.7833246752015-05-16T06:26:35.675435300PT43S1LibreOfficeDev/25.2.0.0.alpha0$Linux_X86_64 LibreOffice_project/8392aa55baf949d7fecfcce56499256866ba5de9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + בדיקה (test) + + + + + + + + + + + + + \ No newline at end of file diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 61372d1442f6..366102fd964c 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -364,6 +364,21 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testMapModeText) // ahead to get the rotation. } +CPPUNIT_TEST_FIXTURE(SvgFilterTest, testTdf91315) +{ + // Load a presentation containing RTL text + loadFromFile(u"tdf91315.fodp"); + + save(u"impress_svg_Export"_ustr); + + xmlDocUniquePtr pXmlDoc = parseExportedFile(); + + assertXPath(pXmlDoc, "//svg:text[@direction='rtl']", 1); + // Without the accompanying fix, this test would have failed with: + // - Expected: 1 + // - Actual : 0 +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index a371fccf406e..b2d53224a3be 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -86,7 +86,6 @@ inline constexpr OUString CFGSET_CONTENTHANDLERS = u"ContentHandlers"_ustr; */ inline constexpr OUString CFGDIRECTKEY_OFFICELOCALE = u"/org.openoffice.Setup/L10N/ooLocale"_ustr; inline constexpr OUString CFGDIRECTKEY_DEFAULTFRAMELOADER = u"/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader"_ustr; -#define CFGDIRECTKEY_PRODUCTNAME "/org.openoffice.Setup/Product/ooName" // Note that these flag bits have parallel names in // comphelper/inc/comphelper/documentconstants.hxx . See that file for diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index ef77ace0e22f..3a8e8d946382 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -24,14 +24,6 @@ #include #include -/* FILE TYPE CONSTANTS: */ -#define BULCHART 32 /* Bullet chart file. */ -/* the following were added although SPC doesn't have a #define */ -/* for them... */ -#define AUTOTTLCHT 95 /* Autobuild TTL CHT */ -#define AUTOBULCHT 96 /* Autobuild BUL CHT */ -#define AUTOTABCHT 97 /* Autobuild TAB CHT */ - typedef struct TextEntry { sal_uInt16 nTypeOfText; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c1b5ada846e4..b208cbcb015e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2155,10 +2155,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aHandlePropVec.push_back( aProp ); } } - if ( !aHandlePropVec.empty() ) - { - aHandlesRange[ i ] = comphelper::containerToSequence(aHandlePropVec); - } + aHandlesRange[ i ] = comphelper::containerToSequence(aHandlePropVec); } // pushing the whole Handles element aProp.Name = "Handles"; @@ -3747,7 +3744,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) else ++nParaSize; } - ESelection aSelection( nParaIndex, 0, nParaIndex, 0 ); + ESelection aSelection(nParaIndex, 0); OUString aParagraph( pCurrent, nParaSize ); if ( !nParaIndex && aParagraph.isEmpty() ) // SJ: we are crashing if the first paragraph is empty ? aParagraph += " "; // otherwise these two lines can be removed. @@ -3755,9 +3752,9 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) rOutliner.SetParaAttribs( nParaIndex, rOutliner.GetEmptyItemSet() ); SfxItemSet aParagraphAttribs( rOutliner.GetEmptyItemSet() ); - if ( !aSelection.nStartPos ) + if (!aSelection.start.nIndex) aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, false ) ); - aSelection.nStartPos = 0; + aSelection.start.nIndex = 0; rOutliner.QuickSetAttribs( aParagraphAttribs, aSelection ); nParaIndex++; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c85d32b1ae64..d4bcc197d2e2 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2290,7 +2290,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* sal_Int32 nParaIndex = pTextObj->GetCurrentIndex(); SfxStyleSheet* pS = ppStyleSheetAry ? ppStyleSheetAry[ pPara->mxParaSet->mnDepth ] : pSheet; - ESelection aSelection( nParaIndex, 0, nParaIndex, 0 ); + ESelection aSelection(nParaIndex, 0); rOutliner.Insert( OUString(), nParaIndex, pPara->mxParaSet->mnDepth ); rOutliner.QuickInsertText( OUString(pParaText.get(), nCurrentIndex), aSelection ); rOutliner.SetParaAttribs( nParaIndex, rOutliner.GetEmptyItemSet() ); @@ -2303,8 +2303,8 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* std::unique_ptr pFieldItem(pPortion->GetTextField()); if ( pFieldItem ) { - rOutliner.QuickInsertField( *pFieldItem, ESelection( nParaIndex, aSelection.nEndPos, nParaIndex, aSelection.nEndPos + 1 ) ); - aSelection.nEndPos++; + rOutliner.QuickInsertField( *pFieldItem, ESelection( nParaIndex, aSelection.end.nIndex, nParaIndex, aSelection.end.nIndex + 1 ) ); + aSelection.end.nIndex++; } else { @@ -2317,22 +2317,19 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* { nLen = pPtr - pF; if ( nLen ) - aSelection.nEndPos = - sal::static_int_cast< sal_uInt16 >( - aSelection.nEndPos + nLen ); + aSelection.end.nIndex += nLen; pF = pPtr + 1; - rOutliner.QuickInsertLineBreak( ESelection( nParaIndex, aSelection.nEndPos, nParaIndex, aSelection.nEndPos + 1 ) ); - aSelection.nEndPos++; + rOutliner.QuickInsertLineBreak( ESelection( nParaIndex, aSelection.end.nIndex, nParaIndex, aSelection.end.nIndex + 1 ) ); + aSelection.end.nIndex++; } } nLen = pPtr - pF; if ( nLen ) - aSelection.nEndPos = sal::static_int_cast< sal_uInt16 >( - aSelection.nEndPos + nLen ); + aSelection.end.nIndex += nLen; } pPortion->ApplyTo( aPortionAttribs, const_cast(*this), nDestinationInstance, pTextObj ); rOutliner.QuickSetAttribs( aPortionAttribs, aSelection ); - aSelection.nStartPos = aSelection.nEndPos; + aSelection.start.nIndex = aSelection.end.nIndex; } std::optional< sal_Int16 > oStartNumbering; SfxItemSet aParagraphAttribs( rOutliner.GetEmptyItemSet() ); @@ -2345,11 +2342,11 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* else aParagraphAttribs.Put( SfxInt16Item(EE_PARA_OUTLLEVEL, pPara->mxParaSet->mnDepth)); - if ( !aSelection.nStartPos ) // in PPT empty paragraphs never gets a bullet + if (!aSelection.start.nIndex) // in PPT empty paragraphs never gets a bullet { aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, false ) ); } - aSelection.nStartPos = 0; + aSelection.start.nIndex = 0; rOutliner.QuickSetAttribs( aParagraphAttribs, aSelection ); } } diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 916bd9d263ad..29b0a7d29374 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -51,8 +51,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::xml::sax; -#define SVG_EXPORT_ALLPAGES ((sal_Int32)-1) - namespace com::sun::star::frame { class XController; } // Placeholder tag used into the ImplWriteActions method to filter text placeholder fields diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 2c19058cd3a4..6a9ae6b6219f 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -91,6 +91,7 @@ constexpr OUString aXMLAttrOffset = u"offset"_ustr; constexpr OUString aXMLAttrStopColor = u"stop-color"_ustr; constexpr OUString aXMLAttrStrokeLinejoin = u"stroke-linejoin"_ustr; constexpr OUString aXMLAttrStrokeLinecap = u"stroke-linecap"_ustr; +constexpr OUString aXMLAttrTextDirection = u"direction"_ustr; vcl::PushFlags SVGContextHandler::getPushFlags() const @@ -1332,6 +1333,15 @@ void SVGTextWriter::startTextShape() mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform ); } + // tdf#91315: Set text direction + auto nLayoutMode = mpVDev->GetLayoutMode(); + if (nLayoutMode + & (vcl::text::ComplexTextLayoutFlags::BiDiRtl + | vcl::text::ComplexTextLayoutFlags::BiDiStrong)) + { + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrTextDirection, "rtl"); + } + mpTextShapeElem.reset(new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, mbIWS )); startTextParagraph(); } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index e68551c9fd5b..7cc92ac11c32 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1120,8 +1120,6 @@ bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifie // we can't be updatable! if (m_bSubForm && !hasValidParent()) { - nConcurrency = ResultSetConcurrency::READ_ONLY; - // don't use any parameters if we don't have a valid parent m_aParameterManager.setAllParametersNull(); @@ -1131,8 +1129,6 @@ bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifie } else if (m_bAllowInsert || m_bAllowUpdate || m_bAllowDelete) nConcurrency = ResultSetConcurrency::UPDATABLE; - else - nConcurrency = ResultSetConcurrency::READ_ONLY; m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_CONCURRENCY, Any( nConcurrency ) ); m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_TYPE, Any( sal_Int32(ResultSetType::SCROLL_SENSITIVE) ) ); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index fc879ed06450..d06cd0e82214 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -401,7 +401,7 @@ bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, Val { OUString referer; getPropertyValue(u"Referer"_ustr) >>= referer; - if (SvtSecurityOptions::isUntrustedReferer(referer)) { + if (SvtSecurityOptions::isUntrustedReferer(referer) || INetURLObject(_rURL).IsExoticProtocol()) { return false; } diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 5c95ef6be5fe..7a6d709241a6 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -736,7 +736,7 @@ namespace frm // the SfxMedium is not allowed to be created with an invalid URL, so we have to check this first INetURLObject aUrl(rURL); - if (INetProtocol::NotValid == aUrl.GetProtocol()) + if (INetProtocol::NotValid == aUrl.GetProtocol() || aUrl.IsExoticProtocol()) // we treat an invalid URL like we would treat no URL return; diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index b13d29aeeb98..d1f99d857259 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -63,12 +63,9 @@ namespace frm if ( !pEngine ) return; - sal_Int32 nParagraphs = pEngine->GetParagraphCount(); - if ( nParagraphs ) + if (pEngine->GetParagraphCount()) { - sal_Int32 nLastParaNumber = nParagraphs - 1; - sal_Int32 nParaLen = pEngine->GetTextLen( nLastParaNumber ); - getEditView()->SetSelection( ESelection( 0, 0, nLastParaNumber, nParaLen ) ); + getEditView()->SetSelection(ESelection::All()); } } diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index bbadb7e71888..7ba3d41de394 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -35,8 +35,6 @@ namespace framework{ a real visible component. */ -// indicates a loadable content in general! -#define SPECIALPROTOCOL_PRIVATE "private:" // indicates loading of components using a model directly #define SPECIALPROTOCOL_PRIVATE_OBJECT u"private:object" // indicates loading of components using a stream only diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 318809100124..dfb13f11c4b7 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -205,7 +205,7 @@ namespace framework std::mutex m_aListenerMutex; std::mutex m_aQueueMutex; bool m_bAPIActionRunning; - bool m_bProcessingEvents; + std::atomic m_bProcessingEvents; sal_Int32 m_nLockCount; ::comphelper::OInterfaceContainerHelper4 m_aUndoListeners; ::comphelper::OInterfaceContainerHelper4 m_aModifyListeners; diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 38171ab974ab..fcb0edae07d6 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +89,7 @@ sal_Int32 impl_getPropGroup(sal_Int32 nID) typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo, + css::lang::XInitialization, css::util::XChangesListener, // => XEventListener css::util::XPathSettings> // => XPropertySet PathSettings_BASE; @@ -325,6 +327,10 @@ public: { ::cppu::OPropertySetHelper::addVetoableChangeListener(p1, p2); } virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) override { ::cppu::OPropertySetHelper::removeVetoableChangeListener(p1, p2); } + + // XInitialization + virtual void SAL_CALL initialize(const css::uno::Sequence& rArguments) override; + /** read all configured paths and create all needed internal structures. */ void impl_readAll(); @@ -1410,6 +1416,14 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() return xCfg; } +// XInitialization +void SAL_CALL PathSettings::initialize(const css::uno::Sequence& /*rArguments*/) +{ + // so we can reinitialize/reset all path variables to default + osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); + impl_readAll(); +} + } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 3d84cb619384..febece5e6040 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -35,6 +35,7 @@ #include +#include #include #include #include @@ -130,7 +131,8 @@ struct ReSubstFixedVarOrder typedef comphelper::WeakComponentImplHelper< css::util::XStringSubstitution, - css::lang::XServiceInfo > SubstitutePathVariables_BASE; + css::lang::XServiceInfo, + css::lang::XInitialization > SubstitutePathVariables_BASE; class SubstitutePathVariables : public SubstitutePathVariables_BASE { @@ -157,7 +159,12 @@ public: virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) override; virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) override; -protected: + // XInitialization + virtual void SAL_CALL initialize(const css::uno::Sequence& /*rArguments*/) override; + +private: + void impl_initialize(); + void SetPredefinedPathVariables(); // Special case (transient) values can change during runtime! @@ -188,6 +195,11 @@ private: }; SubstitutePathVariables::SubstitutePathVariables() +{ + impl_initialize(); +} + +void SubstitutePathVariables::impl_initialize() { SetPredefinedPathVariables(); @@ -219,6 +231,12 @@ SubstitutePathVariables::SubstitutePathVariables() sort(m_aReSubstFixedVarOrder.begin(),m_aReSubstFixedVarOrder.end()); } +void SAL_CALL SubstitutePathVariables::initialize(const css::uno::Sequence& /*rArguments*/) +{ + std::unique_lock g(m_aMutex); + impl_initialize(); +} + // XStringSubstitution OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) { @@ -598,7 +616,6 @@ OUString const & SubstitutePathVariables::impl_getSubstituteVariableValue( const void SubstitutePathVariables::SetPredefinedPathVariables() { - m_aPreDefVars.m_FixedVar[PREDEFVAR_BRANDBASEURL] = "$BRAND_BASE_DIR"; rtl::Bootstrap::expandMacros( m_aPreDefVars.m_FixedVar[PREDEFVAR_BRANDBASEURL]); diff --git a/helpcontent2 b/helpcontent2 index b3bc6425768d..3d37519d37c1 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b3bc6425768d93d6b9bb7304ed3a0ead4b03e2a7 +Subproject commit 3d37519d37c1ac9e5d30b45f1cd922c73107d4d1 diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h index 53c35a2ccb7f..b057edcb816b 100644 --- a/hwpfilter/source/hpara.h +++ b/hwpfilter/source/hpara.h @@ -53,7 +53,6 @@ enum }; class HWPPara; -#define FIXED_SPACING_BIT (0x8000) struct LineInfo { diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 0e14a349ddfa..757fb75821f7 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -551,6 +551,9 @@ struct _LibreOfficeKitDocumentClass bool (*renderNextSlideLayer)( LibreOfficeKitDocument* pThis, unsigned char* pBuffer, bool* bIsBitmapLayer, char** pJsonMessage); + /// @see lok::Document::setViewOption + void (*setViewOption)(LibreOfficeKitDocument* pThis, const char* pOption, const char* pValue); + #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 1e99d910ba0d..edd62dd59aff 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -936,6 +936,12 @@ public: return mpDoc->pClass->renderNextSlideLayer(mpDoc, pBuffer, bIsBitmapLayer, pJsonMessage); } + /// Set named view options + void setViewOption(const char* pOption, const char* pValue) + { + mpDoc->pClass->setViewOption(mpDoc, pOption, pValue); + } + #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; diff --git a/include/animations/animationnodehelper.hxx b/include/animations/animationnodehelper.hxx index cb6b6b74f67f..c23ab25c140f 100644 --- a/include/animations/animationnodehelper.hxx +++ b/include/animations/animationnodehelper.hxx @@ -19,7 +19,9 @@ #pragma once +#include #include +#include #include #include #include @@ -70,6 +72,42 @@ namespace anim { } } + + inline bool getVisibilityProperty( + const css::uno::Reference< css::animations::XAnimate >& xAnimateNode, bool& bReturn) + { + if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") ) + { + bool bVisible( false ); + css::uno::Any aAny( xAnimateNode->getTo() ); + + // try to extract bool value + if( !(aAny >>= bVisible) ) + { + // try to extract string + OUString aString; + if( aAny >>= aString ) + { + // we also take the strings "true" and "false", + // as well as "on" and "off" here + if( aString.equalsIgnoreAsciiCase("true") || + aString.equalsIgnoreAsciiCase("on") ) + { + bVisible = true; + } + if( aString.equalsIgnoreAsciiCase("false") || + aString.equalsIgnoreAsciiCase("off") ) + { + bVisible = false; + } + } + } + bReturn = bVisible; + return true; + } + + return false; + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 90e252bffafe..cb1aa115e294 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -28,8 +28,6 @@ #include #include -#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0 - namespace com::sun::star::frame { class XDispatchProvider; } namespace com::sun::star::graphic { class XGraphic; } namespace com::sun::star::media { diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx index cf9ca35180e6..72660839a110 100644 --- a/include/canvas/canvastools.hxx +++ b/include/canvas/canvastools.hxx @@ -129,17 +129,15 @@ namespace canvas CANVASTOOLS_DLLPUBLIC css::rendering::ViewState& initViewState( css::rendering::ViewState& viewState ); - CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& - getViewStateTransform( ::basegfx::B2DHomMatrix& transform, - const css::rendering::ViewState& viewState ); + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix + getViewStateTransform( const css::rendering::ViewState& viewState ); CANVASTOOLS_DLLPUBLIC css::rendering::ViewState& setViewStateTransform( css::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& - getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, - const css::rendering::RenderState& renderState ); + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix + getRenderStateTransform( const css::rendering::RenderState& renderState ); CANVASTOOLS_DLLPUBLIC css::rendering::RenderState& setRenderStateTransform( css::rendering::RenderState& renderState, @@ -178,18 +176,15 @@ namespace canvas specified input rectangle, and returns the bounding box of the resulting output area. - @param o_Rect - Output rectangle - @param i_Rect Input rectangle @param i_Transformation Transformation to apply to the input rectangle - @return a reference to the resulting rectangle + @return the resulting rectangle */ - CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange calcTransformedRectBounds( const ::basegfx::B2DRange& i_Rect, const ::basegfx::B2DHomMatrix& i_Transformation ); @@ -201,10 +196,6 @@ namespace canvas the upper, left corner to the origin, and leaving the size untouched. - @param o_transform - Output parameter, to receive the resulting transformation - matrix. - @param i_srcRect Input parameter, specifies the original source rectangle. The resulting transformation will exactly map @@ -215,12 +206,12 @@ namespace canvas translations (if necessary), to exactly map the source rectangle to the origin. - @return a reference to the resulting transformation matrix + @return the resulting transformation matrix @see calcRectToRectTransform() @see calcTransformedRectBounds() */ - CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix calcRectToOriginTransform( const ::basegfx::B2DRange& i_srcRect, const ::basegfx::B2DHomMatrix& i_transformation ); diff --git a/include/codemaker/codemaker.hxx b/include/codemaker/codemaker.hxx index cf22b8a1f47f..163840e06f60 100644 --- a/include/codemaker/codemaker.hxx +++ b/include/codemaker/codemaker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_CODEMAKER_HXX -#define INCLUDED_CODEMAKER_CODEMAKER_HXX +#pragma once #include @@ -33,6 +32,4 @@ namespace codemaker rtl::OString convertString(rtl::OUString const& string); } -#endif // INCLUDED_CODEMAKER_CODEMAKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx index daac32263cea..12a58e6da8b5 100644 --- a/include/codemaker/commonjava.hxx +++ b/include/codemaker/commonjava.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_COMMONJAVA_HXX -#define INCLUDED_CODEMAKER_COMMONJAVA_HXX +#pragma once #include @@ -39,6 +38,4 @@ rtl::OString translateUnoToJavaIdentifier( } -#endif // INCLUDED_CODEMAKER_COMMONJAVA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx index 46291e491746..13764714222f 100644 --- a/include/codemaker/exceptiontree.hxx +++ b/include/codemaker/exceptiontree.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX -#define INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX +#pragma once #include #include @@ -114,6 +113,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index cc2827cb9aa7..9f64b6080855 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX -#define INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX +#pragma once #include @@ -65,6 +64,4 @@ private: }; } -#endif // INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index 803274901a4a..6107419636fe 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_OPTIONS_HXX -#define INCLUDED_CODEMAKER_OPTIONS_HXX +#pragma once #include #include @@ -67,6 +66,4 @@ protected: OptionMap m_options; }; -#endif // INCLUDED_CODEMAKER_OPTIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx index 7e312f3f8094..302e79e351d1 100644 --- a/include/codemaker/typemanager.hxx +++ b/include/codemaker/typemanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_TYPEMANAGER_HXX -#define INCLUDED_CODEMAKER_TYPEMANAGER_HXX +#pragma once #include @@ -77,6 +76,4 @@ inline OUString b2u(std::string_view s) { return OStringToOUString(s, RTL_TEXTENCODING_UTF8); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/unotype.hxx b/include/codemaker/unotype.hxx index 606321873242..f7651cd95916 100644 --- a/include/codemaker/unotype.hxx +++ b/include/codemaker/unotype.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_UNOTYPE_HXX -#define INCLUDED_CODEMAKER_UNOTYPE_HXX +#pragma once #include @@ -83,6 +82,4 @@ namespace codemaker::UnoType { } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 12842bf4bcb2..78bdabcae611 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -27,8 +27,6 @@ #include #define ACCESSIBLE_SELECTION_CHILD_ALL (sal_Int32(-1)) -#define ACCESSIBLE_SELECTION_CHILD_SELF ((sal_Int32)-2) - namespace comphelper { diff --git a/include/comphelper/crypto/Crypto.hxx b/include/comphelper/crypto/Crypto.hxx index aba89642652a..abebf9440a5a 100644 --- a/include/comphelper/crypto/Crypto.hxx +++ b/include/comphelper/crypto/Crypto.hxx @@ -46,23 +46,45 @@ enum class CryptoType UNKNOWN, AES_128_ECB, AES_128_CBC, + AES_256_ECB, AES_256_CBC, }; -struct CryptoImpl; +class ICryptoImplementation +{ +public: + static std::shared_ptr createInstance(); + + virtual void setupDecryptContext(std::vector& key, std::vector& iv, + CryptoType eType) + = 0; + virtual void setupEncryptContext(std::vector& key, std::vector& iv, + CryptoType type) + = 0; + virtual void setupCryptoHashContext(std::vector& rKey, CryptoHashType eType) = 0; + + virtual sal_uInt32 decryptUpdate(std::vector& output, std::vector& input, + sal_uInt32 inputLength) + = 0; + virtual sal_uInt32 encryptUpdate(std::vector& output, std::vector& input, + sal_uInt32 inputLength) + = 0; + virtual bool cryptoHashUpdate(std::vector& rInput, sal_uInt32 nInputLength) = 0; + virtual bool cryptoHashFinalize(std::vector& rHash) = 0; +}; class COMPHELPER_DLLPUBLIC Crypto { protected: - std::unique_ptr mpImpl; + std::shared_ptr mpImpl; -protected: Crypto(); public: virtual ~Crypto(); }; +/** Decrypt vector of bytes with AES encryption */ class COMPHELPER_DLLPUBLIC Decrypt final : public Crypto { public: @@ -75,11 +97,21 @@ public: std::vector& key); }; +/** Encrypt vector of bytes with AES encryption */ class COMPHELPER_DLLPUBLIC Encrypt final : public Crypto { public: + /** Initialize encryption for key, init vector and encryption type. + * + * key - encryption key, key size should be the same as block size + * iv - init vector: it can be empty - will not be used (init vector will be 0) + */ Encrypt(std::vector& key, std::vector& iv, CryptoType type); + /** Encrypt the input and write into output + * + * inputLength - size from the input to be encrypted (0 means to use the size of the vector) + */ sal_uInt32 update(std::vector& output, std::vector& input, sal_uInt32 inputLength = 0); }; diff --git a/include/comphelper/hash.hxx b/include/comphelper/hash.hxx index e148276abfb3..9567904e6080 100644 --- a/include/comphelper/hash.hxx +++ b/include/comphelper/hash.hxx @@ -61,6 +61,11 @@ public: void update(const unsigned char* pInput, size_t length); + void update(std::vector const& rInput) + { + update(rInput.data(), rInput.size()); + } + std::vector finalize(); static std::vector calculateHash(const unsigned char* pInput, size_t length, HashType eType); diff --git a/include/comphelper/interfacecontainer4.hxx b/include/comphelper/interfacecontainer4.hxx index e4a41e30675d..c23c04c76018 100644 --- a/include/comphelper/interfacecontainer4.hxx +++ b/include/comphelper/interfacecontainer4.hxx @@ -204,6 +204,26 @@ public: template inline void forEach(std::unique_lock& rGuard, FuncT const& func) const; + /** Executes a functor for each contained listener of specified type, e.g. + forEach(.... + + If a css::lang::DisposedException occurs which relates to + the called listener, then that listener is removed from the container. + + If any other UNO exception occurs, the exceptionFunc is called. + + @tparam FuncT unary functor type, let your compiler deduce this for you + @tparam ExceptionFuncT nullary functor type, let your compiler deduce this for you + @param func unary functor object expecting an argument of type + css::uno::Reference + @param exceptionFunc nullary functor object + @param rGuard + this parameter only here to make that this container is accessed while locked + */ + template + inline void forEach(std::unique_lock& rGuard, FuncT const& func, + ExceptionFuncT const& exceptionFunc) const; + /** Calls a UNO listener method for each contained listener. The listener method must take a single argument of type EventT, @@ -231,6 +251,31 @@ public: void (SAL_CALL ListenerT::*NotificationMethod)(const EventT&), const EventT& Event) const; + /** Calls a UNO listener method for each contained listener. + + The listener method must take a single argument of type EventT, + and return void. + + If a css::lang::DisposedException occurs which relates to + the called listener, then that listener is removed from the container. + + If any other UNO exception occurs, the exceptionFunc is called. + + @tparam EventT event type, let your compiler deduce this for you + @tparam ExceptionFuncT nullary functor type, let your compiler deduce this for you + @param NotificationMethod + Pointer to a method of a ListenerT interface. + @param Event + Event to notify to all contained listeners + @param exceptionFunc nullary functor object + @param rGuard + this parameter only here to make that this container is accessed while locked + */ + template + inline void notifyEach(std::unique_lock& rGuard, + void (SAL_CALL ListenerT::*NotificationMethod)(const EventT&), + const EventT& Event, const ExceptionFuncT& exceptionFunc) const; + // this is moveable, but not copyable OInterfaceContainerHelper4(OInterfaceContainerHelper4&&) = default; OInterfaceContainerHelper4& operator=(OInterfaceContainerHelper4&&) = default; @@ -316,6 +361,45 @@ inline void OInterfaceContainerHelper4::forEach(std::unique_lock& rGuard.lock(); } +template +template +inline void OInterfaceContainerHelper4::forEach(std::unique_lock& rGuard, + FuncT const& func, + ExceptionFuncT const& exceptionFunc) const +{ + assert(rGuard.owns_lock()); + if (std::as_const(maData)->empty()) + { + return; + } + const_cast(*this) + .maData.make_unique(); // so we can iterate over the data without holding the lock + OInterfaceIteratorHelper4 iter(rGuard, const_cast(*this)); + rGuard.unlock(); + while (iter.hasMoreElements()) + { + auto xListener = iter.next(); + try + { + func(xListener); + } + catch (css::lang::DisposedException const& exc) + { + if (exc.Context == xListener) + { + rGuard.lock(); + iter.remove(rGuard); + rGuard.unlock(); + } + } + catch (css::uno::Exception) + { + exceptionFunc(); + } + } + rGuard.lock(); +} + template template inline void OInterfaceContainerHelper4::notifyEach( @@ -326,6 +410,17 @@ inline void OInterfaceContainerHelper4::notifyEach( NotifySingleListener(NotificationMethod, Event)); } +template +template +inline void OInterfaceContainerHelper4::notifyEach( + std::unique_lock& rGuard, + void (SAL_CALL ListenerT::*NotificationMethod)(const EventT&), const EventT& Event, + const ExceptionFuncT& exceptionFunc) const +{ + forEach>( + rGuard, NotifySingleListener(NotificationMethod, Event), exceptionFunc); +} + template sal_Int32 OInterfaceContainerHelper4::getLength(std::unique_lock& rGuard) const diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx index 611523066792..0bd75e4ed66d 100644 --- a/include/cppcanvas/basegfxfactory.hxx +++ b/include/cppcanvas/basegfxfactory.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX -#define INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX +#pragma once #include #include @@ -71,6 +70,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx index 1b163b82d479..d5b34d9285ed 100644 --- a/include/cppcanvas/bitmap.hxx +++ b/include/cppcanvas/bitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_BITMAP_HXX -#define INCLUDED_CPPCANVAS_BITMAP_HXX +#pragma once #include #include @@ -65,6 +64,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr; } -#endif // INCLUDED_CPPCANVAS_BITMAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx index 9c3e7f843934..052092912ed1 100644 --- a/include/cppcanvas/bitmapcanvas.hxx +++ b/include/cppcanvas/bitmapcanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX -#define INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX +#pragma once #include #include @@ -44,6 +43,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx index 2fce102824dd..c7fea3c63342 100644 --- a/include/cppcanvas/canvas.hxx +++ b/include/cppcanvas/canvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_CANVAS_HXX -#define INCLUDED_CPPCANVAS_CANVAS_HXX +#pragma once #include #include @@ -96,6 +95,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_CANVAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index ebee831f0a3b..0a9c78ef2bef 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX -#define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX +#pragma once #include #include @@ -75,6 +74,4 @@ namespace cppcanvas }; } -#endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx index 500e5953e7cc..3682832c3dd1 100644 --- a/include/cppcanvas/color.hxx +++ b/include/cppcanvas/color.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_COLOR_HXX -#define INCLUDED_CPPCANVAS_COLOR_HXX +#pragma once #include @@ -65,6 +64,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_COLOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx index abbd0c00bb05..52382c42b16d 100644 --- a/include/cppcanvas/customsprite.hxx +++ b/include/cppcanvas/customsprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX -#define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX +#pragma once #include #include @@ -39,6 +38,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr; } -#endif // INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx index 917ef4dafb04..04e3a61d3411 100644 --- a/include/cppcanvas/polypolygon.hxx +++ b/include/cppcanvas/polypolygon.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_POLYPOLYGON_HXX -#define INCLUDED_CPPCANVAS_POLYPOLYGON_HXX +#pragma once #include #include @@ -71,6 +70,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr; } -#endif // INCLUDED_CPPCANVAS_POLYPOLYGON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx index d71be2f09e89..036d974f4830 100644 --- a/include/cppcanvas/renderer.hxx +++ b/include/cppcanvas/renderer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_RENDERER_HXX -#define INCLUDED_CPPCANVAS_RENDERER_HXX +#pragma once #include #include @@ -135,6 +134,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr; } -#endif // INCLUDED_CPPCANVAS_RENDERER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx index 3321eb6a03a3..3c1b82d38a74 100644 --- a/include/cppcanvas/sprite.hxx +++ b/include/cppcanvas/sprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_SPRITE_HXX -#define INCLUDED_CPPCANVAS_SPRITE_HXX +#pragma once namespace basegfx { @@ -91,6 +90,4 @@ namespace cppcanvas }; } -#endif // INCLUDED_CPPCANVAS_SPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx index c4d100dbedb9..bb7d3d2f70aa 100644 --- a/include/cppcanvas/spritecanvas.hxx +++ b/include/cppcanvas/spritecanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_SPRITECANVAS_HXX -#define INCLUDED_CPPCANVAS_SPRITECANVAS_HXX +#pragma once #include #include @@ -58,6 +57,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_SPRITECANVAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index 73867626d3c0..3d6ab24482ee 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_VCLFACTORY_HXX -#define INCLUDED_CPPCANVAS_VCLFACTORY_HXX +#pragma once #include #include @@ -82,6 +81,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_VCLFACTORY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 13d843aec15c..c86b7b7a9bf8 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -173,7 +173,6 @@ public: static void setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporary); static bool getGlobalAntiAliasing(); - static void forwardPixelSnapHairline(bool bPixelSnapHairline); }; DRAWINGLAYERCORE_DLLPUBLIC ViewInformation2D diff --git a/include/editeng/EPaM.hxx b/include/editeng/EPaM.hxx index d474dfe18235..653adeafa6f9 100644 --- a/include/editeng/EPaM.hxx +++ b/include/editeng/EPaM.hxx @@ -19,25 +19,29 @@ #pragma once +#include + +#include + +inline constexpr sal_Int32 EE_PARA_MAX = SAL_MAX_INT32; +inline constexpr sal_Int32 EE_TEXTPOS_MAX = SAL_MAX_INT32; + struct EPaM { + static constexpr EPaM NotFound() { return { EE_PARA_MAX, EE_TEXTPOS_MAX }; } + sal_Int32 nPara = 0; sal_Int32 nIndex = 0; - EPaM() = default; + constexpr EPaM() = default; - EPaM(sal_Int32 _nParagraph, sal_Int32 _nIndex) + constexpr EPaM(sal_Int32 _nParagraph, sal_Int32 _nIndex) : nPara(_nParagraph) , nIndex(_nIndex) { } - bool operator==(const EPaM& rInstance) const - { - return nPara == rInstance.nPara && nIndex == rInstance.nIndex; - } - - bool operator!=(const EPaM& rSelection) const = default; + bool operator==(const EPaM&) const = default; bool operator<(const EPaM& rInstance) const { diff --git a/include/editeng/EPosition.hxx b/include/editeng/EPosition.hxx deleted file mode 100644 index ca6a3e13bee0..000000000000 --- a/include/editeng/EPosition.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#define EE_INDEX_NOT_FOUND SAL_MAX_INT32 -#define EE_PARA_NOT_FOUND SAL_MAX_INT32 - -struct EPosition -{ - sal_Int32 nPara; - sal_Int32 nIndex; - - EPosition() - : nPara(EE_PARA_NOT_FOUND) - , nIndex(EE_INDEX_NOT_FOUND) - { - } - - EPosition(sal_Int32 nPara_, sal_Int32 nPos_) - : nPara(nPara_) - , nIndex(nPos_) - { - } -}; - -template -inline std::basic_ostream& operator<<(std::basic_ostream& stream, - EPosition const& pos) -{ - return stream << "EPosition(" << pos.nPara << ',' << pos.nIndex << ")"; -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/ESelection.hxx b/include/editeng/ESelection.hxx index 1b6c98516435..c93b6df800e5 100644 --- a/include/editeng/ESelection.hxx +++ b/include/editeng/ESelection.hxx @@ -19,94 +19,74 @@ #pragma once +#include + +#include + +#include +#include + struct ESelection { - static constexpr sal_Int32 MAX_PARAGRAPH_POSITION = SAL_MAX_INT32; - static constexpr sal_Int32 MAX_TEXT_POSITION = SAL_MAX_INT32; - // Select all text - static ESelection All() { return ESelection(0, 0, MAX_PARAGRAPH_POSITION, MAX_TEXT_POSITION); } + static constexpr ESelection All() { return { 0, 0, EE_PARA_MAX, EE_TEXTPOS_MAX }; } - // Set to "not found" state - static ESelection NotFound() { return ESelection(MAX_PARAGRAPH_POSITION, MAX_TEXT_POSITION); } - // Set to no selection - static ESelection NoSelection() - { - return ESelection(MAX_PARAGRAPH_POSITION, MAX_TEXT_POSITION); - } + // Set to end without selection + static constexpr ESelection AtEnd() { return { EE_PARA_MAX, EE_TEXTPOS_MAX }; } - sal_Int32 nStartPara = 0; - sal_Int32 nStartPos = 0; - sal_Int32 nEndPara = 0; - sal_Int32 nEndPos = 0; + EPaM start; + EPaM end; - ESelection() = default; + constexpr ESelection() = default; - ESelection(sal_Int32 _nStartPara, sal_Int32 _nStartPos, sal_Int32 _nEndPara, sal_Int32 _nEndPos) - : nStartPara(_nStartPara) - , nStartPos(_nStartPos) - , nEndPara(_nEndPara) - , nEndPos(_nEndPos) + constexpr ESelection(sal_Int32 _nStartPara, sal_Int32 _nStartPos, sal_Int32 _nEndPara, + sal_Int32 _nEndPos) + : start(_nStartPara, _nStartPos) + , end(_nEndPara, _nEndPos) { } - ESelection(sal_Int32 nPara, sal_Int32 nPos) - : nStartPara(nPara) - , nStartPos(nPos) - , nEndPara(nPara) - , nEndPos(nPos) + constexpr ESelection(sal_Int32 nPara, sal_Int32 nPos) + : ESelection(nPara, nPos, nPara, nPos) { } + constexpr explicit ESelection(const EPaM& rPos) + : ESelection(rPos.nPara, rPos.nIndex) + { + } + + bool IsAdjusted() const { return !(end < start); } + void Adjust() { - if (nStartPara > nEndPara || (nStartPara == nEndPara && nStartPos > nEndPos)) - { - std::swap(nStartPara, nEndPara); - std::swap(nStartPos, nEndPos); - } + if (!IsAdjusted()) + std::swap(start, end); } - bool operator==(const ESelection& rSelection) const - { - return nStartPara == rSelection.nStartPara && nStartPos == rSelection.nStartPos - && nEndPara == rSelection.nEndPara && nEndPos == rSelection.nEndPos; - } + void CollapseToStart() { end = start; } + void CollapseToEnd() { start = end; } - bool operator!=(const ESelection& rSelection) const = default; + bool operator==(const ESelection&) const = default; bool operator<(const ESelection& rSelection) const { // The selection must be adjusted. + assert(IsAdjusted() && rSelection.IsAdjusted()); // => Only check if end of 'this' < Start of rS - return nEndPara < rSelection.nStartPara - || (nEndPara == rSelection.nStartPara && nEndPos < rSelection.nStartPos - && operator!=(rSelection)); + return end < rSelection.start; } + bool operator>(const ESelection& rSelection) const { return rSelection < *this; } - bool operator>(const ESelection& rSelection) const - { - // The selection must be adjusted. - // => Only check if end of 'this' < Start of rS - return nStartPara > rSelection.nEndPara - || (nStartPara == rSelection.nEndPara && nStartPos > rSelection.nEndPos - && operator!=(rSelection)); - } - - bool IsZero() const - { - return nStartPara == 0 && nStartPos == 0 && nEndPara == 0 && nEndPos == 0; - } - - bool HasRange() const { return nStartPara != nEndPara || nStartPos != nEndPos; } + bool HasRange() const { return start != end; } }; template inline std::basic_ostream& operator<<(std::basic_ostream& stream, ESelection const& rSelection) { - return stream << "ESelection(" << rSelection.nStartPara << ',' << rSelection.nStartPos << "," - << rSelection.nEndPara << "," << rSelection.nEndPos << ")"; + return stream << "ESelection(" << rSelection.start.nPara << ',' << rSelection.start.nIndex + << "," << rSelection.end.nPara << "," << rSelection.end.nIndex << ")"; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index 25745f7f4cde..a9388e305556 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -47,13 +46,6 @@ enum class EEAnchorMode { enum class EERemoveParaAttribsMode { RemoveAll, RemoveCharItems, RemoveNone }; -#define EE_PARA_APPEND ESelection::MAX_PARAGRAPH_POSITION -#define EE_PARA_ALL ESelection::MAX_PARAGRAPH_POSITION -#define EE_PARA_MAX_COUNT ESelection::MAX_PARAGRAPH_POSITION - -#define EE_TEXTPOS_ALL ESelection::MAX_TEXT_POSITION -#define EE_TEXTPOS_MAX_COUNT ESelection::MAX_TEXT_POSITION - EDITENG_DLLPUBLIC extern const size_t EE_APPEND; // Error messages for Read / Write Method @@ -89,7 +81,7 @@ struct EDITENG_DLLPUBLIC EFieldInfo { std::unique_ptr pFieldItem; OUString aCurrentText; - EPosition aPosition; + EPaM aPosition = EPaM::NotFound(); EFieldInfo(); EFieldInfo( const SvxFieldItem& rFieldItem, sal_Int32 nPara, sal_Int32 nPos ); @@ -235,13 +227,12 @@ struct EENotify { EENotifyType eNotificationType; - sal_Int32 nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED + sal_Int32 nParagraph = EE_PARA_MAX; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED - sal_Int32 nParam1; - sal_Int32 nParam2; + sal_Int32 nParam1 = 0; + sal_Int32 nParam2 = 0; - EENotify( EENotifyType eType ) - { eNotificationType = eType; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; } + EENotify(EENotifyType eType) { eNotificationType = eType; } }; namespace editeng diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index f78aefc5cffa..9636a260ccac 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -194,7 +194,6 @@ private: SAL_DLLPRIVATE void HandleBeginPasteOrDrop(PasteOrDropInfos& rInfos); SAL_DLLPRIVATE void HandleEndPasteOrDrop(PasteOrDropInfos& rInfos); - SAL_DLLPRIVATE bool HasText() const; SAL_DLLPRIVATE const EditSelectionEngine& GetSelectionEngine() const; SAL_DLLPRIVATE void SetInSelectionMode(bool b); @@ -278,6 +277,7 @@ public: SAL_DLLPRIVATE void SetMinColumnWrapHeight(tools::Long nVal); + bool HasText() const; OUString GetText( LineEnd eEnd = LINEEND_LF ) const; OUString GetText( const ESelection& rSelection ) const; sal_Int32 GetTextLen() const; @@ -298,10 +298,10 @@ public: SAL_DLLPRIVATE tools::Rectangle GetParaBounds( sal_Int32 nPara ); SAL_DLLPRIVATE ParagraphInfos GetParagraphInfos( sal_Int32 nPara ); SAL_DLLPRIVATE sal_Int32 FindParagraph( tools::Long nDocPosY ); - EPosition FindDocPosition( const Point& rDocPos ) const; - tools::Rectangle GetCharacterBounds( const EPosition& rPos ) const; + EPaM FindDocPosition( const Point& rDocPos ) const; + tools::Rectangle GetCharacterBounds( const EPaM& rPos ) const; - OUString GetWord(sal_Int32 nPara, sal_Int32 nIndex); + OUString GetWord(const EPaM& rPos); ESelection GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const; @@ -586,6 +586,8 @@ public: SAL_DLLPRIVATE ESelection CreateESelection(const EditSelection& rSel) const; SAL_DLLPRIVATE EditSelection CreateSelection(const ESelection& rSel); + ESelection NormalizeESelection(const ESelection& rSel) const; + EPaM GetEnd() const; SAL_DLLPRIVATE const SfxItemSet& GetBaseParaAttribs(sal_Int32 nPara) const; SAL_DLLPRIVATE void SetParaAttribsOnly(sal_Int32 nPara, const SfxItemSet& rSet); diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx index 92c7830af0cc..eb3c6a3e91e9 100644 --- a/include/editeng/eeitem.hxx +++ b/include/editeng/eeitem.hxx @@ -68,79 +68,79 @@ class SfxVoidItem; * as well. */ -constexpr sal_uInt16 EE_ITEMS_START(OWN_ATTR_VALUE_END + 1); +inline constexpr sal_uInt16 EE_ITEMS_START(OWN_ATTR_VALUE_END + 1); // Paragraph attributes: -constexpr sal_uInt16 EE_PARA_START (EE_ITEMS_START + 0); -constexpr TypedWhichId EE_PARA_WRITINGDIR (EE_PARA_START+0); -constexpr TypedWhichId EE_PARA_XMLATTRIBS (EE_PARA_START+1); -constexpr TypedWhichId EE_PARA_HANGINGPUNCTUATION (EE_PARA_START+2); -constexpr TypedWhichId EE_PARA_FORBIDDENRULES (EE_PARA_START+3); -constexpr TypedWhichId EE_PARA_ASIANCJKSPACING (EE_PARA_START+4); -constexpr TypedWhichId EE_PARA_NUMBULLET (EE_PARA_START+5); -constexpr TypedWhichId EE_PARA_HYPHENATE (EE_PARA_START+6); -constexpr TypedWhichId EE_PARA_HYPHENATE_NO_CAPS (EE_PARA_START+7); -constexpr TypedWhichId EE_PARA_HYPHENATE_NO_LAST_WORD (EE_PARA_START+8); -constexpr TypedWhichId EE_PARA_BULLETSTATE (EE_PARA_START+9); -constexpr TypedWhichId EE_PARA_OUTLLRSPACE (EE_PARA_START+10); -constexpr TypedWhichId EE_PARA_OUTLLEVEL (EE_PARA_START+11); -constexpr TypedWhichId EE_PARA_BULLET (EE_PARA_START+12); -constexpr TypedWhichId EE_PARA_LRSPACE (EE_PARA_START+13); -constexpr TypedWhichId EE_PARA_ULSPACE (EE_PARA_START+14); -constexpr TypedWhichId EE_PARA_SBL (EE_PARA_START+15); -constexpr TypedWhichId EE_PARA_JUST (EE_PARA_START+16); -constexpr TypedWhichId EE_PARA_TABS (EE_PARA_START+17); -constexpr TypedWhichId EE_PARA_JUST_METHOD (EE_PARA_START+18); -constexpr TypedWhichId EE_PARA_VER_JUST (EE_PARA_START+19); -constexpr sal_uInt16 EE_PARA_END (EE_PARA_START + 19); +inline constexpr sal_uInt16 EE_PARA_START (EE_ITEMS_START + 0); +inline constexpr TypedWhichId EE_PARA_WRITINGDIR (EE_PARA_START+0); +inline constexpr TypedWhichId EE_PARA_XMLATTRIBS (EE_PARA_START+1); +inline constexpr TypedWhichId EE_PARA_HANGINGPUNCTUATION (EE_PARA_START+2); +inline constexpr TypedWhichId EE_PARA_FORBIDDENRULES (EE_PARA_START+3); +inline constexpr TypedWhichId EE_PARA_ASIANCJKSPACING (EE_PARA_START+4); +inline constexpr TypedWhichId EE_PARA_NUMBULLET (EE_PARA_START+5); +inline constexpr TypedWhichId EE_PARA_HYPHENATE (EE_PARA_START+6); +inline constexpr TypedWhichId EE_PARA_HYPHENATE_NO_CAPS (EE_PARA_START+7); +inline constexpr TypedWhichId EE_PARA_HYPHENATE_NO_LAST_WORD (EE_PARA_START+8); +inline constexpr TypedWhichId EE_PARA_BULLETSTATE (EE_PARA_START+9); +inline constexpr TypedWhichId EE_PARA_OUTLLRSPACE (EE_PARA_START+10); +inline constexpr TypedWhichId EE_PARA_OUTLLEVEL (EE_PARA_START+11); +inline constexpr TypedWhichId EE_PARA_BULLET (EE_PARA_START+12); +inline constexpr TypedWhichId EE_PARA_LRSPACE (EE_PARA_START+13); +inline constexpr TypedWhichId EE_PARA_ULSPACE (EE_PARA_START+14); +inline constexpr TypedWhichId EE_PARA_SBL (EE_PARA_START+15); +inline constexpr TypedWhichId EE_PARA_JUST (EE_PARA_START+16); +inline constexpr TypedWhichId EE_PARA_TABS (EE_PARA_START+17); +inline constexpr TypedWhichId EE_PARA_JUST_METHOD (EE_PARA_START+18); +inline constexpr TypedWhichId EE_PARA_VER_JUST (EE_PARA_START+19); +inline constexpr sal_uInt16 EE_PARA_END (EE_PARA_START + 19); // Character attributes: -constexpr sal_uInt16 EE_CHAR_START (EE_PARA_END + 1); -constexpr TypedWhichId EE_CHAR_COLOR (EE_CHAR_START+0); -constexpr TypedWhichId EE_CHAR_FONTINFO (EE_CHAR_START+1); -constexpr TypedWhichId EE_CHAR_FONTHEIGHT (EE_CHAR_START+2); -constexpr TypedWhichId EE_CHAR_FONTWIDTH (EE_CHAR_START+3); -constexpr TypedWhichId EE_CHAR_WEIGHT (EE_CHAR_START+4); -constexpr TypedWhichId EE_CHAR_UNDERLINE (EE_CHAR_START+5); -constexpr TypedWhichId EE_CHAR_STRIKEOUT (EE_CHAR_START+6); -constexpr TypedWhichId EE_CHAR_ITALIC (EE_CHAR_START+7); -constexpr TypedWhichId EE_CHAR_OUTLINE (EE_CHAR_START+8); -constexpr TypedWhichId EE_CHAR_SHADOW (EE_CHAR_START+9); -constexpr TypedWhichId EE_CHAR_ESCAPEMENT (EE_CHAR_START+10); -constexpr TypedWhichId EE_CHAR_PAIRKERNING (EE_CHAR_START+11); -constexpr TypedWhichId EE_CHAR_KERNING (EE_CHAR_START+12); -constexpr TypedWhichId EE_CHAR_WLM (EE_CHAR_START+13); -constexpr TypedWhichId EE_CHAR_LANGUAGE (EE_CHAR_START+14); -constexpr TypedWhichId EE_CHAR_LANGUAGE_CJK (EE_CHAR_START+15); -constexpr TypedWhichId EE_CHAR_LANGUAGE_CTL (EE_CHAR_START+16); -constexpr TypedWhichId EE_CHAR_FONTINFO_CJK (EE_CHAR_START+17); -constexpr TypedWhichId EE_CHAR_FONTINFO_CTL (EE_CHAR_START+18); -constexpr TypedWhichId EE_CHAR_FONTHEIGHT_CJK (EE_CHAR_START+19); -constexpr TypedWhichId EE_CHAR_FONTHEIGHT_CTL (EE_CHAR_START+20); -constexpr TypedWhichId EE_CHAR_WEIGHT_CJK (EE_CHAR_START+21); -constexpr TypedWhichId EE_CHAR_WEIGHT_CTL (EE_CHAR_START+22); -constexpr TypedWhichId EE_CHAR_ITALIC_CJK (EE_CHAR_START+23); -constexpr TypedWhichId EE_CHAR_ITALIC_CTL (EE_CHAR_START+24); -constexpr TypedWhichId EE_CHAR_EMPHASISMARK (EE_CHAR_START+25); -constexpr TypedWhichId EE_CHAR_RELIEF (EE_CHAR_START+26); -constexpr TypedWhichId EE_CHAR_XMLATTRIBS (EE_CHAR_START+27); -constexpr TypedWhichId EE_CHAR_OVERLINE (EE_CHAR_START+28); -constexpr TypedWhichId EE_CHAR_CASEMAP (EE_CHAR_START+29); -constexpr TypedWhichId EE_CHAR_GRABBAG (EE_CHAR_START+30); -constexpr TypedWhichId EE_CHAR_BKGCOLOR (EE_CHAR_START+31); +inline constexpr sal_uInt16 EE_CHAR_START (EE_PARA_END + 1); +inline constexpr TypedWhichId EE_CHAR_COLOR (EE_CHAR_START+0); +inline constexpr TypedWhichId EE_CHAR_FONTINFO (EE_CHAR_START+1); +inline constexpr TypedWhichId EE_CHAR_FONTHEIGHT (EE_CHAR_START+2); +inline constexpr TypedWhichId EE_CHAR_FONTWIDTH (EE_CHAR_START+3); +inline constexpr TypedWhichId EE_CHAR_WEIGHT (EE_CHAR_START+4); +inline constexpr TypedWhichId EE_CHAR_UNDERLINE (EE_CHAR_START+5); +inline constexpr TypedWhichId EE_CHAR_STRIKEOUT (EE_CHAR_START+6); +inline constexpr TypedWhichId EE_CHAR_ITALIC (EE_CHAR_START+7); +inline constexpr TypedWhichId EE_CHAR_OUTLINE (EE_CHAR_START+8); +inline constexpr TypedWhichId EE_CHAR_SHADOW (EE_CHAR_START+9); +inline constexpr TypedWhichId EE_CHAR_ESCAPEMENT (EE_CHAR_START+10); +inline constexpr TypedWhichId EE_CHAR_PAIRKERNING (EE_CHAR_START+11); +inline constexpr TypedWhichId EE_CHAR_KERNING (EE_CHAR_START+12); +inline constexpr TypedWhichId EE_CHAR_WLM (EE_CHAR_START+13); +inline constexpr TypedWhichId EE_CHAR_LANGUAGE (EE_CHAR_START+14); +inline constexpr TypedWhichId EE_CHAR_LANGUAGE_CJK (EE_CHAR_START+15); +inline constexpr TypedWhichId EE_CHAR_LANGUAGE_CTL (EE_CHAR_START+16); +inline constexpr TypedWhichId EE_CHAR_FONTINFO_CJK (EE_CHAR_START+17); +inline constexpr TypedWhichId EE_CHAR_FONTINFO_CTL (EE_CHAR_START+18); +inline constexpr TypedWhichId EE_CHAR_FONTHEIGHT_CJK (EE_CHAR_START+19); +inline constexpr TypedWhichId EE_CHAR_FONTHEIGHT_CTL (EE_CHAR_START+20); +inline constexpr TypedWhichId EE_CHAR_WEIGHT_CJK (EE_CHAR_START+21); +inline constexpr TypedWhichId EE_CHAR_WEIGHT_CTL (EE_CHAR_START+22); +inline constexpr TypedWhichId EE_CHAR_ITALIC_CJK (EE_CHAR_START+23); +inline constexpr TypedWhichId EE_CHAR_ITALIC_CTL (EE_CHAR_START+24); +inline constexpr TypedWhichId EE_CHAR_EMPHASISMARK (EE_CHAR_START+25); +inline constexpr TypedWhichId EE_CHAR_RELIEF (EE_CHAR_START+26); +inline constexpr TypedWhichId EE_CHAR_XMLATTRIBS (EE_CHAR_START+27); +inline constexpr TypedWhichId EE_CHAR_OVERLINE (EE_CHAR_START+28); +inline constexpr TypedWhichId EE_CHAR_CASEMAP (EE_CHAR_START+29); +inline constexpr TypedWhichId EE_CHAR_GRABBAG (EE_CHAR_START+30); +inline constexpr TypedWhichId EE_CHAR_BKGCOLOR (EE_CHAR_START+31); -constexpr sal_uInt16 EE_CHAR_END (EE_CHAR_START + 31); +inline constexpr sal_uInt16 EE_CHAR_END (EE_CHAR_START + 31); -constexpr sal_uInt16 EE_FEATURE_START (EE_CHAR_END + 1); -constexpr sal_uInt16 EE_FEATURE_TAB (EE_FEATURE_START + 0); -constexpr sal_uInt16 EE_FEATURE_LINEBR (EE_FEATURE_TAB + 1); -constexpr sal_uInt16 EE_FEATURE_NOTCONV (EE_FEATURE_LINEBR + 1); -constexpr TypedWhichId EE_FEATURE_FIELD (EE_FEATURE_NOTCONV + 1); -constexpr sal_uInt16 EE_FEATURE_END (EE_FEATURE_FIELD + 0); +inline constexpr sal_uInt16 EE_FEATURE_START (EE_CHAR_END + 1); +inline constexpr sal_uInt16 EE_FEATURE_TAB (EE_FEATURE_START + 0); +inline constexpr sal_uInt16 EE_FEATURE_LINEBR (EE_FEATURE_TAB + 1); +inline constexpr sal_uInt16 EE_FEATURE_NOTCONV (EE_FEATURE_LINEBR + 1); +inline constexpr TypedWhichId EE_FEATURE_FIELD (EE_FEATURE_NOTCONV + 1); +inline constexpr sal_uInt16 EE_FEATURE_END (EE_FEATURE_FIELD + 0); -constexpr sal_uInt16 EE_ITEMS_END (EE_FEATURE_END); +inline constexpr sal_uInt16 EE_ITEMS_END (EE_FEATURE_END); -constexpr sal_uInt16 EDITITEMCOUNT (EE_ITEMS_END - EE_ITEMS_START + 1); +inline constexpr sal_uInt16 EDITITEMCOUNT (EE_ITEMS_END - EE_ITEMS_START + 1); #endif // _ INCLUDED_EDITENG_EEITEM_HXX diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 2e3670a74617..9a57b6c6aef1 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -553,7 +553,7 @@ public: sal_uInt16 nType; // see SvxNumberType bool bVisible; - EBulletInfo() : nParagraph( EE_PARA_NOT_FOUND ), nType( 0 ), bVisible( false ) {} + EBulletInfo() : nParagraph( EE_PARA_MAX ), nType( 0 ), bVisible( false ) {} }; enum class OutlinerMode { @@ -692,7 +692,7 @@ public: OutlinerView* GetView( size_t nIndex ) const; size_t GetViewCount() const; - Paragraph* Insert( const OUString& rText, sal_Int32 nAbsPos = EE_PARA_APPEND, sal_Int16 nDepth = 0 ); + Paragraph* Insert( const OUString& rText, sal_Int32 nAbsPos = EE_PARA_MAX, sal_Int16 nDepth = 0 ); void SetText( const OutlinerParaObject& ); void AddText( const OutlinerParaObject&, bool bAppend = false ); void SetText( const OUString& rText, Paragraph* pParagraph ); @@ -700,7 +700,7 @@ public: void SetToEmptyText(); - std::optional CreateParaObject( sal_Int32 nStartPara = 0, sal_Int32 nParaCount = EE_PARA_ALL ) const; + std::optional CreateParaObject( sal_Int32 nStartPara = 0, sal_Int32 nParaCount = EE_PARA_MAX ) const; const SfxItemSet& GetEmptyItemSet() const; @@ -818,7 +818,7 @@ public: void SetWordDelimiters( const OUString& rDelimiters ); OUString const & GetWordDelimiters() const; - OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); + OUString GetWord( const EPaM& rPos ); void StripPortions(); diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index 59e92f4b691b..2658033614a4 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -30,8 +30,6 @@ This item describes the Upper- and Lower space of a page or paragraph. */ -#define ULSPACE_16_VERSION (sal_uInt16(0x0001)) - class EDITENG_DLLPUBLIC SvxULSpaceItem final : public SfxPoolItem { sal_uInt16 nUpper; // Upper space diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index b3cf3f89309c..783bd965ec8f 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -82,6 +82,7 @@ public: virtual bool Delete( const ESelection& ) override; virtual bool InsertText( const OUString&, const ESelection& ) override; virtual bool QuickFormatDoc( bool bFull = false ) override; + virtual bool SupportsOutlineDepth() const override; virtual sal_Int16 GetDepth( sal_Int32 nPara ) const override; virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) override; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 45824a4e390e..c7fd58aa90af 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -400,6 +400,9 @@ public: */ virtual bool QuickFormatDoc( bool bFull = false ) = 0; + // Is able to use Outline depth functions (GetDepth and SetDepth) meaningfully + virtual bool SupportsOutlineDepth() const = 0; + /** Get the outline depth of given paragraph @param nPara diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index ca64ca8c891a..fdb61341378b 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -78,6 +78,7 @@ public: virtual bool Delete( const ESelection& ) override; virtual bool InsertText( const OUString&, const ESelection& ) override; virtual bool QuickFormatDoc( bool bFull = false ) override; + virtual bool SupportsOutlineDepth() const override; virtual sal_Int16 GetDepth( sal_Int32 nPara ) const override; virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) override; diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index 1909eb3f2f85..bcd1f39ab66a 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -98,6 +98,7 @@ public: virtual bool Delete( const ESelection& ) override final; virtual bool InsertText( const OUString&, const ESelection& ) override final; virtual bool QuickFormatDoc( bool bFull = false ) override final; + virtual bool SupportsOutlineDepth() const override final; virtual sal_Int16 GetDepth( sal_Int32 nPara ) const override final; virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) override final; virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ) override final; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index b5cecccbf625..4011fac9d479 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -226,6 +226,7 @@ public: virtual bool Delete( const ESelection& ) override; virtual bool InsertText( const OUString&, const ESelection& ) override; virtual bool QuickFormatDoc( bool bFull = false ) override; + virtual bool SupportsOutlineDepth() const override; virtual sal_Int16 GetDepth( sal_Int32 nPara ) const override; virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) override; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 5c77580e4507..e92ef0a13c25 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -175,9 +175,6 @@ enum class TSS_Type : unsigned { const int nMaxPPTLevels = 10; -// Object IDs for StarDraw UserData -#define PPT_OBJECTINFO_ID (1) - struct MSFILTER_DLLPUBLIC PptDocumentAtom { Size aSlidesPageSize; // page size of the slides in 576DPI diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 1b708b83d479..e88bb05dc5d0 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -195,7 +195,7 @@ private: void exportDoughnutChart( const css::uno::Reference< css::chart2::XChartType >& xChartType ); void exportLineChart( const css::uno::Reference< css::chart2::XChartType >& xChartType ); void exportOfPieChart( const css::uno::Reference< css::chart2::XChartType >& - xChartType, const char* s_subtype ); + xChartType, const char* s_subtype, double nSplitPos ); void exportPieChart( const css::uno::Reference< css::chart2::XChartType >& xChartType ); void exportRadarChart( const css::uno::Reference< css::chart2::XChartType >& xChartType ); void exportScatterChart( const css::uno::Reference< css::chart2::XChartType >& xChartType ); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 4f7cd0f29c8f..b962ce611612 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -129,7 +129,6 @@ protected: std::unique_ptr m_xSfxPage; std::unique_ptr m_xContainer; std::unique_ptr m_xOKBtn; - std::unique_ptr m_xHelpBtn; void CreateOutputItemSet(const SfxItemSet& rInput); void SetInputSet(const SfxItemSet* pInSet) { m_pInputSet = pInSet; } diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 411a00782c02..6dbd397f8922 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -190,9 +190,6 @@ class SvxZoomItem; #define SID_FILTER_DATA TypedWhichId(SID_SFX_START + 1375) -#define SID_EXPLORER_FILEPROPS_START (SID_SFX_START + 1390) -// SID_EXPLORER_FILEPROPS_END (SID_SFX_START + 1399) - #define SID_ATTR_ZOOM TypedWhichId(SID_SVX_START + 0) #define SID_EXPLORER_PROPS_START TypedWhichId(SID_SFX_START + 1410) diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx index 7fb28c5588de..894bdeec6786 100644 --- a/include/svl/hint.hxx +++ b/include/svl/hint.hxx @@ -156,6 +156,7 @@ enum class SfxHintId { // STARMATH MathFormatChanged, + SmNewUserFormula, // Sw SwDrawViewsCreated, diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 8fffe17108f2..a514e70dd524 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -28,10 +28,12 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -261,9 +263,10 @@ class SVT_DLLPUBLIC BrowseBox ,public vcl::IAccessibleTableProvider { friend class BrowserDataWin; - friend class ::svt::BrowseBoxImpl; public: + typedef ::std::map> THeaderCellMap; + static const sal_uInt16 HandleColumnId = 0; private: @@ -342,14 +345,17 @@ private: std::stack m_aGotoStack; - ::std::unique_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object - bool m_bFocusOnlyCursor; // hide cursor if we don't have the focus Color m_aCursorColor; // special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor BrowserMode m_nCurrentMode; // last argument of SetMode (redundant, as our other members represent the current settings, too) + vcl::AccessibleFactoryAccess m_aFactoryAccess; + rtl::Reference m_pAccessible; + + THeaderCellMap m_aColHeaderCellMap; + THeaderCellMap m_aRowHeaderCellMap; + private: - SVT_DLLPRIVATE void ConstructImpl(BrowserMode nMode); SVT_DLLPRIVATE void ExpandRowSelection( const BrowserMouseEvent& rEvt ); SVT_DLLPRIVATE void ToggleSelection(); @@ -382,6 +388,14 @@ private: SAL_DLLPRIVATE sal_uInt16 ToggleSelectedColumn(); SAL_DLLPRIVATE void SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId); + /// @see AccessibleBrowseBox::getHeaderBar + css::uno::Reference + getAccessibleHeaderBar(AccessibleBrowseBoxObjType _eObjType); + + /// @see AccessibleBrowseBox::getTable + css::uno::Reference + getAccessibleTable(); + protected: /// retrieves the XAccessible implementation associated with the BrowseBox instance SAL_DLLPRIVATE ::vcl::IAccessibleFactory& getAccessibleFactory(); diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 6cc4483cd40d..5e4e774826d7 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -32,7 +32,6 @@ enum ColorConfigEntry : int DOCCOLOR , DOCBOUNDARIES , APPBACKGROUND , - OBJECTBOUNDARIES , TABLEBOUNDARIES , FONTCOLOR , LINKS , diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 259c7e965887..d907ef8dc671 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -20,8 +20,6 @@ #include -#define HTML_FONT_COUNT 7 - // !!!be aware!!!: the following defines are _not_ used as values in the configuration file // this is because of compatibility reasons #define HTML_CFG_MSIE 0 // Internet Explorer diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index 28767ce73fbe..e620c0c71e6d 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -42,11 +42,6 @@ namespace SvtOptionsDrawinglayer SVT_DLLPUBLIC Color GetStripeColorA(); SVT_DLLPUBLIC Color GetStripeColorB(); -// #i95644# helper to check if AA is allowed on this system. Currently, for WIN it's disabled -// and OutDevSupportType::TransparentRect is checked (this hits XRenderExtension, e.g. -// currently for SunRay as long as not supported there) -SVT_DLLPUBLIC bool IsAAPossibleOnThisSystem(); - // primitives SVT_DLLPUBLIC bool IsAntiAliasing(); SVT_DLLPUBLIC bool IsSnapHorVerLinesToDiscrete(); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 03dea4c03749..2244dfc805af 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -209,6 +209,7 @@ private: sal_uInt16 mnUserVisLines; sal_uInt16 mnFirstLine; sal_uInt16 mnSpacing; + sal_uInt16 mnMargin; DrawFrameStyle mnFrameStyle; Color maColor; OUString maText; @@ -369,6 +370,7 @@ public: } void SetExtraSpacing( sal_uInt16 nNewSpacing ); + void SetMargin( sal_uInt16 nNewMargin ); void Format(vcl::RenderContext const & rRenderContext); void SetFormat(); diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx index 0d95eb198e04..006cdba0a402 100644 --- a/include/svx/cuicharmap.hxx +++ b/include/svx/cuicharmap.hxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star; class SubsetMap; -#define CHARMAP_MAXLEN 32 - namespace svx { struct SvxShowCharSetItem; diff --git a/include/svx/dialog/gotodlg.hxx b/include/svx/dialog/gotodlg.hxx index 304f1352b0db..5830acce28bc 100644 --- a/include/svx/dialog/gotodlg.hxx +++ b/include/svx/dialog/gotodlg.hxx @@ -30,16 +30,12 @@ public: GotoPageDlg(weld::Window* pParent, const OUString& title, const OUString& label, sal_uInt16 curPagePos, sal_uInt16 pageCnt); - sal_uInt16 GetPageSelection() const { return mxMtrPageCtrl->get_text().toUInt32(); } + sal_uInt16 GetPageSelection() const { return mxMtrPageCtrl->get_value(); } private: - sal_uInt16 mnMaxPageCnt; - std::unique_ptr mxMtrPageCtrl; std::unique_ptr mxPageNumberLbl; std::unique_ptr mxPageLbl; - - DECL_LINK(PageModifiedHdl, weld::Entry&, void); }; } diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index bad0e95c89f5..7302c93d97c6 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -27,7 +27,7 @@ class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxB3DVectorItem final : public SfxPoolItem { - basegfx::B3DVector aVal; + basegfx::B3DVector m_aVal; public: SvxB3DVectorItem( TypedWhichId nWhich, const basegfx::B3DVector& rVal ); @@ -40,7 +40,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - const basegfx::B3DVector& GetValue() const { return aVal; } + const basegfx::B3DVector& GetValue() const { return m_aVal; } void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 5c98c3a1a3c6..fdd20c5994bf 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -156,7 +156,7 @@ public: void SetType( SvxBorderLineStyle nType ) { mnType = nType; } /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ - Style& MirrorSelf(); + void MirrorSelf(); /** Enables the Word-compatible Style comparison code. */ void SetWordTableCell(bool bWordTableCell) { mbWordTableCell = bWordTableCell; } diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index d668bf9e668e..b03b31a5d322 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -89,9 +89,6 @@ #define RID_GALLERY_THEME_TRANSPORT (RID_GALLERY_THEME_START + 43) #define RID_GALLERY_THEME_TXTSHAPES (RID_GALLERY_THEME_START + 44) -#define RID_GALLERY_THEME_FIRST RID_GALLERY_THEME_3D -#define RID_GALLERY_THEME_LAST RID_GALLERY_THEME_TXTSHAPES - class SdrModel; class Graphic; class BitmapEx; diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 3403b4e32db6..be4e0330b0e3 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -73,9 +73,7 @@ enum class GalleryGraphicImportRet #define GALLERY_PROGRESS_RANGE 10000 -#define GALLERY_FG_COLOR Application::GetSettings().GetStyleSettings().GetWindowTextColor() #define GALLERY_BG_COLOR Application::GetSettings().GetStyleSettings().GetWindowColor() -#define GALLERY_DLG_COLOR Application::GetSettings().GetStyleSettings().GetDialogColor() class SvStream; class Graphic; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index ff17e66e0c03..615a750a1c01 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -23,9 +23,6 @@ #include #include -#define GRFCROP_VERSION_SWDEFAULT 0 -#define GRFCROP_VERSION_MOVETOSVX 1 - class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem { sal_Int32 m_nLeft, m_nRight, m_nTop, m_nBottom; diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index f54c872f6c8d..42747477ba89 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -179,279 +179,279 @@ class Svx3DTextureModeItem; class SvXMLAttrContainerItem; class SvxFrameDirectionItem; -constexpr sal_uInt16 SDRATTR_START (XATTR_START); /* 1000 */ -constexpr sal_uInt16 SDRATTR_SHADOW_FIRST (XATTR_END + 1); // 1048 -constexpr TypedWhichId SDRATTR_SHADOW (SDRATTR_SHADOW_FIRST+ 0); // 1048 -constexpr TypedWhichId SDRATTR_SHADOWCOLOR (SDRATTR_SHADOW_FIRST+ 1); // 1049 -constexpr TypedWhichId SDRATTR_SHADOWXDIST (SDRATTR_SHADOW_FIRST+ 2); // 1050 -constexpr TypedWhichId SDRATTR_SHADOWYDIST (SDRATTR_SHADOW_FIRST+ 3); // 1051 -constexpr TypedWhichId SDRATTR_SHADOWTRANSPARENCE (SDRATTR_SHADOW_FIRST+ 4); // 1052 -constexpr TypedWhichId SDRATTR_SHADOW3D (SDRATTR_SHADOW_FIRST+ 5); // 1053 -constexpr TypedWhichId SDRATTR_SHADOWPERSP (SDRATTR_SHADOW_FIRST+ 6); // 1054 -constexpr TypedWhichId SDRATTR_SHADOWSIZEX (SDRATTR_SHADOW_FIRST+ 7); // 1055 -constexpr TypedWhichId SDRATTR_SHADOWSIZEY (SDRATTR_SHADOW_FIRST+ 8); // 1056 -constexpr TypedWhichId SDRATTR_SHADOWBLUR (SDRATTR_SHADOW_FIRST+ 9); // 1057 -constexpr TypedWhichId SDRATTR_SHADOWALIGNMENT(SDRATTR_SHADOW_FIRST + 10); // 1058 -constexpr sal_uInt16 SDRATTR_SHADOW_LAST (SDRATTR_SHADOWALIGNMENT); // 1058 +inline constexpr sal_uInt16 SDRATTR_START (XATTR_START); /* 1000 */ +inline constexpr sal_uInt16 SDRATTR_SHADOW_FIRST (XATTR_END + 1); // 1048 +inline constexpr TypedWhichId SDRATTR_SHADOW (SDRATTR_SHADOW_FIRST+ 0); // 1048 +inline constexpr TypedWhichId SDRATTR_SHADOWCOLOR (SDRATTR_SHADOW_FIRST+ 1); // 1049 +inline constexpr TypedWhichId SDRATTR_SHADOWXDIST (SDRATTR_SHADOW_FIRST+ 2); // 1050 +inline constexpr TypedWhichId SDRATTR_SHADOWYDIST (SDRATTR_SHADOW_FIRST+ 3); // 1051 +inline constexpr TypedWhichId SDRATTR_SHADOWTRANSPARENCE (SDRATTR_SHADOW_FIRST+ 4); // 1052 +inline constexpr TypedWhichId SDRATTR_SHADOW3D (SDRATTR_SHADOW_FIRST+ 5); // 1053 +inline constexpr TypedWhichId SDRATTR_SHADOWPERSP (SDRATTR_SHADOW_FIRST+ 6); // 1054 +inline constexpr TypedWhichId SDRATTR_SHADOWSIZEX (SDRATTR_SHADOW_FIRST+ 7); // 1055 +inline constexpr TypedWhichId SDRATTR_SHADOWSIZEY (SDRATTR_SHADOW_FIRST+ 8); // 1056 +inline constexpr TypedWhichId SDRATTR_SHADOWBLUR (SDRATTR_SHADOW_FIRST+ 9); // 1057 +inline constexpr TypedWhichId SDRATTR_SHADOWALIGNMENT(SDRATTR_SHADOW_FIRST + 10); // 1058 +inline constexpr sal_uInt16 SDRATTR_SHADOW_LAST (SDRATTR_SHADOWALIGNMENT); // 1058 -constexpr sal_uInt16 SDRATTR_CAPTION_FIRST (SDRATTR_SHADOW_LAST + 1); // 1059 -constexpr TypedWhichId SDRATTR_CAPTIONTYPE (SDRATTR_CAPTION_FIRST+ 0); // 1059 -constexpr TypedWhichId SDRATTR_CAPTIONFIXEDANGLE (SDRATTR_CAPTION_FIRST+ 1); // 1060 -constexpr TypedWhichId SDRATTR_CAPTIONANGLE (SDRATTR_CAPTION_FIRST+ 2); // 1061 -constexpr TypedWhichId SDRATTR_CAPTIONGAP (SDRATTR_CAPTION_FIRST+ 3); // 1062 -constexpr TypedWhichId SDRATTR_CAPTIONESCDIR (SDRATTR_CAPTION_FIRST+ 4); // 1063 -constexpr TypedWhichId SDRATTR_CAPTIONESCISREL (SDRATTR_CAPTION_FIRST+ 5); // 1064 -constexpr TypedWhichId SDRATTR_CAPTIONESCREL (SDRATTR_CAPTION_FIRST+ 6); // 1065 -constexpr TypedWhichId SDRATTR_CAPTIONESCABS (SDRATTR_CAPTION_FIRST+ 7); // 1066 -constexpr TypedWhichId SDRATTR_CAPTIONLINELEN (SDRATTR_CAPTION_FIRST+ 8); // 1067 -constexpr TypedWhichId SDRATTR_CAPTIONFITLINELEN (SDRATTR_CAPTION_FIRST+ 9); // 1068 -constexpr sal_uInt16 SDRATTR_CAPTION_LAST (SDRATTR_CAPTIONFITLINELEN); // 1068 +inline constexpr sal_uInt16 SDRATTR_CAPTION_FIRST (SDRATTR_SHADOW_LAST + 1); // 1059 +inline constexpr TypedWhichId SDRATTR_CAPTIONTYPE (SDRATTR_CAPTION_FIRST+ 0); // 1059 +inline constexpr TypedWhichId SDRATTR_CAPTIONFIXEDANGLE (SDRATTR_CAPTION_FIRST+ 1); // 1060 +inline constexpr TypedWhichId SDRATTR_CAPTIONANGLE (SDRATTR_CAPTION_FIRST+ 2); // 1061 +inline constexpr TypedWhichId SDRATTR_CAPTIONGAP (SDRATTR_CAPTION_FIRST+ 3); // 1062 +inline constexpr TypedWhichId SDRATTR_CAPTIONESCDIR (SDRATTR_CAPTION_FIRST+ 4); // 1063 +inline constexpr TypedWhichId SDRATTR_CAPTIONESCISREL (SDRATTR_CAPTION_FIRST+ 5); // 1064 +inline constexpr TypedWhichId SDRATTR_CAPTIONESCREL (SDRATTR_CAPTION_FIRST+ 6); // 1065 +inline constexpr TypedWhichId SDRATTR_CAPTIONESCABS (SDRATTR_CAPTION_FIRST+ 7); // 1066 +inline constexpr TypedWhichId SDRATTR_CAPTIONLINELEN (SDRATTR_CAPTION_FIRST+ 8); // 1067 +inline constexpr TypedWhichId SDRATTR_CAPTIONFITLINELEN (SDRATTR_CAPTION_FIRST+ 9); // 1068 +inline constexpr sal_uInt16 SDRATTR_CAPTION_LAST (SDRATTR_CAPTIONFITLINELEN); // 1068 -constexpr sal_uInt16 SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1); // 1069 -constexpr TypedWhichId SDRATTR_CORNER_RADIUS (SDRATTR_MISC_FIRST + 0); // 1069 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1); // 1070 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2); // 1071 sal_Bool, def=sal_True -constexpr TypedWhichId SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3); // 1072 enum, def=css::drawing::TextFitToSizeType_NONE -constexpr TypedWhichId SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4); // 1073 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5); // 1074 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_UPPERDIST (SDRATTR_MISC_FIRST + 6); // 1075 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_LOWERDIST (SDRATTR_MISC_FIRST + 7); // 1076 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_VERTADJUST (SDRATTR_MISC_FIRST + 8); // 1077 enum, def=SDRTEXTVERTADJUST_TOP -constexpr TypedWhichId SDRATTR_TEXT_MAXFRAMEHEIGHT (SDRATTR_MISC_FIRST + 9); // 1078 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_MINFRAMEWIDTH (SDRATTR_MISC_FIRST +10); // 1079 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11); // 1080 long, def=0 -constexpr TypedWhichId SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12); // 1081 sal_Bool, def=sal_False -constexpr TypedWhichId SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13); // 1082 enum, def=SDRTEXTHORZADJUST_LEFT -constexpr TypedWhichId SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14); // 1083 enum, def=SdrTextAniKind::NONE - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15); // 1084 enum, def=SdrTextAniDirection::Left - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16); // 1085 sal_Bool, def=sal_False - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17); // 1086 sal_Bool, def=sal_False - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18); // 1087 sal_uInt16, def=0 - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19); // 1088 sal_uInt16, def=0 - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20); // 1089 sal_uInt16, def=0 - Pool V2/V4 -constexpr TypedWhichId SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21); // 1090 Pool V2 -constexpr TypedWhichId SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +22); // 1091 Pool V2 -constexpr TypedWhichId SDRATTR_TEXT_USEFIXEDCELLHEIGHT (SDRATTR_MISC_FIRST +23); // 1092 Pool V2 -constexpr TypedWhichId SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +24); // 1093 Pool V2 -constexpr TypedWhichId SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST +25); // 1094 Pool V2 -constexpr TypedWhichId SDRATTR_TEXT_CLIPVERTOVERFLOW (SDRATTR_MISC_FIRST +26); // 1095 -constexpr sal_uInt16 SDRATTR_MISC_LAST (SDRATTR_TEXT_CLIPVERTOVERFLOW); // 1095 +inline constexpr sal_uInt16 SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1); // 1069 +inline constexpr TypedWhichId SDRATTR_CORNER_RADIUS (SDRATTR_MISC_FIRST + 0); // 1069 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1); // 1070 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2); // 1071 sal_Bool, def=sal_True +inline constexpr TypedWhichId SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3); // 1072 enum, def=css::drawing::TextFitToSizeType_NONE +inline constexpr TypedWhichId SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4); // 1073 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5); // 1074 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_UPPERDIST (SDRATTR_MISC_FIRST + 6); // 1075 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_LOWERDIST (SDRATTR_MISC_FIRST + 7); // 1076 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_VERTADJUST (SDRATTR_MISC_FIRST + 8); // 1077 enum, def=SDRTEXTVERTADJUST_TOP +inline constexpr TypedWhichId SDRATTR_TEXT_MAXFRAMEHEIGHT (SDRATTR_MISC_FIRST + 9); // 1078 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_MINFRAMEWIDTH (SDRATTR_MISC_FIRST +10); // 1079 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11); // 1080 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12); // 1081 sal_Bool, def=sal_False +inline constexpr TypedWhichId SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13); // 1082 enum, def=SDRTEXTHORZADJUST_LEFT +inline constexpr TypedWhichId SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14); // 1083 enum, def=SdrTextAniKind::NONE - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15); // 1084 enum, def=SdrTextAniDirection::Left - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16); // 1085 sal_Bool, def=sal_False - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17); // 1086 sal_Bool, def=sal_False - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18); // 1087 sal_uInt16, def=0 - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19); // 1088 sal_uInt16, def=0 - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20); // 1089 sal_uInt16, def=0 - Pool V2/V4 +inline constexpr TypedWhichId SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21); // 1090 Pool V2 +inline constexpr TypedWhichId SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +22); // 1091 Pool V2 +inline constexpr TypedWhichId SDRATTR_TEXT_USEFIXEDCELLHEIGHT (SDRATTR_MISC_FIRST +23); // 1092 Pool V2 +inline constexpr TypedWhichId SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +24); // 1093 Pool V2 +inline constexpr TypedWhichId SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST +25); // 1094 Pool V2 +inline constexpr TypedWhichId SDRATTR_TEXT_CLIPVERTOVERFLOW (SDRATTR_MISC_FIRST +26); // 1095 +inline constexpr sal_uInt16 SDRATTR_MISC_LAST (SDRATTR_TEXT_CLIPVERTOVERFLOW); // 1095 -constexpr sal_uInt16 SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1); // 1096 -constexpr TypedWhichId SDRATTR_EDGEKIND (SDRATTR_EDGE_FIRST + 0); // 1096 -constexpr TypedWhichId SDRATTR_EDGENODE1HORZDIST (SDRATTR_EDGE_FIRST + 1); // 1097 -constexpr TypedWhichId SDRATTR_EDGENODE1VERTDIST (SDRATTR_EDGE_FIRST + 2); // 1098 -constexpr TypedWhichId SDRATTR_EDGENODE2HORZDIST (SDRATTR_EDGE_FIRST + 3); // 1099 -constexpr TypedWhichId SDRATTR_EDGENODE2VERTDIST (SDRATTR_EDGE_FIRST + 4); // 1100 -constexpr TypedWhichId SDRATTR_EDGENODE1GLUEDIST (SDRATTR_EDGE_FIRST + 5); // 1101 -constexpr TypedWhichId SDRATTR_EDGENODE2GLUEDIST (SDRATTR_EDGE_FIRST + 6); // 1102 -constexpr TypedWhichId SDRATTR_EDGELINEDELTACOUNT (SDRATTR_EDGE_FIRST + 7); // 1103 -constexpr TypedWhichId SDRATTR_EDGELINE1DELTA (SDRATTR_EDGE_FIRST + 8); // 1104 -constexpr TypedWhichId SDRATTR_EDGELINE2DELTA (SDRATTR_EDGE_FIRST + 9); // 1105 -constexpr TypedWhichId SDRATTR_EDGELINE3DELTA (SDRATTR_EDGE_FIRST +10); // 1106 -constexpr sal_uInt16 SDRATTR_EDGE_LAST (SDRATTR_EDGELINE3DELTA); // 1106 +inline constexpr sal_uInt16 SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1); // 1096 +inline constexpr TypedWhichId SDRATTR_EDGEKIND (SDRATTR_EDGE_FIRST + 0); // 1096 +inline constexpr TypedWhichId SDRATTR_EDGENODE1HORZDIST (SDRATTR_EDGE_FIRST + 1); // 1097 +inline constexpr TypedWhichId SDRATTR_EDGENODE1VERTDIST (SDRATTR_EDGE_FIRST + 2); // 1098 +inline constexpr TypedWhichId SDRATTR_EDGENODE2HORZDIST (SDRATTR_EDGE_FIRST + 3); // 1099 +inline constexpr TypedWhichId SDRATTR_EDGENODE2VERTDIST (SDRATTR_EDGE_FIRST + 4); // 1100 +inline constexpr TypedWhichId SDRATTR_EDGENODE1GLUEDIST (SDRATTR_EDGE_FIRST + 5); // 1101 +inline constexpr TypedWhichId SDRATTR_EDGENODE2GLUEDIST (SDRATTR_EDGE_FIRST + 6); // 1102 +inline constexpr TypedWhichId SDRATTR_EDGELINEDELTACOUNT (SDRATTR_EDGE_FIRST + 7); // 1103 +inline constexpr TypedWhichId SDRATTR_EDGELINE1DELTA (SDRATTR_EDGE_FIRST + 8); // 1104 +inline constexpr TypedWhichId SDRATTR_EDGELINE2DELTA (SDRATTR_EDGE_FIRST + 9); // 1105 +inline constexpr TypedWhichId SDRATTR_EDGELINE3DELTA (SDRATTR_EDGE_FIRST +10); // 1106 +inline constexpr sal_uInt16 SDRATTR_EDGE_LAST (SDRATTR_EDGELINE3DELTA); // 1106 -constexpr sal_uInt16 SDRATTR_MEASURE_FIRST (SDRATTR_EDGE_LAST + 1); // 1107 -constexpr TypedWhichId SDRATTR_MEASUREKIND (SDRATTR_MEASURE_FIRST+ 0); // 1107 -constexpr TypedWhichId SDRATTR_MEASURETEXTHPOS (SDRATTR_MEASURE_FIRST+ 1); // 1108 -constexpr TypedWhichId SDRATTR_MEASURETEXTVPOS (SDRATTR_MEASURE_FIRST+ 2); // 1109 -constexpr TypedWhichId SDRATTR_MEASURELINEDIST (SDRATTR_MEASURE_FIRST+ 3); // 1110 -constexpr TypedWhichId SDRATTR_MEASUREHELPLINEOVERHANG (SDRATTR_MEASURE_FIRST+ 4); // 1111 -constexpr TypedWhichId SDRATTR_MEASUREHELPLINEDIST (SDRATTR_MEASURE_FIRST+ 5); // 1112 -constexpr TypedWhichId SDRATTR_MEASUREHELPLINE1LEN (SDRATTR_MEASURE_FIRST+ 6); // 1113 -constexpr TypedWhichId SDRATTR_MEASUREHELPLINE2LEN (SDRATTR_MEASURE_FIRST+ 7); // 1114 -constexpr TypedWhichId SDRATTR_MEASUREBELOWREFEDGE (SDRATTR_MEASURE_FIRST+ 8); // 1115 -constexpr TypedWhichId SDRATTR_MEASURETEXTROTA90 (SDRATTR_MEASURE_FIRST+ 9); // 1116 -constexpr TypedWhichId SDRATTR_MEASURETEXTUPSIDEDOWN (SDRATTR_MEASURE_FIRST+10); // 1117 -constexpr TypedWhichId SDRATTR_MEASUREOVERHANG (SDRATTR_MEASURE_FIRST+11); // 1118 -constexpr TypedWhichId SDRATTR_MEASUREUNIT (SDRATTR_MEASURE_FIRST+12); // 1119 -constexpr TypedWhichId SDRATTR_MEASURESCALE (SDRATTR_MEASURE_FIRST+13); // 1120 -constexpr TypedWhichId SDRATTR_MEASURESHOWUNIT (SDRATTR_MEASURE_FIRST+14); // 1121 -constexpr TypedWhichId SDRATTR_MEASUREFORMATSTRING (SDRATTR_MEASURE_FIRST+15); // 1122 -constexpr TypedWhichId SDRATTR_MEASURETEXTAUTOANGLE (SDRATTR_MEASURE_FIRST+16); // 1123 -constexpr TypedWhichId SDRATTR_MEASURETEXTAUTOANGLEVIEW (SDRATTR_MEASURE_FIRST+17); // 1124 -constexpr TypedWhichId SDRATTR_MEASURETEXTISFIXEDANGLE (SDRATTR_MEASURE_FIRST+18); // 1125 -constexpr TypedWhichId SDRATTR_MEASURETEXTFIXEDANGLE (SDRATTR_MEASURE_FIRST+19); // 1126 -constexpr TypedWhichId SDRATTR_MEASUREDECIMALPLACES (SDRATTR_MEASURE_FIRST+20); // 1127 -constexpr sal_uInt16 SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES); // 1127 +inline constexpr sal_uInt16 SDRATTR_MEASURE_FIRST (SDRATTR_EDGE_LAST + 1); // 1107 +inline constexpr TypedWhichId SDRATTR_MEASUREKIND (SDRATTR_MEASURE_FIRST+ 0); // 1107 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTHPOS (SDRATTR_MEASURE_FIRST+ 1); // 1108 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTVPOS (SDRATTR_MEASURE_FIRST+ 2); // 1109 +inline constexpr TypedWhichId SDRATTR_MEASURELINEDIST (SDRATTR_MEASURE_FIRST+ 3); // 1110 +inline constexpr TypedWhichId SDRATTR_MEASUREHELPLINEOVERHANG (SDRATTR_MEASURE_FIRST+ 4); // 1111 +inline constexpr TypedWhichId SDRATTR_MEASUREHELPLINEDIST (SDRATTR_MEASURE_FIRST+ 5); // 1112 +inline constexpr TypedWhichId SDRATTR_MEASUREHELPLINE1LEN (SDRATTR_MEASURE_FIRST+ 6); // 1113 +inline constexpr TypedWhichId SDRATTR_MEASUREHELPLINE2LEN (SDRATTR_MEASURE_FIRST+ 7); // 1114 +inline constexpr TypedWhichId SDRATTR_MEASUREBELOWREFEDGE (SDRATTR_MEASURE_FIRST+ 8); // 1115 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTROTA90 (SDRATTR_MEASURE_FIRST+ 9); // 1116 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTUPSIDEDOWN (SDRATTR_MEASURE_FIRST+10); // 1117 +inline constexpr TypedWhichId SDRATTR_MEASUREOVERHANG (SDRATTR_MEASURE_FIRST+11); // 1118 +inline constexpr TypedWhichId SDRATTR_MEASUREUNIT (SDRATTR_MEASURE_FIRST+12); // 1119 +inline constexpr TypedWhichId SDRATTR_MEASURESCALE (SDRATTR_MEASURE_FIRST+13); // 1120 +inline constexpr TypedWhichId SDRATTR_MEASURESHOWUNIT (SDRATTR_MEASURE_FIRST+14); // 1121 +inline constexpr TypedWhichId SDRATTR_MEASUREFORMATSTRING (SDRATTR_MEASURE_FIRST+15); // 1122 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTAUTOANGLE (SDRATTR_MEASURE_FIRST+16); // 1123 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTAUTOANGLEVIEW (SDRATTR_MEASURE_FIRST+17); // 1124 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTISFIXEDANGLE (SDRATTR_MEASURE_FIRST+18); // 1125 +inline constexpr TypedWhichId SDRATTR_MEASURETEXTFIXEDANGLE (SDRATTR_MEASURE_FIRST+19); // 1126 +inline constexpr TypedWhichId SDRATTR_MEASUREDECIMALPLACES (SDRATTR_MEASURE_FIRST+20); // 1127 +inline constexpr sal_uInt16 SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES); // 1127 -constexpr sal_uInt16 SDRATTR_CIRC_FIRST (SDRATTR_MEASURE_LAST+ 1); // 1128 -constexpr TypedWhichId SDRATTR_CIRCKIND (SDRATTR_CIRC_FIRST+ 0); // 1128 -constexpr TypedWhichId SDRATTR_CIRCSTARTANGLE (SDRATTR_CIRC_FIRST+ 1); // 1129 -constexpr TypedWhichId SDRATTR_CIRCENDANGLE (SDRATTR_CIRC_FIRST+ 2); // 1130 -constexpr sal_uInt16 SDRATTR_CIRC_LAST (SDRATTR_CIRCENDANGLE); // 1130 +inline constexpr sal_uInt16 SDRATTR_CIRC_FIRST (SDRATTR_MEASURE_LAST+ 1); // 1128 +inline constexpr TypedWhichId SDRATTR_CIRCKIND (SDRATTR_CIRC_FIRST+ 0); // 1128 +inline constexpr TypedWhichId SDRATTR_CIRCSTARTANGLE (SDRATTR_CIRC_FIRST+ 1); // 1129 +inline constexpr TypedWhichId SDRATTR_CIRCENDANGLE (SDRATTR_CIRC_FIRST+ 2); // 1130 +inline constexpr sal_uInt16 SDRATTR_CIRC_LAST (SDRATTR_CIRCENDANGLE); // 1130 // Only for Interfacing, not yet implemented. / * + * V4 / -constexpr sal_uInt16 SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1); // 1131 -constexpr TypedWhichId SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0); // 1131 sal_Bool, def=sal_False -constexpr TypedWhichId SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1); // 1132 sal_Bool, def=sal_False -constexpr TypedWhichId SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2); // 1133 sal_Bool, def=sal_True -constexpr TypedWhichId SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3); // 1134 sal_uInt16, def=0 -constexpr TypedWhichId SDRATTR_LAYERNAME (SDRATTR_NOTPERSIST_FIRST+ 4); // 1135 String, def="" -constexpr TypedWhichId SDRATTR_OBJECTNAME (SDRATTR_NOTPERSIST_FIRST+ 5); // 1136 String, def="" -constexpr TypedWhichId SDRATTR_ALLPOSITIONX (SDRATTR_NOTPERSIST_FIRST+ 6); // 1137 long, def=0 -constexpr TypedWhichId SDRATTR_ALLPOSITIONY (SDRATTR_NOTPERSIST_FIRST+ 7); // 1138 long, def=0 -constexpr TypedWhichId SDRATTR_ALLSIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+ 8); // 1139 long, def=0 -constexpr TypedWhichId SDRATTR_ALLSIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+ 9); // 1140 long, def=0 -constexpr TypedWhichId SDRATTR_ONEPOSITIONX (SDRATTR_NOTPERSIST_FIRST+10); // 1141 long, def=0 -constexpr TypedWhichId SDRATTR_ONEPOSITIONY (SDRATTR_NOTPERSIST_FIRST+11); // 1142 long, def=0 -constexpr TypedWhichId SDRATTR_ONESIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+12); // 1143 long, def=0 -constexpr TypedWhichId SDRATTR_ONESIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+13); // 1144 long, def=0 -constexpr TypedWhichId SDRATTR_LOGICSIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+14); // 1145 long, def=0 -constexpr TypedWhichId SDRATTR_LOGICSIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+15); // 1146 long, def=0 -constexpr TypedWhichId SDRATTR_ROTATEANGLE (SDRATTR_NOTPERSIST_FIRST+16); // 1147 long, def=0 -constexpr TypedWhichId SDRATTR_SHEARANGLE (SDRATTR_NOTPERSIST_FIRST+17); // 1148 long, def=0 -constexpr TypedWhichId SDRATTR_MOVEX (SDRATTR_NOTPERSIST_FIRST+18); // 1149 long, def=0 -constexpr TypedWhichId SDRATTR_MOVEY (SDRATTR_NOTPERSIST_FIRST+19); // 1150 long, def=0 -constexpr TypedWhichId SDRATTR_RESIZEXONE (SDRATTR_NOTPERSIST_FIRST+20); // 1151 long, def=0 -constexpr TypedWhichId SDRATTR_RESIZEYONE (SDRATTR_NOTPERSIST_FIRST+21); // 1152 long, def=0 -constexpr TypedWhichId SDRATTR_ROTATEONE (SDRATTR_NOTPERSIST_FIRST+22); // 1153 long, def=0 -constexpr TypedWhichId SDRATTR_HORZSHEARONE (SDRATTR_NOTPERSIST_FIRST+23); // 1154 long, def=0 -constexpr TypedWhichId SDRATTR_VERTSHEARONE (SDRATTR_NOTPERSIST_FIRST+24); // 1155 long, def=0 -constexpr TypedWhichId SDRATTR_RESIZEXALL (SDRATTR_NOTPERSIST_FIRST+25); // 1156 long, def=0 -constexpr TypedWhichId SDRATTR_RESIZEYALL (SDRATTR_NOTPERSIST_FIRST+26); // 1157 long, def=0 -constexpr TypedWhichId SDRATTR_ROTATEALL (SDRATTR_NOTPERSIST_FIRST+27); // 1158 long, def=0 -constexpr TypedWhichId SDRATTR_HORZSHEARALL (SDRATTR_NOTPERSIST_FIRST+28); // 1159 long, def=0 -constexpr TypedWhichId SDRATTR_VERTSHEARALL (SDRATTR_NOTPERSIST_FIRST+29); // 1160 long, def=0 -constexpr TypedWhichId SDRATTR_TRANSFORMREF1X (SDRATTR_NOTPERSIST_FIRST+30); // 1161 long, def=0 -constexpr TypedWhichId SDRATTR_TRANSFORMREF1Y (SDRATTR_NOTPERSIST_FIRST+31); // 1162 long, def=0 -constexpr TypedWhichId SDRATTR_TRANSFORMREF2X (SDRATTR_NOTPERSIST_FIRST+32); // 1163 long, def=0 -constexpr TypedWhichId SDRATTR_TRANSFORMREF2Y (SDRATTR_NOTPERSIST_FIRST+33); // 1164 long, def=0 -constexpr TypedWhichId SDRATTR_TEXTDIRECTION (SDRATTR_NOTPERSIST_FIRST+34); // 1165 long, def=0 -constexpr TypedWhichId SDRATTR_OBJVISIBLE (SDRATTR_NOTPERSIST_FIRST+35); // 1166 -constexpr sal_uInt16 SDRATTR_NOTPERSIST_LAST (SDRATTR_OBJVISIBLE); // 1166 +inline constexpr sal_uInt16 SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1); // 1131 +inline constexpr TypedWhichId SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0); // 1131 sal_Bool, def=sal_False +inline constexpr TypedWhichId SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1); // 1132 sal_Bool, def=sal_False +inline constexpr TypedWhichId SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2); // 1133 sal_Bool, def=sal_True +inline constexpr TypedWhichId SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3); // 1134 sal_uInt16, def=0 +inline constexpr TypedWhichId SDRATTR_LAYERNAME (SDRATTR_NOTPERSIST_FIRST+ 4); // 1135 String, def="" +inline constexpr TypedWhichId SDRATTR_OBJECTNAME (SDRATTR_NOTPERSIST_FIRST+ 5); // 1136 String, def="" +inline constexpr TypedWhichId SDRATTR_ALLPOSITIONX (SDRATTR_NOTPERSIST_FIRST+ 6); // 1137 long, def=0 +inline constexpr TypedWhichId SDRATTR_ALLPOSITIONY (SDRATTR_NOTPERSIST_FIRST+ 7); // 1138 long, def=0 +inline constexpr TypedWhichId SDRATTR_ALLSIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+ 8); // 1139 long, def=0 +inline constexpr TypedWhichId SDRATTR_ALLSIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+ 9); // 1140 long, def=0 +inline constexpr TypedWhichId SDRATTR_ONEPOSITIONX (SDRATTR_NOTPERSIST_FIRST+10); // 1141 long, def=0 +inline constexpr TypedWhichId SDRATTR_ONEPOSITIONY (SDRATTR_NOTPERSIST_FIRST+11); // 1142 long, def=0 +inline constexpr TypedWhichId SDRATTR_ONESIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+12); // 1143 long, def=0 +inline constexpr TypedWhichId SDRATTR_ONESIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+13); // 1144 long, def=0 +inline constexpr TypedWhichId SDRATTR_LOGICSIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+14); // 1145 long, def=0 +inline constexpr TypedWhichId SDRATTR_LOGICSIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+15); // 1146 long, def=0 +inline constexpr TypedWhichId SDRATTR_ROTATEANGLE (SDRATTR_NOTPERSIST_FIRST+16); // 1147 long, def=0 +inline constexpr TypedWhichId SDRATTR_SHEARANGLE (SDRATTR_NOTPERSIST_FIRST+17); // 1148 long, def=0 +inline constexpr TypedWhichId SDRATTR_MOVEX (SDRATTR_NOTPERSIST_FIRST+18); // 1149 long, def=0 +inline constexpr TypedWhichId SDRATTR_MOVEY (SDRATTR_NOTPERSIST_FIRST+19); // 1150 long, def=0 +inline constexpr TypedWhichId SDRATTR_RESIZEXONE (SDRATTR_NOTPERSIST_FIRST+20); // 1151 long, def=0 +inline constexpr TypedWhichId SDRATTR_RESIZEYONE (SDRATTR_NOTPERSIST_FIRST+21); // 1152 long, def=0 +inline constexpr TypedWhichId SDRATTR_ROTATEONE (SDRATTR_NOTPERSIST_FIRST+22); // 1153 long, def=0 +inline constexpr TypedWhichId SDRATTR_HORZSHEARONE (SDRATTR_NOTPERSIST_FIRST+23); // 1154 long, def=0 +inline constexpr TypedWhichId SDRATTR_VERTSHEARONE (SDRATTR_NOTPERSIST_FIRST+24); // 1155 long, def=0 +inline constexpr TypedWhichId SDRATTR_RESIZEXALL (SDRATTR_NOTPERSIST_FIRST+25); // 1156 long, def=0 +inline constexpr TypedWhichId SDRATTR_RESIZEYALL (SDRATTR_NOTPERSIST_FIRST+26); // 1157 long, def=0 +inline constexpr TypedWhichId SDRATTR_ROTATEALL (SDRATTR_NOTPERSIST_FIRST+27); // 1158 long, def=0 +inline constexpr TypedWhichId SDRATTR_HORZSHEARALL (SDRATTR_NOTPERSIST_FIRST+28); // 1159 long, def=0 +inline constexpr TypedWhichId SDRATTR_VERTSHEARALL (SDRATTR_NOTPERSIST_FIRST+29); // 1160 long, def=0 +inline constexpr TypedWhichId SDRATTR_TRANSFORMREF1X (SDRATTR_NOTPERSIST_FIRST+30); // 1161 long, def=0 +inline constexpr TypedWhichId SDRATTR_TRANSFORMREF1Y (SDRATTR_NOTPERSIST_FIRST+31); // 1162 long, def=0 +inline constexpr TypedWhichId SDRATTR_TRANSFORMREF2X (SDRATTR_NOTPERSIST_FIRST+32); // 1163 long, def=0 +inline constexpr TypedWhichId SDRATTR_TRANSFORMREF2Y (SDRATTR_NOTPERSIST_FIRST+33); // 1164 long, def=0 +inline constexpr TypedWhichId SDRATTR_TEXTDIRECTION (SDRATTR_NOTPERSIST_FIRST+34); // 1165 long, def=0 +inline constexpr TypedWhichId SDRATTR_OBJVISIBLE (SDRATTR_NOTPERSIST_FIRST+35); // 1166 +inline constexpr sal_uInt16 SDRATTR_NOTPERSIST_LAST (SDRATTR_OBJVISIBLE); // 1166 // no SetItem for this -constexpr sal_uInt16 SDRATTR_GRAF_FIRST (SDRATTR_NOTPERSIST_LAST+1); // 1167 -constexpr TypedWhichId SDRATTR_GRAFRED (SDRATTR_GRAF_FIRST+0); // 1167 -constexpr TypedWhichId SDRATTR_GRAFGREEN (SDRATTR_GRAF_FIRST+1); // 1168 -constexpr TypedWhichId SDRATTR_GRAFBLUE (SDRATTR_GRAF_FIRST+2); // 1169 -constexpr TypedWhichId SDRATTR_GRAFLUMINANCE (SDRATTR_GRAF_FIRST+3); // 1170 -constexpr TypedWhichId SDRATTR_GRAFCONTRAST (SDRATTR_GRAF_FIRST+4); // 1171 -constexpr TypedWhichId SDRATTR_GRAFGAMMA (SDRATTR_GRAF_FIRST+5); // 1172 -constexpr TypedWhichId SDRATTR_GRAFTRANSPARENCE (SDRATTR_GRAF_FIRST+6); // 1173 -constexpr TypedWhichId SDRATTR_GRAFINVERT (SDRATTR_GRAF_FIRST+7); // 1174 -constexpr TypedWhichId SDRATTR_GRAFMODE (SDRATTR_GRAF_FIRST+8); // 1175 -constexpr TypedWhichId SDRATTR_GRAFCROP (SDRATTR_GRAF_FIRST+9); // 1176 -constexpr sal_uInt16 SDRATTR_GRAF_LAST (SDRATTR_GRAFCROP); // 1176 +inline constexpr sal_uInt16 SDRATTR_GRAF_FIRST (SDRATTR_NOTPERSIST_LAST+1); // 1167 +inline constexpr TypedWhichId SDRATTR_GRAFRED (SDRATTR_GRAF_FIRST+0); // 1167 +inline constexpr TypedWhichId SDRATTR_GRAFGREEN (SDRATTR_GRAF_FIRST+1); // 1168 +inline constexpr TypedWhichId SDRATTR_GRAFBLUE (SDRATTR_GRAF_FIRST+2); // 1169 +inline constexpr TypedWhichId SDRATTR_GRAFLUMINANCE (SDRATTR_GRAF_FIRST+3); // 1170 +inline constexpr TypedWhichId SDRATTR_GRAFCONTRAST (SDRATTR_GRAF_FIRST+4); // 1171 +inline constexpr TypedWhichId SDRATTR_GRAFGAMMA (SDRATTR_GRAF_FIRST+5); // 1172 +inline constexpr TypedWhichId SDRATTR_GRAFTRANSPARENCE (SDRATTR_GRAF_FIRST+6); // 1173 +inline constexpr TypedWhichId SDRATTR_GRAFINVERT (SDRATTR_GRAF_FIRST+7); // 1174 +inline constexpr TypedWhichId SDRATTR_GRAFMODE (SDRATTR_GRAF_FIRST+8); // 1175 +inline constexpr TypedWhichId SDRATTR_GRAFCROP (SDRATTR_GRAF_FIRST+9); // 1176 +inline constexpr sal_uInt16 SDRATTR_GRAF_LAST (SDRATTR_GRAFCROP); // 1176 -constexpr sal_uInt16 SDRATTR_3D_FIRST (SDRATTR_GRAF_LAST + 1); // 1177 +inline constexpr sal_uInt16 SDRATTR_3D_FIRST (SDRATTR_GRAF_LAST + 1); // 1177 -constexpr sal_uInt16 SDRATTR_3DOBJ_FIRST (SDRATTR_3D_FIRST); // 1177 -constexpr TypedWhichId SDRATTR_3DOBJ_PERCENT_DIAGONAL (SDRATTR_3DOBJ_FIRST + 0); // 1177 -constexpr TypedWhichId SDRATTR_3DOBJ_BACKSCALE (SDRATTR_3DOBJ_FIRST + 1); // 1178 -constexpr TypedWhichId SDRATTR_3DOBJ_DEPTH (SDRATTR_3DOBJ_FIRST + 2); // 1179 -constexpr TypedWhichId SDRATTR_3DOBJ_HORZ_SEGS (SDRATTR_3DOBJ_FIRST + 3); // 1180 -constexpr TypedWhichId SDRATTR_3DOBJ_VERT_SEGS (SDRATTR_3DOBJ_FIRST + 4); // 1181 -constexpr TypedWhichId SDRATTR_3DOBJ_END_ANGLE (SDRATTR_3DOBJ_FIRST + 5); // 1182 -constexpr TypedWhichId SDRATTR_3DOBJ_DOUBLE_SIDED (SDRATTR_3DOBJ_FIRST + 6); // 1183 -constexpr TypedWhichId SDRATTR_3DOBJ_NORMALS_KIND (SDRATTR_3DOBJ_FIRST + 7); // 1184 -constexpr TypedWhichId SDRATTR_3DOBJ_NORMALS_INVERT (SDRATTR_3DOBJ_FIRST + 8); // 1185 -constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_PROJ_X (SDRATTR_3DOBJ_FIRST + 9); // 1186 -constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_PROJ_Y (SDRATTR_3DOBJ_FIRST + 10); // 1187 -constexpr TypedWhichId SDRATTR_3DOBJ_SHADOW_3D (SDRATTR_3DOBJ_FIRST + 11); // 1188 -constexpr TypedWhichId SDRATTR_3DOBJ_MAT_COLOR (SDRATTR_3DOBJ_FIRST + 12); // 1189 -constexpr TypedWhichId SDRATTR_3DOBJ_MAT_EMISSION (SDRATTR_3DOBJ_FIRST + 13); // 1190 -constexpr TypedWhichId SDRATTR_3DOBJ_MAT_SPECULAR (SDRATTR_3DOBJ_FIRST + 14); // 1191 -constexpr TypedWhichId SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY (SDRATTR_3DOBJ_FIRST + 15); // 1192 -constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_KIND (SDRATTR_3DOBJ_FIRST + 16); // 1193 -constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_MODE (SDRATTR_3DOBJ_FIRST + 17); // 1194 -constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_FILTER (SDRATTR_3DOBJ_FIRST + 18); // 1195 +inline constexpr sal_uInt16 SDRATTR_3DOBJ_FIRST (SDRATTR_3D_FIRST); // 1177 +inline constexpr TypedWhichId SDRATTR_3DOBJ_PERCENT_DIAGONAL (SDRATTR_3DOBJ_FIRST + 0); // 1177 +inline constexpr TypedWhichId SDRATTR_3DOBJ_BACKSCALE (SDRATTR_3DOBJ_FIRST + 1); // 1178 +inline constexpr TypedWhichId SDRATTR_3DOBJ_DEPTH (SDRATTR_3DOBJ_FIRST + 2); // 1179 +inline constexpr TypedWhichId SDRATTR_3DOBJ_HORZ_SEGS (SDRATTR_3DOBJ_FIRST + 3); // 1180 +inline constexpr TypedWhichId SDRATTR_3DOBJ_VERT_SEGS (SDRATTR_3DOBJ_FIRST + 4); // 1181 +inline constexpr TypedWhichId SDRATTR_3DOBJ_END_ANGLE (SDRATTR_3DOBJ_FIRST + 5); // 1182 +inline constexpr TypedWhichId SDRATTR_3DOBJ_DOUBLE_SIDED (SDRATTR_3DOBJ_FIRST + 6); // 1183 +inline constexpr TypedWhichId SDRATTR_3DOBJ_NORMALS_KIND (SDRATTR_3DOBJ_FIRST + 7); // 1184 +inline constexpr TypedWhichId SDRATTR_3DOBJ_NORMALS_INVERT (SDRATTR_3DOBJ_FIRST + 8); // 1185 +inline constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_PROJ_X (SDRATTR_3DOBJ_FIRST + 9); // 1186 +inline constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_PROJ_Y (SDRATTR_3DOBJ_FIRST + 10); // 1187 +inline constexpr TypedWhichId SDRATTR_3DOBJ_SHADOW_3D (SDRATTR_3DOBJ_FIRST + 11); // 1188 +inline constexpr TypedWhichId SDRATTR_3DOBJ_MAT_COLOR (SDRATTR_3DOBJ_FIRST + 12); // 1189 +inline constexpr TypedWhichId SDRATTR_3DOBJ_MAT_EMISSION (SDRATTR_3DOBJ_FIRST + 13); // 1190 +inline constexpr TypedWhichId SDRATTR_3DOBJ_MAT_SPECULAR (SDRATTR_3DOBJ_FIRST + 14); // 1191 +inline constexpr TypedWhichId SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY (SDRATTR_3DOBJ_FIRST + 15); // 1192 +inline constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_KIND (SDRATTR_3DOBJ_FIRST + 16); // 1193 +inline constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_MODE (SDRATTR_3DOBJ_FIRST + 17); // 1194 +inline constexpr TypedWhichId SDRATTR_3DOBJ_TEXTURE_FILTER (SDRATTR_3DOBJ_FIRST + 18); // 1195 // #107245# New items for 3d objects use former range SDRATTR_3DOBJ_RESERVED_01 // up to SDRATTR_3DOBJ_RESERVED_05 -constexpr TypedWhichId SDRATTR_3DOBJ_SMOOTH_NORMALS (SDRATTR_3DOBJ_FIRST + 19); // 1196 -constexpr TypedWhichId SDRATTR_3DOBJ_SMOOTH_LIDS (SDRATTR_3DOBJ_FIRST + 20); // 1197 -constexpr TypedWhichId SDRATTR_3DOBJ_CHARACTER_MODE (SDRATTR_3DOBJ_FIRST + 21); // 1198 -constexpr TypedWhichId SDRATTR_3DOBJ_CLOSE_FRONT (SDRATTR_3DOBJ_FIRST + 22); // 1199 -constexpr TypedWhichId SDRATTR_3DOBJ_CLOSE_BACK (SDRATTR_3DOBJ_FIRST + 23); // 1200 +inline constexpr TypedWhichId SDRATTR_3DOBJ_SMOOTH_NORMALS (SDRATTR_3DOBJ_FIRST + 19); // 1196 +inline constexpr TypedWhichId SDRATTR_3DOBJ_SMOOTH_LIDS (SDRATTR_3DOBJ_FIRST + 20); // 1197 +inline constexpr TypedWhichId SDRATTR_3DOBJ_CHARACTER_MODE (SDRATTR_3DOBJ_FIRST + 21); // 1198 +inline constexpr TypedWhichId SDRATTR_3DOBJ_CLOSE_FRONT (SDRATTR_3DOBJ_FIRST + 22); // 1199 +inline constexpr TypedWhichId SDRATTR_3DOBJ_CLOSE_BACK (SDRATTR_3DOBJ_FIRST + 23); // 1200 // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry -constexpr TypedWhichId SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY (SDRATTR_3DOBJ_FIRST + 24); // 1201 +inline constexpr TypedWhichId SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY (SDRATTR_3DOBJ_FIRST + 24); // 1201 -constexpr sal_uInt16 SDRATTR_3DOBJ_LAST (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY); // 1201 +inline constexpr sal_uInt16 SDRATTR_3DOBJ_LAST (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY); // 1201 -constexpr sal_uInt16 SDRATTR_3DSCENE_FIRST (SDRATTR_3DOBJ_LAST + 1); // 1202 -constexpr TypedWhichId SDRATTR_3DSCENE_PERSPECTIVE (SDRATTR_3DSCENE_FIRST + 0); // 1202 -constexpr TypedWhichId SDRATTR_3DSCENE_DISTANCE (SDRATTR_3DSCENE_FIRST + 1); // 1203 -constexpr TypedWhichId SDRATTR_3DSCENE_FOCAL_LENGTH (SDRATTR_3DSCENE_FIRST + 2); // 1204 -constexpr TypedWhichId SDRATTR_3DSCENE_TWO_SIDED_LIGHTING (SDRATTR_3DSCENE_FIRST + 3); // 1205 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_1 (SDRATTR_3DSCENE_FIRST + 4); // 1206 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_2 (SDRATTR_3DSCENE_FIRST + 5); // 1207 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_3 (SDRATTR_3DSCENE_FIRST + 6); // 1208 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_4 (SDRATTR_3DSCENE_FIRST + 7); // 1209 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_5 (SDRATTR_3DSCENE_FIRST + 8); // 1210 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_6 (SDRATTR_3DSCENE_FIRST + 9); // 1211 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_7 (SDRATTR_3DSCENE_FIRST + 10); // 1212 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_8 (SDRATTR_3DSCENE_FIRST + 11); // 1213 -constexpr TypedWhichId SDRATTR_3DSCENE_AMBIENTCOLOR (SDRATTR_3DSCENE_FIRST + 12); // 1214 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_1 (SDRATTR_3DSCENE_FIRST + 13); // 1215 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_2 (SDRATTR_3DSCENE_FIRST + 14); // 1216 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_3 (SDRATTR_3DSCENE_FIRST + 15); // 1217 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_4 (SDRATTR_3DSCENE_FIRST + 16); // 1218 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_5 (SDRATTR_3DSCENE_FIRST + 17); // 1219 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_6 (SDRATTR_3DSCENE_FIRST + 18); // 1220 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_7 (SDRATTR_3DSCENE_FIRST + 19); // 1221 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_8 (SDRATTR_3DSCENE_FIRST + 20); // 1222 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_1 (SDRATTR_3DSCENE_FIRST + 21); // 1223 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_2 (SDRATTR_3DSCENE_FIRST + 22); // 1224 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_3 (SDRATTR_3DSCENE_FIRST + 23); // 1225 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_4 (SDRATTR_3DSCENE_FIRST + 24); // 1226 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_5 (SDRATTR_3DSCENE_FIRST + 25); // 1227 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_6 (SDRATTR_3DSCENE_FIRST + 26); // 1228 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_7 (SDRATTR_3DSCENE_FIRST + 27); // 1229 -constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_8 (SDRATTR_3DSCENE_FIRST + 28); // 1230 -constexpr TypedWhichId SDRATTR_3DSCENE_SHADOW_SLANT (SDRATTR_3DSCENE_FIRST + 29); // 1231 -constexpr TypedWhichId SDRATTR_3DSCENE_SHADE_MODE (SDRATTR_3DSCENE_FIRST + 30); // 1232 -constexpr sal_uInt16 SDRATTR_3DSCENE_LAST (SDRATTR_3DSCENE_SHADE_MODE); // 1232 -constexpr sal_uInt16 SDRATTR_3D_LAST (SDRATTR_3DSCENE_LAST); // 1232 +inline constexpr sal_uInt16 SDRATTR_3DSCENE_FIRST (SDRATTR_3DOBJ_LAST + 1); // 1202 +inline constexpr TypedWhichId SDRATTR_3DSCENE_PERSPECTIVE (SDRATTR_3DSCENE_FIRST + 0); // 1202 +inline constexpr TypedWhichId SDRATTR_3DSCENE_DISTANCE (SDRATTR_3DSCENE_FIRST + 1); // 1203 +inline constexpr TypedWhichId SDRATTR_3DSCENE_FOCAL_LENGTH (SDRATTR_3DSCENE_FIRST + 2); // 1204 +inline constexpr TypedWhichId SDRATTR_3DSCENE_TWO_SIDED_LIGHTING (SDRATTR_3DSCENE_FIRST + 3); // 1205 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_1 (SDRATTR_3DSCENE_FIRST + 4); // 1206 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_2 (SDRATTR_3DSCENE_FIRST + 5); // 1207 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_3 (SDRATTR_3DSCENE_FIRST + 6); // 1208 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_4 (SDRATTR_3DSCENE_FIRST + 7); // 1209 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_5 (SDRATTR_3DSCENE_FIRST + 8); // 1210 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_6 (SDRATTR_3DSCENE_FIRST + 9); // 1211 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_7 (SDRATTR_3DSCENE_FIRST + 10); // 1212 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTCOLOR_8 (SDRATTR_3DSCENE_FIRST + 11); // 1213 +inline constexpr TypedWhichId SDRATTR_3DSCENE_AMBIENTCOLOR (SDRATTR_3DSCENE_FIRST + 12); // 1214 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_1 (SDRATTR_3DSCENE_FIRST + 13); // 1215 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_2 (SDRATTR_3DSCENE_FIRST + 14); // 1216 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_3 (SDRATTR_3DSCENE_FIRST + 15); // 1217 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_4 (SDRATTR_3DSCENE_FIRST + 16); // 1218 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_5 (SDRATTR_3DSCENE_FIRST + 17); // 1219 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_6 (SDRATTR_3DSCENE_FIRST + 18); // 1220 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_7 (SDRATTR_3DSCENE_FIRST + 19); // 1221 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTON_8 (SDRATTR_3DSCENE_FIRST + 20); // 1222 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_1 (SDRATTR_3DSCENE_FIRST + 21); // 1223 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_2 (SDRATTR_3DSCENE_FIRST + 22); // 1224 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_3 (SDRATTR_3DSCENE_FIRST + 23); // 1225 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_4 (SDRATTR_3DSCENE_FIRST + 24); // 1226 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_5 (SDRATTR_3DSCENE_FIRST + 25); // 1227 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_6 (SDRATTR_3DSCENE_FIRST + 26); // 1228 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_7 (SDRATTR_3DSCENE_FIRST + 27); // 1229 +inline constexpr TypedWhichId SDRATTR_3DSCENE_LIGHTDIRECTION_8 (SDRATTR_3DSCENE_FIRST + 28); // 1230 +inline constexpr TypedWhichId SDRATTR_3DSCENE_SHADOW_SLANT (SDRATTR_3DSCENE_FIRST + 29); // 1231 +inline constexpr TypedWhichId SDRATTR_3DSCENE_SHADE_MODE (SDRATTR_3DSCENE_FIRST + 30); // 1232 +inline constexpr sal_uInt16 SDRATTR_3DSCENE_LAST (SDRATTR_3DSCENE_SHADE_MODE); // 1232 +inline constexpr sal_uInt16 SDRATTR_3D_LAST (SDRATTR_3DSCENE_LAST); // 1232 -constexpr sal_uInt16 SDRATTR_CUSTOMSHAPE_FIRST (SDRATTR_3D_LAST + 1); // 1233 -constexpr TypedWhichId SDRATTR_CUSTOMSHAPE_ENGINE (SDRATTR_CUSTOMSHAPE_FIRST + 0); // 1233 -constexpr TypedWhichId SDRATTR_CUSTOMSHAPE_DATA (SDRATTR_CUSTOMSHAPE_FIRST + 1); // 1234 -constexpr TypedWhichId SDRATTR_CUSTOMSHAPE_GEOMETRY (SDRATTR_CUSTOMSHAPE_FIRST + 2); // 1235 -constexpr sal_uInt16 SDRATTR_CUSTOMSHAPE_LAST (SDRATTR_CUSTOMSHAPE_GEOMETRY); // 1235 +inline constexpr sal_uInt16 SDRATTR_CUSTOMSHAPE_FIRST (SDRATTR_3D_LAST + 1); // 1233 +inline constexpr TypedWhichId SDRATTR_CUSTOMSHAPE_ENGINE (SDRATTR_CUSTOMSHAPE_FIRST + 0); // 1233 +inline constexpr TypedWhichId SDRATTR_CUSTOMSHAPE_DATA (SDRATTR_CUSTOMSHAPE_FIRST + 1); // 1234 +inline constexpr TypedWhichId SDRATTR_CUSTOMSHAPE_GEOMETRY (SDRATTR_CUSTOMSHAPE_FIRST + 2); // 1235 +inline constexpr sal_uInt16 SDRATTR_CUSTOMSHAPE_LAST (SDRATTR_CUSTOMSHAPE_GEOMETRY); // 1235 -constexpr sal_uInt16 SDRATTR_TABLE_FIRST (SDRATTR_CUSTOMSHAPE_LAST+1); // 1236 -constexpr TypedWhichId SDRATTR_TABLE_BORDER (SDRATTR_TABLE_FIRST+0); // 1236 -constexpr TypedWhichId SDRATTR_TABLE_BORDER_INNER (SDRATTR_TABLE_FIRST+1); // 1237 -constexpr TypedWhichId SDRATTR_TABLE_BORDER_TLBR (SDRATTR_TABLE_FIRST+2); // 1238 -constexpr TypedWhichId SDRATTR_TABLE_BORDER_BLTR (SDRATTR_TABLE_FIRST+3); // 1239 -constexpr TypedWhichId SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_TABLE_FIRST+4); // 1240 -constexpr TypedWhichId SDRATTR_TABLE_CELL_GRABBAG (SDRATTR_TABLE_FIRST+5); // 1241 -constexpr sal_uInt16 SDRATTR_TABLE_LAST (SDRATTR_TABLE_CELL_GRABBAG); // 1241 +inline constexpr sal_uInt16 SDRATTR_TABLE_FIRST (SDRATTR_CUSTOMSHAPE_LAST+1); // 1236 +inline constexpr TypedWhichId SDRATTR_TABLE_BORDER (SDRATTR_TABLE_FIRST+0); // 1236 +inline constexpr TypedWhichId SDRATTR_TABLE_BORDER_INNER (SDRATTR_TABLE_FIRST+1); // 1237 +inline constexpr TypedWhichId SDRATTR_TABLE_BORDER_TLBR (SDRATTR_TABLE_FIRST+2); // 1238 +inline constexpr TypedWhichId SDRATTR_TABLE_BORDER_BLTR (SDRATTR_TABLE_FIRST+3); // 1239 +inline constexpr TypedWhichId SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_TABLE_FIRST+4); // 1240 +inline constexpr TypedWhichId SDRATTR_TABLE_CELL_GRABBAG (SDRATTR_TABLE_FIRST+5); // 1241 +inline constexpr sal_uInt16 SDRATTR_TABLE_LAST (SDRATTR_TABLE_CELL_GRABBAG); // 1241 -constexpr sal_uInt16 SDRATTR_GLOW_FIRST (SDRATTR_TABLE_LAST+1); // 1242 -constexpr TypedWhichId SDRATTR_GLOW_RADIUS(SDRATTR_GLOW_FIRST+0); // 1242 -constexpr TypedWhichId SDRATTR_GLOW_COLOR (SDRATTR_GLOW_FIRST+1); // 1243 -constexpr TypedWhichId SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST+2); // 1244 -constexpr sal_uInt16 SDRATTR_GLOW_LAST(SDRATTR_GLOW_TRANSPARENCY); // 1244 +inline constexpr sal_uInt16 SDRATTR_GLOW_FIRST (SDRATTR_TABLE_LAST+1); // 1242 +inline constexpr TypedWhichId SDRATTR_GLOW_RADIUS(SDRATTR_GLOW_FIRST+0); // 1242 +inline constexpr TypedWhichId SDRATTR_GLOW_COLOR (SDRATTR_GLOW_FIRST+1); // 1243 +inline constexpr TypedWhichId SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST+2); // 1244 +inline constexpr sal_uInt16 SDRATTR_GLOW_LAST(SDRATTR_GLOW_TRANSPARENCY); // 1244 -constexpr sal_uInt16 SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST+1); // 1245 -constexpr TypedWhichId SDRATTR_SOFTEDGE_RADIUS(SDRATTR_SOFTEDGE_FIRST+0); // 1245 -constexpr sal_uInt16 SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RADIUS); // 1245 +inline constexpr sal_uInt16 SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST+1); // 1245 +inline constexpr TypedWhichId SDRATTR_SOFTEDGE_RADIUS(SDRATTR_SOFTEDGE_FIRST+0); // 1245 +inline constexpr sal_uInt16 SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RADIUS); // 1245 -constexpr sal_uInt16 SDRATTR_GLOW_TEXT_FIRST(SDRATTR_SOFTEDGE_LAST+1); // 1246 -constexpr TypedWhichId SDRATTR_GLOW_TEXT_RADIUS(SDRATTR_GLOW_TEXT_FIRST+0); // 1246 -constexpr TypedWhichId SDRATTR_GLOW_TEXT_COLOR(SDRATTR_GLOW_TEXT_FIRST+1); // 1247 -constexpr TypedWhichId SDRATTR_GLOW_TEXT_TRANSPARENCY(SDRATTR_GLOW_TEXT_FIRST+2);// 1248 -constexpr sal_uInt16 SDRATTR_GLOW_TEXT_LAST(SDRATTR_GLOW_TEXT_TRANSPARENCY); // 1248 +inline constexpr sal_uInt16 SDRATTR_GLOW_TEXT_FIRST(SDRATTR_SOFTEDGE_LAST+1); // 1246 +inline constexpr TypedWhichId SDRATTR_GLOW_TEXT_RADIUS(SDRATTR_GLOW_TEXT_FIRST+0); // 1246 +inline constexpr TypedWhichId SDRATTR_GLOW_TEXT_COLOR(SDRATTR_GLOW_TEXT_FIRST+1); // 1247 +inline constexpr TypedWhichId SDRATTR_GLOW_TEXT_TRANSPARENCY(SDRATTR_GLOW_TEXT_FIRST+2);// 1248 +inline constexpr sal_uInt16 SDRATTR_GLOW_TEXT_LAST(SDRATTR_GLOW_TEXT_TRANSPARENCY); // 1248 -constexpr sal_uInt16 SDRATTR_TEXTCOLUMNS_FIRST(SDRATTR_GLOW_TEXT_LAST+1); // 1249 -constexpr TypedWhichId SDRATTR_TEXTCOLUMNS_NUMBER(SDRATTR_TEXTCOLUMNS_FIRST+0); // 1249 -constexpr TypedWhichId SDRATTR_TEXTCOLUMNS_SPACING(SDRATTR_TEXTCOLUMNS_FIRST+1); // 1250 -constexpr sal_uInt16 SDRATTR_TEXTCOLUMNS_LAST(SDRATTR_TEXTCOLUMNS_SPACING); // 1250 +inline constexpr sal_uInt16 SDRATTR_TEXTCOLUMNS_FIRST(SDRATTR_GLOW_TEXT_LAST+1); // 1249 +inline constexpr TypedWhichId SDRATTR_TEXTCOLUMNS_NUMBER(SDRATTR_TEXTCOLUMNS_FIRST+0); // 1249 +inline constexpr TypedWhichId SDRATTR_TEXTCOLUMNS_SPACING(SDRATTR_TEXTCOLUMNS_FIRST+1); // 1250 +inline constexpr sal_uInt16 SDRATTR_TEXTCOLUMNS_LAST(SDRATTR_TEXTCOLUMNS_SPACING); // 1250 -constexpr sal_uInt16 SDRATTR_WRITINGMODE2_FIRST(SDRATTR_TEXTCOLUMNS_LAST+1);// 1251 -constexpr TypedWhichId SDRATTR_WRITINGMODE2(SDRATTR_WRITINGMODE2_FIRST+0); // 1251 -constexpr sal_uInt16 SDRATTR_WRITINGMODE2_LAST(SDRATTR_WRITINGMODE2); // 1251 +inline constexpr sal_uInt16 SDRATTR_WRITINGMODE2_FIRST(SDRATTR_TEXTCOLUMNS_LAST+1);// 1251 +inline constexpr TypedWhichId SDRATTR_WRITINGMODE2(SDRATTR_WRITINGMODE2_FIRST+0); // 1251 +inline constexpr sal_uInt16 SDRATTR_WRITINGMODE2_LAST(SDRATTR_WRITINGMODE2); // 1251 -constexpr sal_uInt16 SDRATTR_EDGEOOXMLCURVE_FIRST(SDRATTR_WRITINGMODE2_LAST+1);// 1252 -constexpr TypedWhichId SDRATTR_EDGEOOXMLCURVE(SDRATTR_EDGEOOXMLCURVE_FIRST+0); // 1252 -constexpr sal_uInt16 SDRATTR_EDGEOOXMLCURVE_LAST(SDRATTR_EDGEOOXMLCURVE); // 1252 +inline constexpr sal_uInt16 SDRATTR_EDGEOOXMLCURVE_FIRST(SDRATTR_WRITINGMODE2_LAST+1);// 1252 +inline constexpr TypedWhichId SDRATTR_EDGEOOXMLCURVE(SDRATTR_EDGEOOXMLCURVE_FIRST+0); // 1252 +inline constexpr sal_uInt16 SDRATTR_EDGEOOXMLCURVE_LAST(SDRATTR_EDGEOOXMLCURVE); // 1252 -constexpr sal_uInt16 SDRATTR_END (SDRATTR_EDGEOOXMLCURVE_LAST); // 1252 +inline constexpr sal_uInt16 SDRATTR_END (SDRATTR_EDGEOOXMLCURVE_LAST); // 1252 #endif // INCLUDED_SVX_SVDDEF_HXX diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 58639bc85df5..3352f09196b3 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -228,10 +228,10 @@ inline const tools::Rectangle& SdrDragMethod::GetMarkedRect() const class SVXCORE_DLLPUBLIC SdrDragMove : public SdrDragMethod { private: - tools::Long nBestXSnap; - tools::Long nBestYSnap; - bool bXSnapped; - bool bYSnapped; + tools::Long m_nBestXSnap; + tools::Long m_nBestYSnap; + bool m_bXSnapped; + bool m_bYSnapped; void ImpCheckSnap(const Point& rPt); diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 2b32386e1004..1d490b1e1158 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -30,7 +30,7 @@ #include // That maximum shear angle -constexpr Degree100 SDRMAXSHEAR(8900); +inline constexpr Degree100 SDRMAXSHEAR(8900); class XPolygon; class XPolyPolygon; diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index 1009b0314923..41a3272d7c41 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -57,7 +57,7 @@ typedef o3tl::strong_int SdrLayerID; // If there is no layer when it should be identified, then // SdrLayerAdmin::GetLayerID(const String&) returns a value. -constexpr SdrLayerID SDRLAYER_NOTFOUND(-1); +inline constexpr SdrLayerID SDRLAYER_NOTFOUND(-1); /* * Repeat diff --git a/include/svx/xdef.hxx b/include/svx/xdef.hxx index 6d06c22cb1fa..5cfdde78eab8 100644 --- a/include/svx/xdef.hxx +++ b/include/svx/xdef.hxx @@ -85,66 +85,66 @@ class XSecondaryFillColorItem; #define COL_DEFAULT_SHAPE_FILLING ::Color(0x729fcf) // light blue 2 #define COL_DEFAULT_SHAPE_STROKE ::Color(0x3465a4) // dark blue 1 -constexpr sal_uInt16 XATTR_START = 1000; +inline constexpr sal_uInt16 XATTR_START = 1000; -constexpr sal_uInt16 XATTR_LINE_FIRST (XATTR_START); // 1000 -constexpr TypedWhichId XATTR_LINESTYLE (XATTR_LINE_FIRST); // 1000 -constexpr TypedWhichId XATTR_LINEDASH (XATTR_LINE_FIRST + 1); // 1001 -constexpr TypedWhichId XATTR_LINEWIDTH (XATTR_LINE_FIRST + 2); // 1002 -constexpr TypedWhichId XATTR_LINECOLOR (XATTR_LINE_FIRST + 3); // 1003 -constexpr TypedWhichId XATTR_LINESTART (XATTR_LINE_FIRST + 4); // 1004 -constexpr TypedWhichId XATTR_LINEEND (XATTR_LINE_FIRST + 5); // 1005 -constexpr TypedWhichId XATTR_LINESTARTWIDTH (XATTR_LINE_FIRST + 6); // 1006 -constexpr TypedWhichId XATTR_LINEENDWIDTH (XATTR_LINE_FIRST + 7); // 1007 -constexpr TypedWhichId XATTR_LINESTARTCENTER (XATTR_LINE_FIRST + 8); // 1008 -constexpr TypedWhichId XATTR_LINEENDCENTER (XATTR_LINE_FIRST + 9); // 1009 -constexpr TypedWhichId XATTR_LINETRANSPARENCE (XATTR_LINE_FIRST + 10); // 1010 -constexpr TypedWhichId XATTR_LINEJOINT (XATTR_LINE_FIRST + 11); // 1011 -constexpr TypedWhichId XATTR_LINECAP (XATTR_LINE_FIRST + 12); // 1012 -constexpr sal_uInt16 XATTR_LINE_LAST (XATTR_LINECAP); // 1012 -constexpr TypedWhichId XATTRSET_LINE (XATTR_LINE_LAST + 1); // 1013 +inline constexpr sal_uInt16 XATTR_LINE_FIRST (XATTR_START); // 1000 +inline constexpr TypedWhichId XATTR_LINESTYLE (XATTR_LINE_FIRST); // 1000 +inline constexpr TypedWhichId XATTR_LINEDASH (XATTR_LINE_FIRST + 1); // 1001 +inline constexpr TypedWhichId XATTR_LINEWIDTH (XATTR_LINE_FIRST + 2); // 1002 +inline constexpr TypedWhichId XATTR_LINECOLOR (XATTR_LINE_FIRST + 3); // 1003 +inline constexpr TypedWhichId XATTR_LINESTART (XATTR_LINE_FIRST + 4); // 1004 +inline constexpr TypedWhichId XATTR_LINEEND (XATTR_LINE_FIRST + 5); // 1005 +inline constexpr TypedWhichId XATTR_LINESTARTWIDTH (XATTR_LINE_FIRST + 6); // 1006 +inline constexpr TypedWhichId XATTR_LINEENDWIDTH (XATTR_LINE_FIRST + 7); // 1007 +inline constexpr TypedWhichId XATTR_LINESTARTCENTER (XATTR_LINE_FIRST + 8); // 1008 +inline constexpr TypedWhichId XATTR_LINEENDCENTER (XATTR_LINE_FIRST + 9); // 1009 +inline constexpr TypedWhichId XATTR_LINETRANSPARENCE (XATTR_LINE_FIRST + 10); // 1010 +inline constexpr TypedWhichId XATTR_LINEJOINT (XATTR_LINE_FIRST + 11); // 1011 +inline constexpr TypedWhichId XATTR_LINECAP (XATTR_LINE_FIRST + 12); // 1012 +inline constexpr sal_uInt16 XATTR_LINE_LAST (XATTR_LINECAP); // 1012 +inline constexpr TypedWhichId XATTRSET_LINE (XATTR_LINE_LAST + 1); // 1013 -constexpr sal_uInt16 XATTR_FILL_FIRST (XATTRSET_LINE + 1); // 1014 -constexpr TypedWhichId XATTR_FILLSTYLE (XATTR_FILL_FIRST); // 1014 -constexpr TypedWhichId XATTR_FILLCOLOR (XATTR_FILL_FIRST + 1); // 1015 -constexpr TypedWhichId XATTR_FILLGRADIENT (XATTR_FILL_FIRST + 2); // 1016 -constexpr TypedWhichId XATTR_FILLHATCH (XATTR_FILL_FIRST + 3); // 1017 -constexpr TypedWhichId XATTR_FILLBITMAP (XATTR_FILL_FIRST + 4); // 1018 -constexpr TypedWhichId XATTR_FILLTRANSPARENCE (XATTR_FILL_FIRST + 5); // 1019 -constexpr TypedWhichId XATTR_GRADIENTSTEPCOUNT (XATTR_FILL_FIRST + 6); // 1020 -constexpr TypedWhichId XATTR_FILLBMP_TILE (XATTR_FILL_FIRST + 7); // 1021 -constexpr TypedWhichId XATTR_FILLBMP_POS (XATTR_FILL_FIRST + 8); // 1022 -constexpr TypedWhichId XATTR_FILLBMP_SIZEX (XATTR_FILL_FIRST + 9); // 1023 -constexpr TypedWhichId XATTR_FILLBMP_SIZEY (XATTR_FILL_FIRST + 10); // 1024 -constexpr TypedWhichId XATTR_FILLFLOATTRANSPARENCE (XATTR_FILL_FIRST + 11); // 1025 -constexpr TypedWhichId XATTR_SECONDARYFILLCOLOR (XATTR_FILL_FIRST + 12); // 1026 -constexpr TypedWhichId XATTR_FILLBMP_SIZELOG (XATTR_FILL_FIRST + 13); // 1027 -constexpr TypedWhichId XATTR_FILLBMP_TILEOFFSETX (XATTR_FILL_FIRST + 14); // 1028 -constexpr TypedWhichId XATTR_FILLBMP_TILEOFFSETY (XATTR_FILL_FIRST + 15); // 1029 -constexpr TypedWhichId XATTR_FILLBMP_STRETCH (XATTR_FILL_FIRST + 16); // 1030 -constexpr TypedWhichId XATTR_FILLBMP_POSOFFSETX (XATTR_FILL_FIRST + 17); // 1031 -constexpr TypedWhichId XATTR_FILLBMP_POSOFFSETY (XATTR_FILL_FIRST + 18); // 1032 -constexpr TypedWhichId XATTR_FILLBACKGROUND (XATTR_FILL_FIRST + 19); // 1033 -constexpr TypedWhichId XATTR_FILLUSESLIDEBACKGROUND (XATTR_FILL_FIRST + 20);// 1034 -constexpr sal_uInt16 XATTR_FILL_LAST (XATTR_FILLUSESLIDEBACKGROUND); // 1034 -constexpr TypedWhichId XATTRSET_FILL (XATTR_FILL_LAST + 1); // 1035 +inline constexpr sal_uInt16 XATTR_FILL_FIRST (XATTRSET_LINE + 1); // 1014 +inline constexpr TypedWhichId XATTR_FILLSTYLE (XATTR_FILL_FIRST); // 1014 +inline constexpr TypedWhichId XATTR_FILLCOLOR (XATTR_FILL_FIRST + 1); // 1015 +inline constexpr TypedWhichId XATTR_FILLGRADIENT (XATTR_FILL_FIRST + 2); // 1016 +inline constexpr TypedWhichId XATTR_FILLHATCH (XATTR_FILL_FIRST + 3); // 1017 +inline constexpr TypedWhichId XATTR_FILLBITMAP (XATTR_FILL_FIRST + 4); // 1018 +inline constexpr TypedWhichId XATTR_FILLTRANSPARENCE (XATTR_FILL_FIRST + 5); // 1019 +inline constexpr TypedWhichId XATTR_GRADIENTSTEPCOUNT (XATTR_FILL_FIRST + 6); // 1020 +inline constexpr TypedWhichId XATTR_FILLBMP_TILE (XATTR_FILL_FIRST + 7); // 1021 +inline constexpr TypedWhichId XATTR_FILLBMP_POS (XATTR_FILL_FIRST + 8); // 1022 +inline constexpr TypedWhichId XATTR_FILLBMP_SIZEX (XATTR_FILL_FIRST + 9); // 1023 +inline constexpr TypedWhichId XATTR_FILLBMP_SIZEY (XATTR_FILL_FIRST + 10); // 1024 +inline constexpr TypedWhichId XATTR_FILLFLOATTRANSPARENCE (XATTR_FILL_FIRST + 11); // 1025 +inline constexpr TypedWhichId XATTR_SECONDARYFILLCOLOR (XATTR_FILL_FIRST + 12); // 1026 +inline constexpr TypedWhichId XATTR_FILLBMP_SIZELOG (XATTR_FILL_FIRST + 13); // 1027 +inline constexpr TypedWhichId XATTR_FILLBMP_TILEOFFSETX (XATTR_FILL_FIRST + 14); // 1028 +inline constexpr TypedWhichId XATTR_FILLBMP_TILEOFFSETY (XATTR_FILL_FIRST + 15); // 1029 +inline constexpr TypedWhichId XATTR_FILLBMP_STRETCH (XATTR_FILL_FIRST + 16); // 1030 +inline constexpr TypedWhichId XATTR_FILLBMP_POSOFFSETX (XATTR_FILL_FIRST + 17); // 1031 +inline constexpr TypedWhichId XATTR_FILLBMP_POSOFFSETY (XATTR_FILL_FIRST + 18); // 1032 +inline constexpr TypedWhichId XATTR_FILLBACKGROUND (XATTR_FILL_FIRST + 19); // 1033 +inline constexpr TypedWhichId XATTR_FILLUSESLIDEBACKGROUND (XATTR_FILL_FIRST + 20);// 1034 +inline constexpr sal_uInt16 XATTR_FILL_LAST (XATTR_FILLUSESLIDEBACKGROUND); // 1034 +inline constexpr TypedWhichId XATTRSET_FILL (XATTR_FILL_LAST + 1); // 1035 -constexpr sal_uInt16 XATTR_TEXT_FIRST (XATTRSET_FILL + 1); // 1036 -constexpr TypedWhichId XATTR_FORMTXTSTYLE (XATTR_TEXT_FIRST); // 1036 -constexpr TypedWhichId XATTR_FORMTXTADJUST (XATTR_TEXT_FIRST + 1); // 1037 -constexpr TypedWhichId XATTR_FORMTXTDISTANCE (XATTR_TEXT_FIRST + 2); // 1038 -constexpr TypedWhichId XATTR_FORMTXTSTART (XATTR_TEXT_FIRST + 3); // 1039 -constexpr TypedWhichId XATTR_FORMTXTMIRROR (XATTR_TEXT_FIRST + 4); // 1040 -constexpr TypedWhichId XATTR_FORMTXTOUTLINE (XATTR_TEXT_FIRST + 5); // 1041 -constexpr TypedWhichId XATTR_FORMTXTSHADOW (XATTR_TEXT_FIRST + 6); // 1042 -constexpr TypedWhichId XATTR_FORMTXTSHDWCOLOR (XATTR_TEXT_FIRST + 7); // 1043 -constexpr TypedWhichId XATTR_FORMTXTSHDWXVAL (XATTR_TEXT_FIRST + 8); // 1044 -constexpr TypedWhichId XATTR_FORMTXTSHDWYVAL (XATTR_TEXT_FIRST + 9); // 1045 -constexpr TypedWhichId XATTR_FORMTXTHIDEFORM (XATTR_TEXT_FIRST + 10); // 1046 -constexpr TypedWhichId XATTR_FORMTXTSHDWTRANSP (XATTR_TEXT_FIRST + 11); // 1047 -constexpr sal_uInt16 XATTR_TEXT_LAST (XATTR_FORMTXTSHDWTRANSP);// 1047 +inline constexpr sal_uInt16 XATTR_TEXT_FIRST (XATTRSET_FILL + 1); // 1036 +inline constexpr TypedWhichId XATTR_FORMTXTSTYLE (XATTR_TEXT_FIRST); // 1036 +inline constexpr TypedWhichId XATTR_FORMTXTADJUST (XATTR_TEXT_FIRST + 1); // 1037 +inline constexpr TypedWhichId XATTR_FORMTXTDISTANCE (XATTR_TEXT_FIRST + 2); // 1038 +inline constexpr TypedWhichId XATTR_FORMTXTSTART (XATTR_TEXT_FIRST + 3); // 1039 +inline constexpr TypedWhichId XATTR_FORMTXTMIRROR (XATTR_TEXT_FIRST + 4); // 1040 +inline constexpr TypedWhichId XATTR_FORMTXTOUTLINE (XATTR_TEXT_FIRST + 5); // 1041 +inline constexpr TypedWhichId XATTR_FORMTXTSHADOW (XATTR_TEXT_FIRST + 6); // 1042 +inline constexpr TypedWhichId XATTR_FORMTXTSHDWCOLOR (XATTR_TEXT_FIRST + 7); // 1043 +inline constexpr TypedWhichId XATTR_FORMTXTSHDWXVAL (XATTR_TEXT_FIRST + 8); // 1044 +inline constexpr TypedWhichId XATTR_FORMTXTSHDWYVAL (XATTR_TEXT_FIRST + 9); // 1045 +inline constexpr TypedWhichId XATTR_FORMTXTHIDEFORM (XATTR_TEXT_FIRST + 10); // 1046 +inline constexpr TypedWhichId XATTR_FORMTXTSHDWTRANSP (XATTR_TEXT_FIRST + 11); // 1047 +inline constexpr sal_uInt16 XATTR_TEXT_LAST (XATTR_FORMTXTSHDWTRANSP);// 1047 -constexpr sal_uInt16 XATTR_END = XATTR_TEXT_LAST; // 1047 +inline constexpr sal_uInt16 XATTR_END = XATTR_TEXT_LAST; // 1047 #endif diff --git a/include/unotools/fcm.hxx b/include/unotools/fcm.hxx index 30df362884ba..6fd6b8283777 100644 --- a/include/unotools/fcm.hxx +++ b/include/unotools/fcm.hxx @@ -23,6 +23,7 @@ #include #include #include +#include namespace utl { @@ -40,12 +41,22 @@ ConnectFrameControllerModel(const css::uno::Reference& xFram const css::uno::Reference& xController, const css::uno::Reference& xModel) { + auto xModifiable = xModel.query(); + bool bOldModifiable = false; + if (xModifiable) + { + bOldModifiable = xModifiable->isSetModifiedEnabled(); + if (bOldModifiable) + xModifiable->disableSetModified(); + } ConnectModelController(xModel, xController); if (xFrame) xFrame->setComponent(xController->getComponentWindow(), xController); // creates the view and menu // for correct menu creation the initialized component must be already set into the frame xController->attachFrame(xFrame); + if (xModifiable && bOldModifiable) + xModifiable->enableSetModified(); } } diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 8aa9860ceb1a..1599473faa02 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -155,14 +155,14 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions final : public utl::de OUString GetDefaultModuleName() const; - bool IsMath () const; - bool IsChart () const; - bool IsCalc () const; - bool IsDraw () const; - bool IsWriter () const; - bool IsImpress () const; - static bool IsBasicIDE () { return true; } - bool IsDataBase () const; + bool IsMathInstalled() const { return IsModuleInstalled(EModule::MATH); } + bool IsChartInstalled() const { return IsModuleInstalled(EModule::CHART); } + bool IsCalcInstalled() const { return IsModuleInstalled(EModule::CALC); } + bool IsDrawInstalled() const { return IsModuleInstalled(EModule::DRAW); } + bool IsWriterInstalled() const { return IsModuleInstalled(EModule::WRITER); } + bool IsImpressInstalled() const { return IsModuleInstalled(EModule::IMPRESS); } + static bool IsBasicIDEInstalled() { return true; } + bool IsDataBaseInstalled() const { return IsModuleInstalled(EModule::DATABASE); } css::uno::Sequence < OUString > GetAllServiceNames(); diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 9f062448d97f..254b4e52d328 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -242,7 +242,7 @@ private: std::string_view sType, std::string_view sInternalChild) override; VclPtr insertObject(vcl::Window* pParent, const OUString& rClass, - const OUString& rID, stringmap& rProps, + std::string_view sType, const OUString& rID, stringmap& rProps, stringmap& rPangoAttributes, stringmap& rAtkProps) override; VclPtr makeObject(vcl::Window *pParent, diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 981d89c4831e..a863b17c1879 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -73,6 +73,50 @@ class VCL_DLLPUBLIC PDFOutputStream virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0; }; +/* The following structure describes the permissions used in PDF security */ +struct PDFEncryptionProperties +{ + //for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20. + bool CanPrintTheDocument; + bool CanModifyTheContent; + bool CanCopyOrExtract; + bool CanAddOrModify; + //for revision 3 (bit 128 security) only + bool CanFillInteractive; + bool CanExtractForAccessibility; + bool CanAssemble; + bool CanPrintFull; + + // encryption will only happen if EncryptionKey is not empty + // EncryptionKey is actually a construct out of OValue, UValue and DocumentIdentifier + // if these do not match, behavior is undefined, most likely an invalid PDF will be produced + // OValue, UValue, EncryptionKey and DocumentIdentifier can be computed from + // PDFDocInfo, Owner password and User password used the InitEncryption method which + // implements the algorithms described in the PDF reference chapter 3.5: Encryption + std::vector OValue; + std::vector UValue; + std::vector EncryptionKey; + std::vector DocumentIdentifier; + + //permission default set for 128 bit, accessibility only + PDFEncryptionProperties() : + CanPrintTheDocument ( false ), + CanModifyTheContent ( false ), + CanCopyOrExtract ( false ), + CanAddOrModify ( false ), + CanFillInteractive ( false ), + CanExtractForAccessibility ( true ), + CanAssemble ( false ), + CanPrintFull ( false ) + {} + + + bool Encrypt() const + { + return ! OValue.empty() && ! UValue.empty() && ! DocumentIdentifier.empty(); + } +}; + class PDFWriter { ScopedVclPtr xImplementation; @@ -523,51 +567,6 @@ public: LaunchAction }; -/* -The following structure describes the permissions used in PDF security - */ - struct PDFEncryptionProperties - { - - //for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20. - bool CanPrintTheDocument; - bool CanModifyTheContent; - bool CanCopyOrExtract; - bool CanAddOrModify; - //for revision 3 (bit 128 security) only - bool CanFillInteractive; - bool CanExtractForAccessibility; - bool CanAssemble; - bool CanPrintFull; - - // encryption will only happen if EncryptionKey is not empty - // EncryptionKey is actually a construct out of OValue, UValue and DocumentIdentifier - // if these do not match, behavior is undefined, most likely an invalid PDF will be produced - // OValue, UValue, EncryptionKey and DocumentIdentifier can be computed from - // PDFDocInfo, Owner password and User password used the InitEncryption method which - // implements the algorithms described in the PDF reference chapter 3.5: Encryption - std::vector OValue; - std::vector UValue; - std::vector EncryptionKey; - std::vector DocumentIdentifier; - - //permission default set for 128 bit, accessibility only - PDFEncryptionProperties() : - CanPrintTheDocument ( false ), - CanModifyTheContent ( false ), - CanCopyOrExtract ( false ), - CanAddOrModify ( false ), - CanFillInteractive ( false ), - CanExtractForAccessibility ( true ), - CanAssemble ( false ), - CanPrintFull ( false ) - {} - - - bool Encrypt() const - { return ! OValue.empty() && ! UValue.empty() && ! DocumentIdentifier.empty(); } - }; - struct PDFDocInfo { OUString Title; // document title @@ -649,7 +648,7 @@ The following structure describes the permissions used in PDF security sal_Int32 InitialPage; sal_Int32 OpenBookmarkLevels; // -1 means all levels - PDFWriter::PDFEncryptionProperties Encryption; + PDFEncryptionProperties Encryption; PDFWriter::PDFDocInfo DocumentInfo; bool SignPDF; diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 9ac3b334497e..28987536ad9c 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -190,7 +190,6 @@ public: Control* GetOpenMenu(); virtual Size calculateRequisition() const override; - static sal_uInt16 GetHeaderHeight(); protected: virtual bool ImplPlaceTabs( tools::Long nWidth ) override; diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 8d37156a3eec..e19648515d7d 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -164,7 +164,6 @@ typedef sal_uInt32 sal_UCS4; // TODO: this should be moved to rtl enum class OutDevSupportType { - TransparentRect, TransparentText // if alpha in TextColor can be honored }; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index effe46665612..81554db95c1a 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -543,17 +543,7 @@ public: virtual Size get_size() const = 0; virtual Point get_position() const = 0; virtual AbsoluteScreenPixelRectangle get_monitor_workarea() const = 0; - // center window on is parent - // - // bTrackGeometryRequests set to true tries to ensure the window will end - // up still centered on its parent windows final size, taking into account - // that there may currently be pending geometry requests for the parent not - // yet processed by the underlying toolkit - // - // for e.g gtk this will means the window is always centered even when - // resized, calling set_centered_on_parent with false will turn this - // off again. - virtual void set_centered_on_parent(bool bTrackGeometryRequests) = 0; + // returns whether the widget that has focus is within this Window // (its very possible to move this to weld::Container if that becomes // desirable) @@ -617,6 +607,19 @@ private: public: virtual void set_modal(bool bModal) = 0; virtual bool get_modal() const = 0; + + // center dialog on its parent + // + // bTrackGeometryRequests set to true tries to ensure the dialog will end + // up still centered on its parent windows final size, taking into account + // that there may currently be pending geometry requests for the parent not + // yet processed by the underlying toolkit + // + // for e.g gtk this will means the dialog is always centered even when + // resized, calling set_centered_on_parent with false will turn this + // off again. + virtual void set_centered_on_parent(bool bTrackGeometryRequests) = 0; + virtual int run() = 0; // Run async without a controller // @param self - must point to this, to enforce that the dialog was created/held by a shared_ptr @@ -626,7 +629,7 @@ public: virtual void response(int response) = 0; virtual void add_button(const OUString& rText, int response, const OUString& rHelpId = {}) = 0; virtual void set_default_response(int response) = 0; - virtual Button* weld_widget_for_response(int response) = 0; + virtual std::unique_ptr 2 @@ -136,6 +156,11 @@ False center True + + + Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list. + + 1 @@ -148,9 +173,14 @@ True False True + Any paragraph formatting changes in the document to a paragraph with this style are applied automatically to modify the paragraph style. True True - Any paragraph formatting changes in the document to a paragraph with this style are applied automatically to modify the paragraph style. + + + Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated. + + 1 @@ -166,6 +196,11 @@ False 52 True + + + Enter a name for the style. + + 1 diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx index 9eab4d5e01d2..e4295311df72 100644 --- a/shell/source/win32/ooofilereader/metainforeader.cxx +++ b/shell/source/win32/ooofilereader/metainforeader.cxx @@ -121,7 +121,7 @@ CMetaInfoReader::~CMetaInfoReader() */ bool CMetaInfoReader::hasTag(const std::wstring& TagName) const { - return ( m_AllMetaInfo.find(TagName) != m_AllMetaInfo.end()); + return ( m_AllMetaInfo.contains(TagName) ); } /** Get a specific tag content, compound tags will be returned as comma separated list. @@ -146,7 +146,7 @@ std::wstring CMetaInfoReader::getTagData( const std::wstring& TagName) */ bool CMetaInfoReader::hasTagAttribute(const std::wstring& TagName, const std::wstring& AttributeName) { - return ( m_AllMetaInfo[TagName].second.find( AttributeName) != m_AllMetaInfo[TagName].second.end() ); + return ( m_AllMetaInfo[TagName].second.contains( AttributeName) ); } /** Get a specific attribute content. diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index faf7d7719184..460d0170c633 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -164,8 +164,7 @@ namespace slideshow::internal // resize surrounding window and applet to current shape size // ========================================================== - ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, + ::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds( rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange aPixelBounds( @@ -230,8 +229,7 @@ namespace slideshow::internal if( !mxFrame.is() ) return false; - ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, + ::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds( rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange aPixelBounds( diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index f961eabb7107..978ade81db84 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -61,8 +61,7 @@ namespace slideshow::internal // buffered bitmap is invalid, re-create // determine transformed page bounds - ::basegfx::B2DRectangle aTmpRect; - ::canvas::tools::calcTransformedRectBounds( aTmpRect, + ::basegfx::B2DRectangle aTmpRect = ::canvas::tools::calcTransformedRectBounds( maBounds, aCanvasTransform ); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index bf683d17a341..ec19f11b66f8 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -228,8 +228,7 @@ namespace slideshow::internal maWindowOffset.Y = aRect.Y; } - ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, + ::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds( rNewBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange aRangePix( @@ -422,9 +421,7 @@ namespace slideshow::internal if( pWindow ) { - ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, - rBounds, + ::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds( rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange aRangePix( ::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange )); diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 836e0bd97928..b29afe8e4642 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -248,8 +248,7 @@ namespace slideshow::internal // transformation might result in smaller // overall bounds. - ::basegfx::B2DRectangle aBoundsPixel; - ::canvas::tools::calcTransformedRectBounds( aBoundsPixel, + ::basegfx::B2DRectangle aBoundsPixel = ::canvas::tools::calcTransformedRectBounds( rUntransformedArea, rCanvasTransformation ); @@ -339,11 +338,9 @@ namespace slideshow::internal // char scaling). NOTE: to cancel the shape translation, // contained in rSpriteBoundsPixel, this is _without_ any // translational component. - ::basegfx::B2DRectangle aLogShapeBounds; const ::basegfx::B2DRectangle aNominalShapeBoundsPixel( shapeArea2AreaPixel( aCanvasTransform, ::canvas::tools::calcTransformedRectBounds( - aLogShapeBounds, ::basegfx::B2DRectangle(0.0,0.0,1.0,1.0), aNonTranslationalShapeTransformation ) ) ); @@ -582,8 +579,7 @@ namespace slideshow::internal // area_ in device pixel const ::basegfx::B2DHomMatrix aCanvasTransform( rDestinationCanvas->getTransformation() ); - ::basegfx::B2DRectangle aTmpRect; - ::canvas::tools::calcTransformedRectBounds( aTmpRect, + ::basegfx::B2DRectangle aTmpRect = ::canvas::tools::calcTransformedRectBounds( rUpdateBounds, aCanvasTransform ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 6b7d92e78648..1f5f7dd43c6e 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -72,8 +72,7 @@ basegfx::B2IVector getSlideSizePixel(const basegfx::B2DVector& rSlideSize, { const basegfx::B2DRange aRect(0, 0, rSlideSize.getX(), rSlideSize.getY()); - basegfx::B2DRange aTmpRect; - canvas::tools::calcTransformedRectBounds(aTmpRect, aRect, rTransformation); + basegfx::B2DRange aTmpRect = canvas::tools::calcTransformedRectBounds(aRect, rTransformation); // #i42440# Returned slide size is one pixel too small, as // rendering happens one pixel to the right and below the @@ -209,7 +208,6 @@ private: std::shared_ptr mpMPShapesFunctor; std::shared_ptr mpShapesFunctor; std::unordered_map< BitmapChecksum, BitmapEx > maBitmapMap; - std::vector maJsonMsgList; std::unordered_map maAnimatedShapeVisibilityMap; sal_uInt32 mnMPLayerIndex; @@ -386,7 +384,6 @@ void LOKSlideRenderer::renderBackgroundImpl(VirtualDevice& rDevice) appendImageInfoPlaceholder(aJsonWriter); msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); // clean up rDevice.Erase(); @@ -412,7 +409,6 @@ void LOKSlideRenderer::renderMasterPageImpl(VirtualDevice& rDevice) msLastPlaceholder = ""; msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); ++mnMPLayerIndex; return; } @@ -462,7 +458,6 @@ void LOKSlideRenderer::renderMasterPageImpl(VirtualDevice& rDevice) } bDoRendering = false; msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); ++mnMPLayerIndex; return; } @@ -473,7 +468,6 @@ void LOKSlideRenderer::renderMasterPageImpl(VirtualDevice& rDevice) renderLayerImpl(rDevice, aJsonWriter); } msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); mbMasterPageRenderingDone = true; } @@ -517,7 +511,6 @@ void LOKSlideRenderer::renderTextFieldsImpl(VirtualDevice& rDevice) appendImageInfoPlaceholder(aJsonWriter); } msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); // clean up rDevice.Erase(); @@ -559,7 +552,6 @@ void LOKSlideRenderer::renderDrawPageImpl(VirtualDevice& rDevice) renderAnimatedShapeImpl(rDevice, mpDPLastAnimatedShape, aJsonWriter); mpDPLastAnimatedShape.reset(); msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); ++mnDPLayerIndex; return; } @@ -631,7 +623,6 @@ void LOKSlideRenderer::renderDrawPageImpl(VirtualDevice& rDevice) renderAnimatedShapeImpl(rDevice, pShape, aJsonWriter); } msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); ++mnDPLayerIndex; return; } @@ -642,7 +633,6 @@ void LOKSlideRenderer::renderDrawPageImpl(VirtualDevice& rDevice) renderLayerImpl(rDevice, aJsonWriter); } msLastJsonMessage = aJsonWriter.finishAndGetAsOString(); - maJsonMsgList.push_back(msLastJsonMessage); mbDrawPageRenderingDone = true; } diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index 2752d543e55c..ed3376cf97c8 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include @@ -257,34 +258,8 @@ namespace slideshow::internal // initially. This is currently the only place // where a shape effect influences shape // attributes outside it's effective duration. - bool bVisible( false ); - if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") ) - { - - uno::Any aAny( xAnimateNode->getTo() ); - - // try to extract bool value - if( !(aAny >>= bVisible) ) - { - // try to extract string - OUString aString; - if( aAny >>= aString ) - { - // we also take the strings "true" and "false", - // as well as "on" and "off" here - if( aString.equalsIgnoreAsciiCase("true") || - aString.equalsIgnoreAsciiCase("on") ) - { - bVisible = true; - } - if( aString.equalsIgnoreAsciiCase("false") || - aString.equalsIgnoreAsciiCase("off") ) - { - bVisible = false; - } - } - } - } + bool bVisible = false; + anim::getVisibilityProperty(xAnimateNode, bVisible); // if initial anim sets shape visible, set it // to invisible. If we're asked for the final diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 3e6d0b6ab624..44f7c3a0e4d3 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -213,8 +213,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas, basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const& rLayerBounds, basegfx::B2DHomMatrix const& rTransformation ) { - ::basegfx::B2DRange aTmpRect; - ::canvas::tools::calcTransformedRectBounds( aTmpRect, + ::basegfx::B2DRange aTmpRect = ::canvas::tools::calcTransformedRectBounds( rLayerBounds, rTransformation ); @@ -464,8 +463,7 @@ public: virtual css::geometry::IntegerSize2D getTranslationOffset() const override { - basegfx::B2DRectangle aTmpRect; - canvas::tools::calcTransformedRectBounds( aTmpRect, + basegfx::B2DRectangle aTmpRect = canvas::tools::calcTransformedRectBounds( maLayerBounds, maTransformation ); geometry::IntegerSize2D offset(0, 0); @@ -514,8 +512,7 @@ private: { // Offset given transformation by left, top border of given // range (after transformation through given transformation) - basegfx::B2DRectangle aTmpRect; - canvas::tools::calcTransformedRectBounds( aTmpRect, + basegfx::B2DRectangle aTmpRect = canvas::tools::calcTransformedRectBounds( maLayerBounds, maTransformation ); diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 6f19dad8a405..4e55fe430d5d 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -561,11 +561,8 @@ namespace slideshow::internal aTransform *= rShapeTransform; - ::basegfx::B2DRectangle aRes; - // apply shape transformation to unit rect return ::canvas::tools::calcTransformedRectBounds( - aRes, rUnitBounds, aTransform ); } @@ -764,8 +761,7 @@ namespace slideshow::internal const basegfx::B2DRange aRect( 0,0, rSlideSize.getX(), rSlideSize.getY() ); - basegfx::B2DRange aTmpRect; - canvas::tools::calcTransformedRectBounds( aTmpRect, + basegfx::B2DRange aTmpRect = canvas::tools::calcTransformedRectBounds( aRect, pView->getTransformation() ); diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 40f78cc5547b..9f4fe3c76dac 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -106,6 +106,7 @@ ru \ rw \ sa-IN \ sat \ +sat-Olck \ sd \ sr-Latn \ si \ diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 971c2f3b6fb2..2e48afd10fdf 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -42,9 +42,12 @@ class SmElementsControl SmFormat maFormat; int mnCurrentSetIndex; sal_Int16 m_nSmSyntaxVersion; + bool m_bAllowDelete; + OUString m_sHoveredItem; std::vector> maItemDatas; std::unique_ptr mpIconView; + std::unique_ptr mxPopup; Link maSelectHdlLink; @@ -55,22 +58,27 @@ class SmElementsControl DECL_LINK(QueryTooltipHandler, const weld::TreeIter&, OUString); DECL_LINK(ElementActivatedHandler, weld::IconView&, bool); + DECL_LINK(MousePressHdl, const MouseEvent&, bool); static OUString GetElementSource(const OUString& itemId); static OUString GetElementHelpText(const OUString& itemId); + static int GetElementPos(const OUString& itemId); public: - explicit SmElementsControl(std::unique_ptr pIconView); + explicit SmElementsControl(std::unique_ptr pIconView, + std::unique_ptr pMenu); ~SmElementsControl(); static const std::vector& categories(); - void setElementSetIndex(int nSetIndex); + void setElementSetIndex(int nSetIndex, bool bForceBuild = false); void setSmSyntaxVersion(sal_Int16 nSmSyntaxVersion); void SetSelectHdl(const Link& rLink) { maSelectHdlLink = rLink; } + void SetAllowDelete(bool bAllow) { m_bAllowDelete = bAllow; } + static Color GetTextColor(); static Color GetControlBackground(); }; diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx index 08a6e834f1fd..dbd477de9e7a 100644 --- a/starmath/inc/cfgitem.hxx +++ b/starmath/inc/cfgitem.hxx @@ -100,6 +100,7 @@ class SmMathConfig final : public utl::ConfigItem, public SfxBroadcaster std::unique_ptr pOther; std::unique_ptr pFontFormatList; std::unique_ptr pSymbolMgr; + css::uno::Sequence m_sUserDefinedNames; bool bIsOtherModified; bool bIsFormatModified; SmFontPickList vFontPickList[8]; @@ -169,6 +170,12 @@ public: const SmFormat& GetStandardFormat() const; void SetStandardFormat(const SmFormat& rFormat, bool bSaveFontFormatList = false); + css::uno::Sequence LoadUserDefinedNames(); + void GetUserDefinedFormula(std::u16string_view sName, OUString& sFormula); + bool HasUserDefinedFormula(std::u16string_view sName); + void SaveUserDefinedFormula(std::u16string_view sName, const OUString& sElement); + void DeleteUserDefinedFormula(std::u16string_view sName); + bool IsPrintTitle() const; void SetPrintTitle(bool bVal); bool IsPrintFormulaText() const; diff --git a/starmath/inc/mathml/element.hxx b/starmath/inc/mathml/element.hxx index 030f93d422be..ddd826af3fa6 100644 --- a/starmath/inc/mathml/element.hxx +++ b/starmath/inc/mathml/element.hxx @@ -129,14 +129,14 @@ public: // location in the source * It is used to do the visual <-> text correspondence. * @return line */ - sal_Int32 GetSourceCodeRow() const { return m_aESelection.nStartPara; } + sal_Int32 GetSourceCodeRow() const { return m_aESelection.start.nPara; } /** * Gets the column of the line in the text where the node is located. * It is used to do the visual <-> text correspondence. * @return column */ - sal_Int32 GetSourceCodeColumn() const { return m_aESelection.nStartPos; } + sal_Int32 GetSourceCodeColumn() const { return m_aESelection.start.nIndex; } public: // attributes /** diff --git a/starmath/inc/mathml/starmathdatabase.hxx b/starmath/inc/mathml/starmathdatabase.hxx index 3af9b009b5d0..65d7d3394535 100644 --- a/starmath/inc/mathml/starmathdatabase.hxx +++ b/starmath/inc/mathml/starmathdatabase.hxx @@ -28,173 +28,173 @@ // HTML // https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#Color_Keywords /* CSS Level 1 */ -constexpr Color COL_SM_BLACK(0x000000); -constexpr Color COL_SM_SILVER(0xC0C0C0); -constexpr Color COL_SM_GRAY(0x808080); -constexpr Color COL_SM_WHITE(0xFFFFFF); -constexpr Color COL_SM_MAROON(0x800000); -constexpr Color COL_SM_RED(0xFF0000); -constexpr Color COL_SM_PURPLE(0x800080); -constexpr Color COL_SM_FUCHSIA(0xFF00FF); -constexpr Color COL_SM_GREEN(0x008000); -constexpr Color COL_SM_LIME(0x00FF00); -constexpr Color COL_SM_OLIVE(0x808000); -constexpr Color COL_SM_YELLOW(0xFFFF00); -constexpr Color COL_SM_NAVY(0x000080); -constexpr Color COL_SM_BLUE(0x0000FF); -constexpr Color COL_SM_TEAL(0x008080); -constexpr Color COL_SM_AQUA(0x00FFFF); +inline constexpr Color COL_SM_BLACK(0x000000); +inline constexpr Color COL_SM_SILVER(0xC0C0C0); +inline constexpr Color COL_SM_GRAY(0x808080); +inline constexpr Color COL_SM_WHITE(0xFFFFFF); +inline constexpr Color COL_SM_MAROON(0x800000); +inline constexpr Color COL_SM_RED(0xFF0000); +inline constexpr Color COL_SM_PURPLE(0x800080); +inline constexpr Color COL_SM_FUCHSIA(0xFF00FF); +inline constexpr Color COL_SM_GREEN(0x008000); +inline constexpr Color COL_SM_LIME(0x00FF00); +inline constexpr Color COL_SM_OLIVE(0x808000); +inline constexpr Color COL_SM_YELLOW(0xFFFF00); +inline constexpr Color COL_SM_NAVY(0x000080); +inline constexpr Color COL_SM_BLUE(0x0000FF); +inline constexpr Color COL_SM_TEAL(0x008080); +inline constexpr Color COL_SM_AQUA(0x00FFFF); /* CSS Level 2 */ -constexpr Color COL_SM_ORANGE(0xFFA500); +inline constexpr Color COL_SM_ORANGE(0xFFA500); /* CSS Level 3 */ -constexpr Color COL_SM_ALICEBLUE(0xF0F8FF); -constexpr Color COL_SM_ANTIQUEWHITE(0xFAEBD7); -constexpr Color COL_SM_AQUAMARINE(0x7FFFD4); -constexpr Color COL_SM_AZURE(0xF0FFFF); -constexpr Color COL_SM_BEIGE(0xF5F5DC); -constexpr Color COL_SM_BISQUE(0xFFE4C4); -constexpr Color COL_SM_BLANCHEDALMOND(0xFFEBCD); -constexpr Color COL_SM_BLUEVIOLET(0x8A2BE2); -constexpr Color COL_SM_BROWN(0xA52A2A); -constexpr Color COL_SM_BURLYWOOD(0xDEB887); -constexpr Color COL_SM_CADETBLUE(0x5F9EA0); -constexpr Color COL_SM_CHARTREUSE(0x7FFF00); -constexpr Color COL_SM_CHOCOLATE(0xD2691E); -constexpr Color COL_SM_CORAL(0xFF7F50); -constexpr Color COL_SM_CORNFLOWERBLUE(0x6495ED); -constexpr Color COL_SM_CORNSILK(0xFFF8DC); -constexpr Color COL_SM_CRIMSON(0xDC143C); -constexpr Color COL_SM_CYAN(0x00FFFF); -constexpr Color COL_SM_DARKBLUE(0x00008B); -constexpr Color COL_SM_DARKCYAN(0x008B8B); -constexpr Color COL_SM_DARKGOLDENROD(0xB8860B); -constexpr Color COL_SM_DARKGRAY(0xA9A9A9); -constexpr Color COL_SM_DARKGREEN(0x006400); -constexpr Color COL_SM_DARKGREY(0xA9A9A9); -constexpr Color COL_SM_DARKKHAKI(0xBDB76B); -constexpr Color COL_SM_DARKMAGENTA(0x8B008B); -constexpr Color COL_SM_DARKOLIVEGREEN(0x556B2F); -constexpr Color COL_SM_DARKORANGE(0xFF8C00); -constexpr Color COL_SM_DARKORCHID(0x9932CC); -constexpr Color COL_SM_DARKRED(0x8B0000); -constexpr Color COL_SM_DARKSALMON(0xE9967A); -constexpr Color COL_SM_DARKSEAGREEN(0x8FBC8F); -constexpr Color COL_SM_DARKSLATEBLUE(0x483D8B); -constexpr Color COL_SM_DARKSLATEGRAY(0x2F4F4F); -constexpr Color COL_SM_DARKSLATEGREY(0x2F4F4F); -constexpr Color COL_SM_DARKTURQUOISE(0x00CED1); -constexpr Color COL_SM_DARKVIOLET(0x9400D3); -constexpr Color COL_SM_DEEPPINK(0xFF1493); -constexpr Color COL_SM_DEEPSKYBLUE(0x00BFFF); -constexpr Color COL_SM_DIMGRAY(0x696969); -constexpr Color COL_SM_DIMGREY(0x696969); -constexpr Color COL_SM_DODGERBLUE(0x1E90FF); -constexpr Color COL_SM_FIREBRICK(0xB22222); -constexpr Color COL_SM_FLORALWHITE(0xFFFAF0); -constexpr Color COL_SM_FORESTGREEN(0x228B22); -constexpr Color COL_SM_GAINSBORO(0xDCDCDC); -constexpr Color COL_SM_GHOSTWHITE(0xF8F8FF); -constexpr Color COL_SM_GOLD(0xFFD700); -constexpr Color COL_SM_GOLDENROD(0xDAA520); -constexpr Color COL_SM_GREENYELLOW(0xADFF2F); -constexpr Color COL_SM_GREY(0x808080); -constexpr Color COL_SM_HONEYDEW(0xF0FFF0); -constexpr Color COL_SM_HOTPINK(0xFF69B4); -constexpr Color COL_SM_INDIANRED(0xCD5C5C); -constexpr Color COL_SM_INDIGO(0x4B0082); -constexpr Color COL_SM_IVORY(0xFFFFF0); -constexpr Color COL_SM_KHAKI(0xF0E68C); -constexpr Color COL_SM_LAVENDER(0xE6E6FA); -constexpr Color COL_SM_LAVENDERBLUSH(0xFFF0F5); -constexpr Color COL_SM_LAWNGREEN(0x7CFC00); -constexpr Color COL_SM_LEMONCHIFFON(0xFFFACD); -constexpr Color COL_SM_LIGHTBLUE(0xADD8E6); -constexpr Color COL_SM_LIGHTCORAL(0xF08080); -constexpr Color COL_SM_LIGHTCYAN(0xE0FFFF); -constexpr Color COL_SM_LIGHTGOLDENRODYELLOW(0xFAFAD2); -constexpr Color COL_SM_LIGHTGRAY(0xD3D3D3); -constexpr Color COL_SM_LIGHTGREEN(0x90EE90); -constexpr Color COL_SM_LIGHTGREY(0xD3D3D3); -constexpr Color COL_SM_LIGHTPINK(0xFFB6C1); -constexpr Color COL_SM_LIGHTSALMON(0xFFA07A); -constexpr Color COL_SM_LIGHTSEAGREEN(0x20B2AA); -constexpr Color COL_SM_LIGHTSKYBLUE(0x87CEFA); -constexpr Color COL_SM_LIGHTSLATEGRAY(0x778899); -constexpr Color COL_SM_LIGHTSLATEGREY(0x778899); -constexpr Color COL_SM_LIGHTSTEELBLUE(0xB0C4DE); -constexpr Color COL_SM_LIGHTYELLOW(0xFFFFE0); -constexpr Color COL_SM_LIMEGREEN(0x32CD32); -constexpr Color COL_SM_LINEN(0xFAF0E6); -constexpr Color COL_SM_MAGENTA(0xFF00FF); -constexpr Color COL_SM_MEDIUMAQUAMARINE(0x66CDAA); -constexpr Color COL_SM_MEDIUMBLUE(0x0000CD); -constexpr Color COL_SM_MEDIUMORCHID(0xBA55D3); -constexpr Color COL_SM_MEDIUMPURPLE(0x9370DB); -constexpr Color COL_SM_MEDIUMSEAGREEN(0x3CB371); -constexpr Color COL_SM_MEDIUMSLATEBLUE(0x7B68EE); -constexpr Color COL_SM_MEDIUMSPRINGGREEN(0x00FA9A); -constexpr Color COL_SM_MEDIUMTURQUOISE(0x48D1CC); -constexpr Color COL_SM_MEDIUMVIOLETRED(0xC71585); -constexpr Color COL_SM_MIDNIGHTBLUE(0x191970); -constexpr Color COL_SM_MINTCREAM(0xF5FFFA); -constexpr Color COL_SM_MISTYROSE(0xFFE4E1); -constexpr Color COL_SM_MOCCASIN(0xFFE4B5); -constexpr Color COL_SM_NAVAJOWHITE(0xFFDEAD); -constexpr Color COL_SM_OLDLACE(0xFDF5E6); -constexpr Color COL_SM_OLIVEDRAB(0x6B8E23); -constexpr Color COL_SM_ORANGERED(0xFF4500); -constexpr Color COL_SM_ORCHID(0xDA70D6); -constexpr Color COL_SM_PALEGOLDENROD(0xEEE8AA); -constexpr Color COL_SM_PALEGREEN(0x98FB98); -constexpr Color COL_SM_PALETURQUOISE(0xAFEEEE); -constexpr Color COL_SM_PALEVIOLETRED(0xDB7093); -constexpr Color COL_SM_PAPAYAWHIP(0xFFEFD5); -constexpr Color COL_SM_PEACHPUFF(0xFFDAB9); -constexpr Color COL_SM_PERU(0xCD853F); -constexpr Color COL_SM_PINK(0xFFC0CB); -constexpr Color COL_SM_PLUM(0xDDA0DD); -constexpr Color COL_SM_POWDERBLUE(0xB0E0E6); -constexpr Color COL_SM_ROSYBROWN(0xBC8F8F); -constexpr Color COL_SM_ROYALBLUE(0x4169E1); -constexpr Color COL_SM_SADDLEBROWN(0x8B4513); -constexpr Color COL_SM_SALMON(0xFA8072); -constexpr Color COL_SM_SANDYBROWN(0xF4A460); -constexpr Color COL_SM_SEAGREEN(0x2E8B57); -constexpr Color COL_SM_SEASHELL(0xFFF5EE); -constexpr Color COL_SM_SIENNA(0xA0522D); -constexpr Color COL_SM_SKYBLUE(0x87CEEB); -constexpr Color COL_SM_SLATEBLUE(0x6A5ACD); -constexpr Color COL_SM_SLATEGRAY(0x708090); -constexpr Color COL_SM_SLATEGREY(0x708090); -constexpr Color COL_SM_SNOW(0xFFFAFA); -constexpr Color COL_SM_SPRINGGREEN(0x00FF7F); -constexpr Color COL_SM_STEELBLUE(0x4682B4); -constexpr Color COL_SM_TAN(0xD2B48C); -constexpr Color COL_SM_THISTLE(0xD8BFD8); -constexpr Color COL_SM_TOMATO(0xFF6347); -constexpr Color COL_SM_TURQUOISE(0x40E0D0); -constexpr Color COL_SM_VIOLET(0xEE82EE); -constexpr Color COL_SM_WHEAT(0xF5DEB3); -constexpr Color COL_SM_WHITESMOKE(0xF5F5F5); -constexpr Color COL_SM_YELLOWGREEN(0x9ACD32); +inline constexpr Color COL_SM_ALICEBLUE(0xF0F8FF); +inline constexpr Color COL_SM_ANTIQUEWHITE(0xFAEBD7); +inline constexpr Color COL_SM_AQUAMARINE(0x7FFFD4); +inline constexpr Color COL_SM_AZURE(0xF0FFFF); +inline constexpr Color COL_SM_BEIGE(0xF5F5DC); +inline constexpr Color COL_SM_BISQUE(0xFFE4C4); +inline constexpr Color COL_SM_BLANCHEDALMOND(0xFFEBCD); +inline constexpr Color COL_SM_BLUEVIOLET(0x8A2BE2); +inline constexpr Color COL_SM_BROWN(0xA52A2A); +inline constexpr Color COL_SM_BURLYWOOD(0xDEB887); +inline constexpr Color COL_SM_CADETBLUE(0x5F9EA0); +inline constexpr Color COL_SM_CHARTREUSE(0x7FFF00); +inline constexpr Color COL_SM_CHOCOLATE(0xD2691E); +inline constexpr Color COL_SM_CORAL(0xFF7F50); +inline constexpr Color COL_SM_CORNFLOWERBLUE(0x6495ED); +inline constexpr Color COL_SM_CORNSILK(0xFFF8DC); +inline constexpr Color COL_SM_CRIMSON(0xDC143C); +inline constexpr Color COL_SM_CYAN(0x00FFFF); +inline constexpr Color COL_SM_DARKBLUE(0x00008B); +inline constexpr Color COL_SM_DARKCYAN(0x008B8B); +inline constexpr Color COL_SM_DARKGOLDENROD(0xB8860B); +inline constexpr Color COL_SM_DARKGRAY(0xA9A9A9); +inline constexpr Color COL_SM_DARKGREEN(0x006400); +inline constexpr Color COL_SM_DARKGREY(0xA9A9A9); +inline constexpr Color COL_SM_DARKKHAKI(0xBDB76B); +inline constexpr Color COL_SM_DARKMAGENTA(0x8B008B); +inline constexpr Color COL_SM_DARKOLIVEGREEN(0x556B2F); +inline constexpr Color COL_SM_DARKORANGE(0xFF8C00); +inline constexpr Color COL_SM_DARKORCHID(0x9932CC); +inline constexpr Color COL_SM_DARKRED(0x8B0000); +inline constexpr Color COL_SM_DARKSALMON(0xE9967A); +inline constexpr Color COL_SM_DARKSEAGREEN(0x8FBC8F); +inline constexpr Color COL_SM_DARKSLATEBLUE(0x483D8B); +inline constexpr Color COL_SM_DARKSLATEGRAY(0x2F4F4F); +inline constexpr Color COL_SM_DARKSLATEGREY(0x2F4F4F); +inline constexpr Color COL_SM_DARKTURQUOISE(0x00CED1); +inline constexpr Color COL_SM_DARKVIOLET(0x9400D3); +inline constexpr Color COL_SM_DEEPPINK(0xFF1493); +inline constexpr Color COL_SM_DEEPSKYBLUE(0x00BFFF); +inline constexpr Color COL_SM_DIMGRAY(0x696969); +inline constexpr Color COL_SM_DIMGREY(0x696969); +inline constexpr Color COL_SM_DODGERBLUE(0x1E90FF); +inline constexpr Color COL_SM_FIREBRICK(0xB22222); +inline constexpr Color COL_SM_FLORALWHITE(0xFFFAF0); +inline constexpr Color COL_SM_FORESTGREEN(0x228B22); +inline constexpr Color COL_SM_GAINSBORO(0xDCDCDC); +inline constexpr Color COL_SM_GHOSTWHITE(0xF8F8FF); +inline constexpr Color COL_SM_GOLD(0xFFD700); +inline constexpr Color COL_SM_GOLDENROD(0xDAA520); +inline constexpr Color COL_SM_GREENYELLOW(0xADFF2F); +inline constexpr Color COL_SM_GREY(0x808080); +inline constexpr Color COL_SM_HONEYDEW(0xF0FFF0); +inline constexpr Color COL_SM_HOTPINK(0xFF69B4); +inline constexpr Color COL_SM_INDIANRED(0xCD5C5C); +inline constexpr Color COL_SM_INDIGO(0x4B0082); +inline constexpr Color COL_SM_IVORY(0xFFFFF0); +inline constexpr Color COL_SM_KHAKI(0xF0E68C); +inline constexpr Color COL_SM_LAVENDER(0xE6E6FA); +inline constexpr Color COL_SM_LAVENDERBLUSH(0xFFF0F5); +inline constexpr Color COL_SM_LAWNGREEN(0x7CFC00); +inline constexpr Color COL_SM_LEMONCHIFFON(0xFFFACD); +inline constexpr Color COL_SM_LIGHTBLUE(0xADD8E6); +inline constexpr Color COL_SM_LIGHTCORAL(0xF08080); +inline constexpr Color COL_SM_LIGHTCYAN(0xE0FFFF); +inline constexpr Color COL_SM_LIGHTGOLDENRODYELLOW(0xFAFAD2); +inline constexpr Color COL_SM_LIGHTGRAY(0xD3D3D3); +inline constexpr Color COL_SM_LIGHTGREEN(0x90EE90); +inline constexpr Color COL_SM_LIGHTGREY(0xD3D3D3); +inline constexpr Color COL_SM_LIGHTPINK(0xFFB6C1); +inline constexpr Color COL_SM_LIGHTSALMON(0xFFA07A); +inline constexpr Color COL_SM_LIGHTSEAGREEN(0x20B2AA); +inline constexpr Color COL_SM_LIGHTSKYBLUE(0x87CEFA); +inline constexpr Color COL_SM_LIGHTSLATEGRAY(0x778899); +inline constexpr Color COL_SM_LIGHTSLATEGREY(0x778899); +inline constexpr Color COL_SM_LIGHTSTEELBLUE(0xB0C4DE); +inline constexpr Color COL_SM_LIGHTYELLOW(0xFFFFE0); +inline constexpr Color COL_SM_LIMEGREEN(0x32CD32); +inline constexpr Color COL_SM_LINEN(0xFAF0E6); +inline constexpr Color COL_SM_MAGENTA(0xFF00FF); +inline constexpr Color COL_SM_MEDIUMAQUAMARINE(0x66CDAA); +inline constexpr Color COL_SM_MEDIUMBLUE(0x0000CD); +inline constexpr Color COL_SM_MEDIUMORCHID(0xBA55D3); +inline constexpr Color COL_SM_MEDIUMPURPLE(0x9370DB); +inline constexpr Color COL_SM_MEDIUMSEAGREEN(0x3CB371); +inline constexpr Color COL_SM_MEDIUMSLATEBLUE(0x7B68EE); +inline constexpr Color COL_SM_MEDIUMSPRINGGREEN(0x00FA9A); +inline constexpr Color COL_SM_MEDIUMTURQUOISE(0x48D1CC); +inline constexpr Color COL_SM_MEDIUMVIOLETRED(0xC71585); +inline constexpr Color COL_SM_MIDNIGHTBLUE(0x191970); +inline constexpr Color COL_SM_MINTCREAM(0xF5FFFA); +inline constexpr Color COL_SM_MISTYROSE(0xFFE4E1); +inline constexpr Color COL_SM_MOCCASIN(0xFFE4B5); +inline constexpr Color COL_SM_NAVAJOWHITE(0xFFDEAD); +inline constexpr Color COL_SM_OLDLACE(0xFDF5E6); +inline constexpr Color COL_SM_OLIVEDRAB(0x6B8E23); +inline constexpr Color COL_SM_ORANGERED(0xFF4500); +inline constexpr Color COL_SM_ORCHID(0xDA70D6); +inline constexpr Color COL_SM_PALEGOLDENROD(0xEEE8AA); +inline constexpr Color COL_SM_PALEGREEN(0x98FB98); +inline constexpr Color COL_SM_PALETURQUOISE(0xAFEEEE); +inline constexpr Color COL_SM_PALEVIOLETRED(0xDB7093); +inline constexpr Color COL_SM_PAPAYAWHIP(0xFFEFD5); +inline constexpr Color COL_SM_PEACHPUFF(0xFFDAB9); +inline constexpr Color COL_SM_PERU(0xCD853F); +inline constexpr Color COL_SM_PINK(0xFFC0CB); +inline constexpr Color COL_SM_PLUM(0xDDA0DD); +inline constexpr Color COL_SM_POWDERBLUE(0xB0E0E6); +inline constexpr Color COL_SM_ROSYBROWN(0xBC8F8F); +inline constexpr Color COL_SM_ROYALBLUE(0x4169E1); +inline constexpr Color COL_SM_SADDLEBROWN(0x8B4513); +inline constexpr Color COL_SM_SALMON(0xFA8072); +inline constexpr Color COL_SM_SANDYBROWN(0xF4A460); +inline constexpr Color COL_SM_SEAGREEN(0x2E8B57); +inline constexpr Color COL_SM_SEASHELL(0xFFF5EE); +inline constexpr Color COL_SM_SIENNA(0xA0522D); +inline constexpr Color COL_SM_SKYBLUE(0x87CEEB); +inline constexpr Color COL_SM_SLATEBLUE(0x6A5ACD); +inline constexpr Color COL_SM_SLATEGRAY(0x708090); +inline constexpr Color COL_SM_SLATEGREY(0x708090); +inline constexpr Color COL_SM_SNOW(0xFFFAFA); +inline constexpr Color COL_SM_SPRINGGREEN(0x00FF7F); +inline constexpr Color COL_SM_STEELBLUE(0x4682B4); +inline constexpr Color COL_SM_TAN(0xD2B48C); +inline constexpr Color COL_SM_THISTLE(0xD8BFD8); +inline constexpr Color COL_SM_TOMATO(0xFF6347); +inline constexpr Color COL_SM_TURQUOISE(0x40E0D0); +inline constexpr Color COL_SM_VIOLET(0xEE82EE); +inline constexpr Color COL_SM_WHEAT(0xF5DEB3); +inline constexpr Color COL_SM_WHITESMOKE(0xF5F5F5); +inline constexpr Color COL_SM_YELLOWGREEN(0x9ACD32); /* CSS Level 4 */ -constexpr Color COL_SM_REBECCAPURPLE(0x663399); +inline constexpr Color COL_SM_REBECCAPURPLE(0x663399); /* dvipsnames */ // For now only five colors. // In a future all of them. // https://www.overleaf.com/learn/latex/Using_colours_in_LaTeX -constexpr Color COL_SM_DIV_APRICOT(0xFFB781); -constexpr Color COL_SM_DIV_AQUAMARINE(0x1BBEC1); -constexpr Color COL_SM_DIV_BITTERSWEET(0xCF4B16); -constexpr Color COL_SM_DIV_BLACK(0xCF4B16); -constexpr Color COL_SM_DIV_BLUE(0x102694); +inline constexpr Color COL_SM_DIV_APRICOT(0xFFB781); +inline constexpr Color COL_SM_DIV_AQUAMARINE(0x1BBEC1); +inline constexpr Color COL_SM_DIV_BITTERSWEET(0xCF4B16); +inline constexpr Color COL_SM_DIV_BLACK(0xCF4B16); +inline constexpr Color COL_SM_DIV_BLUE(0x102694); /* Iconic colors */ // https://design.ubuntu.com/brand/colour-palette/ -constexpr Color COL_SM_UBUNTU_ORANGE(0xE95420); +inline constexpr Color COL_SM_UBUNTU_ORANGE(0xE95420); // https://www.debian.org/logos/ Picked from SVG logo -constexpr Color COL_SM_DEBIAN_MAGENTA(0xA80030); +inline constexpr Color COL_SM_DEBIAN_MAGENTA(0xA80030); // https://libreoffice.org/ -constexpr Color COL_SM_LO_GREEN(0x00A500); +inline constexpr Color COL_SM_LO_GREEN(0x00A500); namespace starmathdatabase { diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 778c11c2a968..50a85dc4f508 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -346,14 +346,14 @@ public: * It is used to do the visual <-> text correspondence. * @return line */ - sal_uInt16 GetRow() const { return sal::static_int_cast(m_aESelection.nStartPara); } + sal_Int32 GetRow() const { return m_aESelection.start.nPara; } /** * Gets the column of the line in the text where the node is located. * It is used to do the visual <-> text correspondence. * @return column */ - sal_uInt16 GetColumn() const { return sal::static_int_cast(m_aESelection.nStartPos); } + sal_Int32 GetColumn() const { return m_aESelection.start.nIndex; } /** * Gets the scale mode. diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 1127e6660cbd..468fd444cbfa 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -74,5 +74,6 @@ class SfxUInt16Item; #define SID_SMEDITWINDOWZOOM TypedWhichId(SID_SMA_START + 129) #define SID_DEFAULT_SM_SYNTAX_VERSION TypedWhichId(SID_SMA_START + 130) #define SID_INLINE_EDIT_ENABLE TypedWhichId(SID_SMA_START + 131) +#define SID_SAVE_FORMULA (SID_SMA_START + 132) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc index 4afb0d2598e6..8f891439e5ab 100644 --- a/starmath/inc/strings.hrc +++ b/starmath/inc/strings.hrc @@ -324,6 +324,7 @@ #define RID_CATEGORY_FORMATS NC_("RID_CATEGORY_FORMATS", "Formats" ) #define RID_CATEGORY_OTHERS NC_("RID_CATEGORY_OTHERS", "Others" ) #define RID_CATEGORY_EXAMPLES NC_("RID_CATEGORY_EXAMPLES", "Examples" ) +#define RID_CATEGORY_USERDEFINED NC_("RID_CATEGORY_USERDEFINED", "User-defined" ) #define RID_EXAMPLE_CIRCUMFERENCE_HELP NC_("RID_EXAMPLE_CIRCUMFERENCE_HELP", "Circumference" ) #define RID_EXAMPLE_MASS_ENERGY_EQUIV_HELP NC_("RID_EXAMPLE_MASS_ENERGY_EQUIV_HELP", "Mass–energy equivalence" ) @@ -406,6 +407,8 @@ #define RID_PRINTUIOPT_ORIGSIZE NC_("RID_PRINTUIOPT_ORIGSIZE", "O~riginal size" ) #define RID_PRINTUIOPT_FITTOPAGE NC_("RID_PRINTUIOPT_FITTOPAGE", "Fit to ~page" ) #define RID_PRINTUIOPT_SCALING NC_("RID_PRINTUIOPT_SCALING", "~Scaling" ) +#define STR_USER_DEFINED_FORMULA NC_("STR_USER_DEFINED_FORMULA", "Save formula as:" ) +#define STR_USER_DEFINED_FORMULA_EXISTS NC_("STR_USER_DEFINED_FORMULA_EXISTS", "The Formula %1 exists.\nDo you want to overwrite?" ) // clang-format on /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 8dd6bc0b22ba..e5d6f150ec28 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -200,10 +200,10 @@ void Test::editMarker() // should be safe i.e. do nothing rEditWindow.SelNextMark(); aSelection = rEditWindow.GetSelection(); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(19), aSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(19), aSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(19), aSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(19), aSelection.end.nIndex); rEditWindow.SelPrevMark(); rEditWindow.Delete(); @@ -212,10 +212,10 @@ void Test::editMarker() // tdf#106116: should be safe i.e. do nothing rEditWindow.SelPrevMark(); aSelection = rEditWindow.GetSelection(); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.nStartPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aSelection.nStartPos); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.nEndPara); - CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aSelection.nEndPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.start.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aSelection.start.nIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.end.nPara); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aSelection.end.nIndex); rEditWindow.Flush(); OUString sFinalText = rEditWindow.GetText(); diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi index 48045629ecd7..f1578010d0a1 100644 --- a/starmath/sdi/smath.sdi +++ b/starmath/sdi/smath.sdi @@ -562,3 +562,20 @@ SfxVoidItem ZoomOut SID_ZOOMOUT ToolBoxConfig = TRUE, GroupId = SfxGroupId::View; ] + +SfxVoidItem SaveFormula SID_SAVE_FORMULA +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::View; +] \ No newline at end of file diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 2cf17fa342f4..0c3db53704ea 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -297,6 +297,11 @@ interface FormulaView ExecMethod = Execute ; StateMethod = GetState ; ] + SID_SAVE_FORMULA + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] } shell SmViewShell diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 351e4773b6bc..f202d1bd74e0 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -460,6 +460,7 @@ const std::vector s_a5Categories{ RID_CATEGORY_FORMATS, RID_CATEGORY_OTHERS, RID_CATEGORY_EXAMPLES, + RID_CATEGORY_USERDEFINED, }; template @@ -493,24 +494,30 @@ struct ElementData { OUString maElementSource; OUString maHelpText; - ElementData(const OUString& aElementSource, const OUString& aHelpText) + int maPos; + ElementData(const OUString& aElementSource, const OUString& aHelpText, const int& aPos) : maElementSource(aElementSource) , maHelpText(aHelpText) + , maPos(aPos) { } }; -SmElementsControl::SmElementsControl(std::unique_ptr pIconView) +SmElementsControl::SmElementsControl(std::unique_ptr pIconView, + std::unique_ptr pMenu) : mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT)) , mnCurrentSetIndex(-1) , m_nSmSyntaxVersion(SmModule::get()->GetConfig()->GetDefaultSmSyntaxVersion()) + , m_bAllowDelete(false) , mpIconView(std::move(pIconView)) + , mxPopup(std::move(pMenu)) { maParser.reset(starmathdatabase::GetVersionSmParser(m_nSmSyntaxVersion)); maParser->SetImportSymbolNames(true); mpIconView->connect_query_tooltip(LINK(this, SmElementsControl, QueryTooltipHandler)); mpIconView->connect_item_activated(LINK(this, SmElementsControl, ElementActivatedHandler)); + mpIconView->connect_mouse_press(LINK(this, SmElementsControl, MousePressHdl)); } SmElementsControl::~SmElementsControl() @@ -585,7 +592,7 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin pDevice->SetOutputSizePixel(aSize); SmDrawingVisitor(*pDevice, pDevice->PixelToLogic(Point(5, 0)), pNode.get(), maFormat); - maItemDatas.push_back(std::make_unique(aElementSource, aHelpText)); + maItemDatas.push_back(std::make_unique(aElementSource, aHelpText, maItemDatas.size())); const OUString aId(weld::toId(maItemDatas.back().get())); mpIconView->insert(-1, nullptr, &aId, pDevice, nullptr); if (mpIconView->get_item_width() < aSize.Width()) @@ -602,9 +609,14 @@ OUString SmElementsControl::GetElementHelpText(const OUString& itemId) return weld::fromId(itemId)->maHelpText; } -void SmElementsControl::setElementSetIndex(int nSetIndex) +int SmElementsControl::GetElementPos(const OUString& itemId) { - if (mnCurrentSetIndex == nSetIndex) + return weld::fromId(itemId)->maPos; +} + +void SmElementsControl::setElementSetIndex(int nSetIndex, bool bForceBuild) +{ + if (!bForceBuild && mnCurrentSetIndex == nSetIndex) return; mnCurrentSetIndex = nSetIndex; build(); @@ -617,25 +629,36 @@ void SmElementsControl::addElements(int nCategory) mpIconView->set_item_width(0); maItemDatas.clear(); - assert(nCategory >= 0 && o3tl::make_unsigned(nCategory) < s_a5CategoryDescriptions.size()); - - const auto& [aElementsArray, aElementsArraySize] = s_a5CategoryDescriptions[nCategory]; - - for (size_t i = 0; i < aElementsArraySize; i++) + if (o3tl::make_unsigned(nCategory) < s_a5CategoryDescriptions.size()) { - const auto& [element, elementHelp, elementVisual, visualTranslatable] = aElementsArray[i]; - if (element.empty()) + const auto& [aElementsArray, aElementsArraySize] = s_a5CategoryDescriptions[nCategory]; + + for (size_t i = 0; i < aElementsArraySize; i++) { - mpIconView->append_separator({}); + const auto& [element, elementHelp, elementVisual, visualTranslatable] = aElementsArray[i]; + if (element.empty()) + { + mpIconView->append_separator({}); + } + else + { + OUString aElement(element); + OUString aVisual(elementVisual.empty() ? aElement : OUString(elementVisual)); + if (visualTranslatable) + aVisual = aVisual.replaceFirst("$1", SmResId(visualTranslatable)); + OUString aHelp(elementHelp ? SmResId(elementHelp) : OUString()); + addElement(aVisual, aElement, aHelp); + } } - else + } + else + { + css::uno::Sequence sNames = SmModule::get()->GetConfig()->LoadUserDefinedNames(); + OUString sFormula; + for (int i = 0; i < sNames.getLength(); i++) { - OUString aElement(element); - OUString aVisual(elementVisual.empty() ? aElement : OUString(elementVisual)); - if (visualTranslatable) - aVisual = aVisual.replaceFirst("$1", SmResId(visualTranslatable)); - OUString aHelp(elementHelp ? SmResId(elementHelp) : OUString()); - addElement(aVisual, aElement, aHelp); + SmModule::get()->GetConfig()->GetUserDefinedFormula(sNames[i], sFormula); + addElement(sFormula, sFormula, sNames[i]); } } @@ -649,6 +672,7 @@ void SmElementsControl::build() { case 5: addElements(mnCurrentSetIndex); + m_sHoveredItem = "nil"; // if list is empty we must not use the previously hovered item break; case 6: default: @@ -671,7 +695,10 @@ void SmElementsControl::setSmSyntaxVersion(sal_Int16 nSmSyntaxVersion) IMPL_LINK(SmElementsControl, QueryTooltipHandler, const weld::TreeIter&, iter, OUString) { if (const OUString id = mpIconView->get_id(iter); !id.isEmpty()) + { + m_sHoveredItem = id; return GetElementHelpText(id); + } return {}; } @@ -684,4 +711,24 @@ IMPL_LINK_NOARG(SmElementsControl, ElementActivatedHandler, weld::IconView&, boo return true; } +IMPL_LINK(SmElementsControl, MousePressHdl, const MouseEvent&, rEvt, bool) +{ + if (rEvt.IsRight() && m_bAllowDelete && (m_sHoveredItem != "nil")) + { + mpIconView->select( GetElementPos(m_sHoveredItem) ); + OUString sElementId = mpIconView->get_selected_id(); + if (!sElementId.isEmpty()) + { + OUString sResponse = mxPopup->popup_at_rect( + mpIconView.get(), tools::Rectangle(rEvt.GetPosPixel(), Size(1, 1))); + if (sResponse == "delete") + { + SmModule::get()->GetConfig()->DeleteUserDefinedFormula( GetElementHelpText(m_sHoveredItem) ); + build(); //refresh view + } + mpIconView->unselect_all(); + } + } + return true; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/SmElementsPanel.cxx b/starmath/source/SmElementsPanel.cxx index ad0fb7089890..afe27a80fc50 100644 --- a/starmath/source/SmElementsPanel.cxx +++ b/starmath/source/SmElementsPanel.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include "SmElementsPanel.hxx" #include @@ -45,8 +46,8 @@ SmElementsPanel::SmElementsPanel(weld::Widget& rParent, const SfxBindings& rBind u"modules/smath/ui/sidebarelements_math.ui"_ustr) , mrBindings(rBindings) , mxCategoryList(m_xBuilder->weld_combo_box(u"categorylist"_ustr)) - , mxElementsControl( - std::make_unique(m_xBuilder->weld_icon_view(u"elements"_ustr))) + , mxElementsControl(std::make_unique( + m_xBuilder->weld_icon_view(u"elements"_ustr), m_xBuilder->weld_menu("deletemenu"))) { for (const auto& rCategoryId : SmElementsControl::categories()) mxCategoryList->append_text(SmResId(rCategoryId)); @@ -58,6 +59,8 @@ SmElementsPanel::SmElementsPanel(weld::Widget& rParent, const SfxBindings& rBind mxElementsControl->setElementSetIndex(0); mxElementsControl->SetSelectHdl(LINK(this, SmElementsPanel, ElementClickHandler)); + + StartListening(*GetView()); } SmElementsPanel::~SmElementsPanel() @@ -66,6 +69,15 @@ SmElementsPanel::~SmElementsPanel() mxCategoryList.reset(); } +void SmElementsPanel::Notify(SfxBroadcaster&, const SfxHint& rHint) +{ + if (rHint.GetId() == SfxHintId::SmNewUserFormula) + { + mxCategoryList->set_active_text(SmResId(RID_CATEGORY_USERDEFINED)); + mxElementsControl->setElementSetIndex(mxCategoryList->get_active(), true); + } +} + IMPL_LINK(SmElementsPanel, CategorySelectedHandle, weld::ComboBox&, rList, void) { const int nActive = rList.get_active(); @@ -74,6 +86,12 @@ IMPL_LINK(SmElementsPanel, CategorySelectedHandle, weld::ComboBox&, rList, void) mxElementsControl->setElementSetIndex(nActive); if (SmViewShell* pViewSh = GetView()) mxElementsControl->setSmSyntaxVersion(pViewSh->GetDoc()->GetSmSyntaxVersion()); + + // If the "User-defined" category is selected, allow deletion + if (mxCategoryList->get_active_text() == SmResId(RID_CATEGORY_USERDEFINED)) + mxElementsControl->SetAllowDelete(true); + else + mxElementsControl->SetAllowDelete(false); } IMPL_LINK(SmElementsPanel, ElementClickHandler, const OUString&, ElementSource, void) diff --git a/starmath/source/SmElementsPanel.hxx b/starmath/source/SmElementsPanel.hxx index c3dde01c6724..c1f4b2ab31f3 100644 --- a/starmath/source/SmElementsPanel.hxx +++ b/starmath/source/SmElementsPanel.hxx @@ -21,6 +21,7 @@ #include +#include #include #include #include @@ -32,10 +33,13 @@ namespace sm::sidebar { -class SmElementsPanel : public PanelLayout +class SmElementsPanel : public PanelLayout, public SfxListener { public: static std::unique_ptr Create(weld::Widget& rParent, const SfxBindings& rBindings); + + void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + SmElementsPanel(weld::Widget& rParent, const SfxBindings& rBindings); ~SmElementsPanel(); diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 78cdbc97e131..6f0134047d07 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -44,6 +44,7 @@ using namespace com::sun::star::beans; constexpr OUString SYMBOL_LIST = u"SymbolList"_ustr; constexpr OUString FONT_FORMAT_LIST = u"FontFormatList"_ustr; +constexpr OUString USER_DEFINED_LIST = u"User-Defined"_ustr; static Sequence< OUString > lcl_GetFontPropertyNames() { @@ -575,7 +576,6 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols ) StripFontFormatList( rNewSymbols ); } - SmFontFormatList & SmMathConfig::GetFontFormatList() { if (!pFontFormatList) @@ -585,7 +585,6 @@ SmFontFormatList & SmMathConfig::GetFontFormatList() return *pFontFormatList; } - void SmMathConfig::LoadFontFormatList() { if (!pFontFormatList) @@ -661,6 +660,47 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat, OSL_ENSURE( bOK, "read FontFormat failed" ); } +css::uno::Sequence SmMathConfig::LoadUserDefinedNames() +{ + m_sUserDefinedNames = GetNodeNames(USER_DEFINED_LIST); + return m_sUserDefinedNames; +} + +void SmMathConfig::GetUserDefinedFormula(std::u16string_view sName, OUString &sFormula) +{ + css::uno::Sequence aNames(1); + OUString* pName = aNames.getArray(); + pName[0] = USER_DEFINED_LIST + "/" + sName + "/FormulaText"; + const Sequence aValues(GetProperties(aNames)); + const Any* pValues = aValues.getConstArray(); + const Any* pVal = pValues; + *pVal >>= sFormula; +} + +bool SmMathConfig::HasUserDefinedFormula(std::u16string_view sName) +{ + for (int i = 0; i < m_sUserDefinedNames.getLength(); i++) + if (m_sUserDefinedNames[i] == sName) + return true; + return false; +} + +void SmMathConfig::SaveUserDefinedFormula(std::u16string_view sName, const OUString& sElement) +{ + Sequence pValues(1); + auto pArgs = pValues.getArray(); + + pArgs[0].Name = USER_DEFINED_LIST + "/" + sName + "/FormulaText"; + pArgs[0].Value <<= sElement; + + SetSetProperties( USER_DEFINED_LIST, pValues ); +} + +void SmMathConfig::DeleteUserDefinedFormula(std::u16string_view sName) +{ + Sequence aElements { OUString(sName) }; + ClearNodeElements(USER_DEFINED_LIST, aElements); +} void SmMathConfig::SaveFontFormatList() { diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index 7d7ec5a06ce7..7762fe9bd21f 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -1350,7 +1350,7 @@ void SmCursor::EndEdit(){ OUString formula; SmNodeToTextVisitor(mpTree, formula); mpDocShell->maText = formula; - mpDocShell->GetEditEngine().QuickInsertText( formula, ESelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL ) ); + mpDocShell->GetEditEngine().QuickInsertText(formula, ESelection::All()); mpDocShell->GetEditEngine().QuickFormatDoc(); } diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 6acb44792dac..3b18cf144625 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -50,14 +50,13 @@ void SmGetLeftSelectionPart(const ESelection &rSel, // returns paragraph number and position of the selections left part { // compare start and end of selection and use the one that comes first - if ( rSel.nStartPara < rSel.nEndPara - || (rSel.nStartPara == rSel.nEndPara && rSel.nStartPos < rSel.nEndPos) ) - { nPara = rSel.nStartPara; - nPos = rSel.nStartPos; + if (rSel.start < rSel.end) + { nPara = rSel.start.nPara; + nPos = rSel.start.nIndex; } else - { nPara = rSel.nEndPara; - nPos = rSel.nEndPos; + { nPara = rSel.end.nPara; + nPos = rSel.end.nIndex; } } @@ -100,8 +99,7 @@ void SmEditTextWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) { weld::CustomWidgetController::SetDrawingArea(pDrawingArea); - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor = rStyleSettings.GetWindowColor(); + Color aBgColor = Application::GetSettings().GetStyleSettings().GetFieldColor(); OutputDevice& rDevice = pDrawingArea->get_ref_device(); rDevice.SetBackground(aBgColor); @@ -321,24 +319,24 @@ bool SmEditTextWindow::KeyInput(const KeyEvent& rKEvt) autoClose = true; else if (selected.isEmpty() && !aSelection.HasRange()) { - selected = pEditView->getEditEngine().GetText(aSelection.nEndPara); + selected = pEditView->getEditEngine().GetText(aSelection.end.nPara); if (!selected.isEmpty()) { - sal_Int32 index = selected.indexOf("\n", aSelection.nEndPos); + sal_Int32 index = selected.indexOf("\n", aSelection.end.nIndex); if (index != -1) { - selected = selected.copy(index, sal_Int32(aSelection.nEndPos-index)); + selected = selected.copy(index, sal_Int32(aSelection.end.nIndex-index)); if (o3tl::trim(selected).empty()) autoClose = true; } else { sal_Int32 length = selected.getLength(); - if (aSelection.nEndPos == length) + if (aSelection.end.nIndex == length) autoClose = true; else { - selected = selected.copy(aSelection.nEndPos); + selected = selected.copy(aSelection.end.nIndex); if (o3tl::trim(selected).empty()) autoClose = true; } @@ -393,8 +391,8 @@ bool SmEditTextWindow::KeyInput(const KeyEvent& rKEvt) { pEditView->InsertText(sClose); // position it at center of brackets - aSelection.nStartPos += 2; - aSelection.nEndPos = aSelection.nStartPos; + aSelection.start.nIndex += 2; + aSelection.end.nIndex = aSelection.start.nIndex; pEditView->SetSelection(aSelection); } @@ -578,11 +576,11 @@ bool SmEditWindow::IsAllSelected() const if (!(nParaCnt - 1)) { sal_Int32 nTextLen = pEditEngine->GetText().getLength(); - bRes = !eSelection.nStartPos && (eSelection.nEndPos == nTextLen - 1); + bRes = !eSelection.start.nIndex && (eSelection.end.nIndex == nTextLen - 1); } else { - bRes = !eSelection.nStartPara && (eSelection.nEndPara == nParaCnt - 1); + bRes = !eSelection.start.nPara && (eSelection.end.nPara == nParaCnt - 1); } return bRes; } @@ -591,8 +589,7 @@ void SmEditWindow::SelectAll() { if (EditView* pEditView = GetEditView()) { - // ALL as last two parameters refers to the end of the text - pEditView->SetSelection( ESelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL ) ); + pEditView->SetSelection(ESelection::All()); } } @@ -600,8 +597,8 @@ void SmEditWindow::MarkError(const Point &rPos) { if (EditView* pEditView = GetEditView()) { - const sal_uInt16 nCol = sal::static_int_cast< sal_uInt16 >(rPos.X()); - const sal_uInt16 nRow = sal::static_int_cast< sal_uInt16 >(rPos.Y() - 1); + const sal_Int32 nCol = rPos.X(); + const sal_Int32 nRow = rPos.Y() - 1; pEditView->SetSelection(ESelection(nRow, nCol - 1, nRow, nCol)); GrabFocus(); @@ -626,22 +623,22 @@ void SmEditTextWindow::SelNextMark() return; ESelection eSelection = pEditView->GetSelection(); - sal_Int32 nPos = eSelection.nEndPos; + sal_Int32 nPos = eSelection.end.nIndex; sal_Int32 nCounts = pEditEngine->GetParagraphCount(); - while (eSelection.nEndPara < nCounts) + while (eSelection.end.nPara < nCounts) { - OUString aText = pEditEngine->GetText(eSelection.nEndPara); + OUString aText = pEditEngine->GetText(eSelection.end.nPara); nPos = aText.indexOf("", nPos); if (nPos != -1) { pEditView->SetSelection(ESelection( - eSelection.nEndPara, nPos, eSelection.nEndPara, nPos + 3)); + eSelection.end.nPara, nPos, eSelection.end.nPara, nPos + 3)); break; } nPos = 0; - eSelection.nEndPara++; + eSelection.end.nPara++; } } @@ -655,8 +652,8 @@ void SmEditWindow::SelPrevMark() return; ESelection eSelection = pEditView->GetSelection(); - sal_Int32 nPara = eSelection.nStartPara; - sal_Int32 nMax = eSelection.nStartPos; + sal_Int32 nPara = eSelection.start.nPara; + sal_Int32 nMax = eSelection.start.nIndex; OUString aText(pEditEngine->GetText(nPara)); static constexpr OUStringLiteral aMark(u""); sal_Int32 nPos; @@ -784,10 +781,10 @@ void SmEditTextWindow::InsertText(const OUString& rText) sal_Int32 nStartIndex = 0; // get the start position (when we get a multi line formula) - for (sal_Int32 nParaPos = 0; nParaPos < aSelection.nStartPara; nParaPos++) + for (sal_Int32 nParaPos = 0; nParaPos < aSelection.start.nPara; nParaPos++) nStartIndex = aCurrentFormula.indexOf("\n", nStartIndex) + 1; - nStartIndex += aSelection.nStartPos; + nStartIndex += aSelection.start.nIndex; // TODO: unify this function with the InsertCommand: The do the same thing for different // callers @@ -799,23 +796,23 @@ void SmEditTextWindow::InsertText(const OUString& rText) string = string.replaceFirst("", selected); // put a space before a new command if not in the beginning of a line - if (aSelection.nStartPos > 0 && aCurrentFormula[nStartIndex - 1] != ' ') + if (aSelection.start.nIndex > 0 && aCurrentFormula[nStartIndex - 1] != ' ') string = " " + string; pEditView->InsertText(string); // Remember start of the selection and move the cursor there afterwards. - aSelection.nEndPara = aSelection.nStartPara; + aSelection.end.nPara = aSelection.start.nPara; if (HasMark(string)) { - aSelection.nEndPos = aSelection.nStartPos; + aSelection.end.nIndex = aSelection.start.nIndex; pEditView->SetSelection(aSelection); SelNextMark(); } else { // set selection after inserted text - aSelection.nEndPos = aSelection.nStartPos + string.getLength(); - aSelection.nStartPos = aSelection.nEndPos; + aSelection.end.nIndex = aSelection.start.nIndex + string.getLength(); + aSelection.start.nIndex = aSelection.end.nIndex; pEditView->SetSelection(aSelection); } diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 4289a9691975..d84a11e52ceb 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1180,20 +1180,20 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector, break; case tmUARROW: if (nVariation == 0) - rRet.append(" widevec ");//left below + rRet.append(" widevec ");//left below - missing functionality else if (nVariation == 1) - rRet.append(" widevec ");//right below + rRet.append(" widevec ");//right below - missing functionality else if (nVariation == 2) - rRet.append(" widevec ");//double headed below + rRet.append(" widevec ");//double headed below - missing functionality rRet.append(" {"); break; case tmOARROW: if (nVariation == 0) - rRet.append(" widevec ");//left above + rRet.append(" widevec ");//left above - missing functionality else if (nVariation == 1) rRet.append(" widevec ");//right above else if (nVariation == 2) - rRet.append(" widevec ");//double headed above + rRet.append(" widevec ");//double headed above - missing functionality rRet.append(" {"); break; default: diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index f5457f5a819e..7f8c47d661c3 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -256,8 +256,8 @@ const SmNode * SmNode::FindTokenAt(sal_uInt16 nRow, sal_uInt16 nCol) const //! (there should be exactly one such node if any) { if ( IsVisible() - && nRow == GetSelection().nStartPara - && nCol >= GetSelection().nStartPos && nCol <= GetSelection().nEndPos ) + && nRow == GetSelection().start.nPara + && nCol >= GetSelection().start.nIndex && nCol <= GetSelection().end.nIndex ) return this; else { diff --git a/starmath/source/smediteng.cxx b/starmath/source/smediteng.cxx index 07946972b49e..51681f1423a3 100644 --- a/starmath/source/smediteng.cxx +++ b/starmath/source/smediteng.cxx @@ -101,9 +101,9 @@ void SmEditEngine::updateZoom() void SmEditEngine::updateAllESelection() { sal_Int32 paracount = GetParagraphCount(); - m_aAllSelection.nEndPara = paracount > 0 ? paracount - 1 : 0; - sal_Int32 textlength = GetTextLen(m_aAllSelection.nEndPara); - m_aAllSelection.nEndPos = textlength > 0 ? textlength : 0; + m_aAllSelection.end.nPara = paracount > 0 ? paracount - 1 : 0; + sal_Int32 textlength = GetTextLen(m_aAllSelection.end.nPara); + m_aAllSelection.end.nIndex = textlength > 0 ? textlength : 0; } void SmEditEngine::setSmItemPool(SfxItemPool* mpItemPool, const SvtLinguOptions& maLangOptions) diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index b09b347a22c6..ac6c90d78747 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -89,6 +89,7 @@ #include #include #include "accessibility.hxx" +#include #include #include @@ -1755,16 +1756,16 @@ void SmViewShell::Execute(SfxRequest& rReq) const OUString sInput = pEditView->GetSurroundingText(); ESelection aSel( pWin->GetSelection() ); - if ( aSel.nStartPos > aSel.nEndPos ) - aSel.nEndPos = aSel.nStartPos; + if (aSel.start.nIndex > aSel.end.nIndex) + aSel.end.nIndex = aSel.start.nIndex; //calculate a valid end-position by reading logical characters sal_Int32 nUtf16Pos=0; - while( (nUtf16Pos < sInput.getLength()) && (nUtf16Pos < aSel.nEndPos) ) + while ((nUtf16Pos < sInput.getLength()) && (nUtf16Pos < aSel.end.nIndex)) { sInput.iterateCodePoints(&nUtf16Pos); - if( nUtf16Pos > aSel.nEndPos ) - aSel.nEndPos = nUtf16Pos; + if (nUtf16Pos > aSel.end.nIndex) + aSel.end.nIndex = nUtf16Pos; } ToggleUnicodeCodepoint aToggle; @@ -1775,7 +1776,7 @@ void SmViewShell::Execute(SfxRequest& rReq) { pEditView->SetSelection( aSel ); pEditEngine->UndoActionStart(EDITUNDO_REPLACEALL); - aSel.nStartPos = aSel.nEndPos - aToggle.StringToReplace().getLength(); + aSel.start.nIndex = aSel.end.nIndex - aToggle.StringToReplace().getLength(); pWin->SetSelection( aSel ); pEditView->InsertText( sReplacement, true ); pEditEngine->UndoActionEnd(); @@ -1840,6 +1841,39 @@ void SmViewShell::Execute(SfxRequest& rReq) GetViewFrame().GetBindings().Invalidate(bRTL ? SID_ATTR_PARA_LEFT_TO_RIGHT : SID_ATTR_PARA_RIGHT_TO_LEFT); } break; + case SID_SAVE_FORMULA: + { + OUString aName = "My Formula 1"; + OUString aDesc(SmResId(STR_USER_DEFINED_FORMULA)); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + ScopedVclPtr pDlg( + pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); + + if (pDlg->Execute() == RET_OK) + { + aName = pDlg->GetName(); + if (SmModule::get()->GetConfig()->HasUserDefinedFormula(aName)) + { + std::unique_ptr xQuery(Application::CreateMessageDialog( + GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, + SmResId(STR_USER_DEFINED_FORMULA_EXISTS).replaceAll("%1", aName))); + if (xQuery->run() == RET_NO) + break; + } + if (SmEditWindow* pEditWin = GetEditWindow()) + SmModule::get()->GetConfig()->SaveUserDefinedFormula(aName, pEditWin->GetText()); + + // Show the Elements sidebar with the "User-defined" entry selected + GetViewFrame().ShowChildWindow(SID_SIDEBAR); + sfx2::sidebar::Sidebar::ShowPanel(u"MathElementsPanel", + GetViewFrame().GetFrame().GetFrameInterface()); + GetViewFrame().GetBindings().Invalidate( SID_ELEMENTSDOCKINGWINDOW ); + Broadcast(SfxHint(SfxHintId::SmNewUserFormula)); + rReq.Ignore (); + } + pDlg.disposeAndClear(); + } + break; } rReq.Done(); } @@ -1949,6 +1983,10 @@ void SmViewShell::GetState(SfxItemSet &rSet) case SID_ATTR_PARA_RIGHT_TO_LEFT: rSet.Put(SfxBoolItem(nWh, GetDoc()->GetFormat().IsRightToLeft())); break; + case SID_SAVE_FORMULA: + if (!pEditWin || pEditWin->IsEmpty()) + rSet.DisableItem(nWh); + break; } } } diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 903ba7189664..74b478aaf3b0 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -125,6 +125,7 @@ + diff --git a/starmath/uiconfig/smath/popupmenu/edit.xml b/starmath/uiconfig/smath/popupmenu/edit.xml index c9626cc6a033..385baa4c33cd 100644 --- a/starmath/uiconfig/smath/popupmenu/edit.xml +++ b/starmath/uiconfig/smath/popupmenu/edit.xml @@ -15,6 +15,7 @@ + diff --git a/starmath/uiconfig/smath/ui/sidebarelements_math.ui b/starmath/uiconfig/smath/ui/sidebarelements_math.ui index b9a5736abb9d..8552baba3e18 100644 --- a/starmath/uiconfig/smath/ui/sidebarelements_math.ui +++ b/starmath/uiconfig/smath/ui/sidebarelements_math.ui @@ -2,6 +2,18 @@ + + True + False + + + True + False + Delete Formula + True + + + diff --git a/svl/source/items/globalpool.cxx b/svl/source/items/globalpool.cxx index 9f0e26ef8547..b0f721157422 100644 --- a/svl/source/items/globalpool.cxx +++ b/svl/source/items/globalpool.cxx @@ -316,46 +316,44 @@ SfxPoolItem const* implCreateItemEntry(SfxItemPool& rPool, SfxPoolItem const* pS // The Item itself is shareable when it is used/added at an instance // that RefCounts the Item, SfxItemPool or SfxPoolItemHolder. Try // to share items that are already shared - while (pSource->GetRefCount() > 0) + if (pSource->GetRefCount() > 0) { - if (!pSource->isShareable()) - // not shareable, done - break; - - // SfxSetItems cannot be shared if they are in/use another pool - if (pSource->isSetItem() - && static_cast(pSource)->GetItemSet().GetPool() != pMasterPool) - break; - - // If we get here we can share the Item - pSource->AddRef(); - return pSource; + if (pSource->isShareable()) + { + // SfxSetItems cannot be shared if they are in/use another pool + if (!pSource->isSetItem() + || static_cast(pSource)->GetItemSet().GetPool() == pMasterPool) + { + // If we get here we can share the Item + pSource->AddRef(); + return pSource; + } + } } // try to get an ItemInstanceManager for global Item instance sharing ItemInstanceManager* pManager(aInstanceManagerHelper.getOrCreateItemInstanceManager(*pSource)); // check if we can globally share the Item using an ItemInstanceManager - while (nullptr != pManager) + if (pManager) { const SfxPoolItem* pAlternative(pManager->find(*pSource)); - if (nullptr == pAlternative) - // no already globally shared one found, done - break; + if (pAlternative) + { + // Here we do *not* need to check if it is an SfxSetItem + // and cannot be shared if they are in/use another pool: + // The SfxItemSet::operator== will check for SfxItemPools + // being equal, thus when found in global share the Pool + // cannot be equal - // Here we do *not* need to check if it is an SfxSetItem - // and cannot be shared if they are in/use another pool: - // The SfxItemSet::operator== will check for SfxItemPools - // being equal, thus when found in global share the Pool - // cannot be equal + // need to delete evtl. handed over ownership change Item + if (bPassingOwnership) + delete pSource; - // need to delete evtl. handed over ownership change Item - if (bPassingOwnership) - delete pSource; - - // If we get here we can share the Item - pAlternative->AddRef(); - return pAlternative; + // If we get here we can share the Item + pAlternative->AddRef(); + return pAlternative; + } } // check if the handed over and to be directly used item is a diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx index 8cf20475bd5c..17e41e3a76ff 100644 --- a/svl/source/misc/sharedstringpool.cxx +++ b/svl/source/misc/sharedstringpool.cxx @@ -24,7 +24,7 @@ struct StringWithHash sal_Int32 hashCode; StringWithHash(OUString s) : str(std::move(s)) - , hashCode(s.hashCode()) + , hashCode(str.hashCode()) { } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 0863dd9870c7..11f750b96b5c 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -17,12 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include #include #include #include "datwin.hxx" +#include #include #include #include @@ -34,8 +36,8 @@ #include #include #include +#include #include -#include "brwimpl.hxx" #define SCROLL_FLAGS (ScrollFlags::Clip | ScrollFlags::NoChildren) @@ -48,69 +50,35 @@ using namespace svt; namespace { - void disposeAndClearHeaderCell(::svt::BrowseBoxImpl::THeaderCellMap& _rHeaderCell) + struct THeaderCellMapFunctorDispose + { + void operator()(const BrowseBox::THeaderCellMap::value_type& _aType) + { + css::uno::Reference xComp(_aType.second, css::uno::UNO_QUERY); + OSL_ENSURE(xComp.is() || !_aType.second.is(), "THeaderCellMapFunctorDispose: invalid accessible cell (no XComponent)!"); + if (xComp.is()) + try + { + xComp->dispose(); + } + catch(const css::uno::Exception&) + { + TOOLS_WARN_EXCEPTION("svtools", "THeaderCellMapFunctorDispose"); + } + } + }; + + void disposeAndClearHeaderCell(BrowseBox::THeaderCellMap& _rHeaderCell) { ::std::for_each( _rHeaderCell.begin(), _rHeaderCell.end(), - ::svt::BrowseBoxImpl::THeaderCellMapFunctorDispose() + THeaderCellMapFunctorDispose() ); _rHeaderCell.clear(); } } -void BrowseBox::ConstructImpl( BrowserMode nMode ) -{ - SAL_INFO("svtools", "BrowseBox:ConstructImpl " << this ); - bMultiSelection = false; - pColSel = nullptr; - pVScroll = nullptr; - pDataWin = VclPtr::Create( this ).get(); - m_pImpl.reset( new ::svt::BrowseBoxImpl() ); - - InitSettings_Impl( this ); - InitSettings_Impl( pDataWin ); - - bBootstrapped = false; - m_nDataRowHeight = 0; - nTitleLines = 1; - nFirstCol = 0; - nTopRow = 0; - nCurRow = BROWSER_ENDOFSELECTION; - nCurColId = 0; - nResizeX = 0; - nMinResizeX = 0; - nDragX = 0; - nResizeCol = 0; - bResizing = false; - bSelect = false; - bSelecting = false; - bScrolling = false; - bSelectionIsVisible = false; - bNotToggleSel = false; - bRowDividerDrag = false; - bHit = false; - mbInteractiveRowHeight = false; - bHideSelect = false; - bHideCursor = TRISTATE_FALSE; - nRowCount = 0; - m_bFocusOnlyCursor = true; - m_aCursorColor = COL_TRANSPARENT; - m_nCurrentMode = BrowserMode::NONE; - nControlAreaWidth = USHRT_MAX; - uRow.nSel = BROWSER_ENDOFSELECTION; - - aHScroll->SetLineSize(1); - aHScroll->SetScrollHdl( LINK( this, BrowseBox, HorzScrollHdl ) ); - pDataWin->Show(); - - SetMode( nMode ); - bSelectionIsVisible = bKeepHighlight; - bHasFocus = HasChildPathFocus(); - pDataWin->nCursorHidden = - ( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 ); -} - // we're just measuring the "real" NavigationBar class MeasureStatusBar final : public InterimItemWindow { @@ -172,7 +140,52 @@ BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) ,m_nActualCornerWidth(0) ,m_bNavigationBar(false) { - ConstructImpl( nMode ); + bMultiSelection = false; + pColSel = nullptr; + pVScroll = nullptr; + pDataWin = VclPtr::Create( this ).get(); + + InitSettings_Impl( this ); + InitSettings_Impl( pDataWin ); + + bBootstrapped = false; + m_nDataRowHeight = 0; + nTitleLines = 1; + nFirstCol = 0; + nTopRow = 0; + nCurRow = BROWSER_ENDOFSELECTION; + nCurColId = 0; + nResizeX = 0; + nMinResizeX = 0; + nDragX = 0; + nResizeCol = 0; + bResizing = false; + bSelect = false; + bSelecting = false; + bScrolling = false; + bSelectionIsVisible = false; + bNotToggleSel = false; + bRowDividerDrag = false; + bHit = false; + mbInteractiveRowHeight = false; + bHideSelect = false; + bHideCursor = TRISTATE_FALSE; + nRowCount = 0; + m_bFocusOnlyCursor = true; + m_aCursorColor = COL_TRANSPARENT; + m_nCurrentMode = BrowserMode::NONE; + nControlAreaWidth = USHRT_MAX; + uRow.nSel = BROWSER_ENDOFSELECTION; + + aHScroll->SetLineSize(1); + aHScroll->SetScrollHdl( LINK( this, BrowseBox, HorzScrollHdl ) ); + pDataWin->Show(); + + SetMode( nMode ); + bSelectionIsVisible = bKeepHighlight; + bHasFocus = HasChildPathFocus(); + pDataWin->nCursorHidden = + ( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 ); } BrowseBox::~BrowseBox() @@ -182,12 +195,12 @@ BrowseBox::~BrowseBox() void BrowseBox::DisposeAccessible() { - if (m_pImpl->m_pAccessible ) + if (m_pAccessible ) { - disposeAndClearHeaderCell(m_pImpl->m_aColHeaderCellMap); - disposeAndClearHeaderCell(m_pImpl->m_aRowHeaderCellMap); - m_pImpl->m_pAccessible->dispose(); - m_pImpl->m_pAccessible = nullptr; + disposeAndClearHeaderCell(m_aColHeaderCellMap); + disposeAndClearHeaderCell(m_aRowHeaderCellMap); + m_pAccessible->dispose(); + m_pAccessible = nullptr; } } @@ -807,13 +820,13 @@ void BrowseBox::RemoveColumns() commitBrowseBoxEvent( AccessibleEventId::CHILD, Any(), - Any(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar)) + Any(getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar)) ); // and now append it again commitBrowseBoxEvent( AccessibleEventId::CHILD, - Any(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar)), + Any(getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar)), Any() ); @@ -1127,13 +1140,13 @@ void BrowseBox::Clear() commitBrowseBoxEvent( AccessibleEventId::CHILD, Any(), - Any( m_pImpl->getAccessibleHeaderBar( AccessibleBrowseBoxObjType::RowHeaderBar ) ) + Any(getAccessibleHeaderBar( AccessibleBrowseBoxObjType::RowHeaderBar)) ); // and now append it again commitBrowseBoxEvent( AccessibleEventId::CHILD, - Any( m_pImpl->getAccessibleHeaderBar( AccessibleBrowseBoxObjType::RowHeaderBar ) ), + Any(getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar)), Any() ); @@ -1370,25 +1383,25 @@ void BrowseBox::RowRemoved( sal_Int32 nRow, sal_Int32 nNumRows, bool bDoPaint ) commitBrowseBoxEvent( AccessibleEventId::CHILD, Any(), - Any( m_pImpl->getAccessibleHeaderBar( AccessibleBrowseBoxObjType::RowHeaderBar ) ) + Any(getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar)) ); // and now append it again commitBrowseBoxEvent( AccessibleEventId::CHILD, - Any(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar)), + Any(getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar)), Any() ); commitBrowseBoxEvent( AccessibleEventId::CHILD, Any(), - Any( m_pImpl->getAccessibleTable() ) + Any(getAccessibleTable()) ); // and now append it again commitBrowseBoxEvent( AccessibleEventId::CHILD, - Any( m_pImpl->getAccessibleTable() ), + Any(getAccessibleTable()), Any() ); } diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 1237060a1b89..be1a1b268c21 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include #include #include #include -#include "brwimpl.hxx" #include // Accessibility ============================================================== @@ -35,7 +35,7 @@ using namespace ::com::sun::star::accessibility; namespace svt { - static Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells, + static Reference< XAccessible > getHeaderCell(BrowseBox::THeaderCellMap& _raHeaderCells, sal_Int32 _nPos, AccessibleBrowseBoxObjType _eType, const Reference< XAccessible >& _rParent, @@ -44,7 +44,7 @@ namespace svt ) { Reference< XAccessible > xRet; - BrowseBoxImpl::THeaderCellMap::iterator aFind = _raHeaderCells.find( _nPos ); + BrowseBox::THeaderCellMap::iterator aFind = _raHeaderCells.find(_nPos); if ( aFind == _raHeaderCells.end() ) { Reference< XAccessible > xAccessible = rFactory.createAccessibleBrowseBoxHeaderCell( @@ -60,42 +60,39 @@ namespace svt xRet = aFind->second; return xRet; } - - - Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType ) - { - if ( m_pAccessible && m_pAccessible->isAlive() ) - return m_pAccessible->getHeaderBar( _eObjType ); - return nullptr; - } - - - Reference< XAccessible > BrowseBoxImpl::getAccessibleTable( ) - { - if ( m_pAccessible && m_pAccessible->isAlive() ) - return m_pAccessible->getTable( ); - return nullptr; - } } +Reference BrowseBox::getAccessibleHeaderBar(AccessibleBrowseBoxObjType _eObjType) +{ + if (m_pAccessible && m_pAccessible->isAlive()) + return m_pAccessible->getHeaderBar(_eObjType); + return nullptr; +} + +Reference BrowseBox::getAccessibleTable() +{ + if (m_pAccessible && m_pAccessible->isAlive()) + return m_pAccessible->getTable(); + return nullptr; +} Reference< XAccessible > BrowseBox::CreateAccessible() { vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "BrowseBox::CreateAccessible - parent not found" ); - if( pParent && !m_pImpl->m_pAccessible) + if (pParent && !m_pAccessible) { Reference< XAccessible > xAccParent = pParent->GetAccessible(); if( xAccParent.is() ) { - m_pImpl->m_pAccessible = getAccessibleFactory().createAccessibleBrowseBox( + m_pAccessible = getAccessibleFactory().createAccessibleBrowseBox( xAccParent, *this ); } } - return m_pImpl->m_pAccessible; + return m_pAccessible; } @@ -104,10 +101,10 @@ Reference< XAccessible > BrowseBox::CreateAccessible() Reference< XAccessible > BrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { // BBINDEX_TABLE must be the table - OSL_ENSURE(m_pImpl->m_pAccessible,"Invalid call: Accessible is null"); + OSL_ENSURE(m_pAccessible,"Invalid call: Accessible is null"); - return m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( - m_pImpl->getAccessibleTable(), + return m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( + getAccessibleTable(), *this, nullptr, _nRow, @@ -120,12 +117,12 @@ Reference< XAccessible > BrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_u Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow ) { return svt::getHeaderCell( - m_pImpl->m_aRowHeaderCellMap, + m_aRowHeaderCellMap, _nRow, AccessibleBrowseBoxObjType::RowHeaderCell, - m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar), + getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar), *this, - m_pImpl->m_aFactoryAccess.getFactory() + m_aFactoryAccess.getFactory() ); } @@ -133,12 +130,12 @@ Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow ) Reference< XAccessible > BrowseBox::CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) { return svt::getHeaderCell( - m_pImpl->m_aColHeaderCellMap, + m_aColHeaderCellMap, _nColumnPos, AccessibleBrowseBoxObjType::ColumnHeaderCell, - m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar), + getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar), *this, - m_pImpl->m_aFactoryAccess.getFactory() + m_aFactoryAccess.getFactory() ); } @@ -398,30 +395,30 @@ void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId, const Any& rNewValue, const Any& rOldValue, bool _bColumnHeaderBar ) { if ( isAccessibleAlive() ) - m_pImpl->m_pAccessible->commitHeaderBarEvent( nEventId, + m_pAccessible->commitHeaderBarEvent( nEventId, rNewValue, rOldValue, _bColumnHeaderBar ); } void BrowseBox::commitTableEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue ) { if ( isAccessibleAlive() ) - m_pImpl->m_pAccessible->commitTableEvent( _nEventId, _rNewValue, _rOldValue ); + m_pAccessible->commitTableEvent(_nEventId, _rNewValue, _rOldValue); } void BrowseBox::commitBrowseBoxEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue ) { if ( isAccessibleAlive() ) - m_pImpl->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue); + m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue); } ::vcl::IAccessibleFactory& BrowseBox::getAccessibleFactory() { - return m_pImpl->m_aFactoryAccess.getFactory(); + return m_aFactoryAccess.getFactory(); } bool BrowseBox::isAccessibleAlive( ) const { - return m_pImpl->m_pAccessible && m_pImpl->m_pAccessible->isAlive(); + return m_pAccessible && m_pAccessible->isAlive(); } // IAccessibleTableProvider diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx deleted file mode 100644 index 8c7017675a3f..000000000000 --- a/svtools/source/brwbox/brwimpl.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#pragma once - -#include -#include -#include -#include -#include -#include - -#include - -namespace svt -{ - class BrowseBoxImpl - { - // member - public: - typedef ::std::map< sal_Int32, css::uno::Reference< css::accessibility::XAccessible > > THeaderCellMap; - - struct THeaderCellMapFunctorDispose - { - void operator()(const THeaderCellMap::value_type& _aType) - { - css::uno::Reference< css::lang::XComponent > xComp( _aType.second, css::uno::UNO_QUERY ); - OSL_ENSURE( xComp.is() || !_aType.second.is(), "THeaderCellMapFunctorDispose: invalid accessible cell (no XComponent)!" ); - if ( xComp.is() ) - try - { - xComp->dispose(); - } - catch( const css::uno::Exception& ) - { - TOOLS_WARN_EXCEPTION( "svtools", "THeaderCellMapFunctorDispose" ); - } - } - }; - - public: - vcl::AccessibleFactoryAccess m_aFactoryAccess; - rtl::Reference m_pAccessible; - THeaderCellMap m_aColHeaderCellMap; - THeaderCellMap m_aRowHeaderCellMap; - - public: - BrowseBoxImpl() - { - } - - - /// @see AccessibleBrowseBox::getHeaderBar - css::uno::Reference< css::accessibility::XAccessible > - getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType ); - - /// @see AccessibleBrowseBox::getTable - css::uno::Reference< css::accessibility::XAccessible > - getAccessibleTable( ); - - }; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index c75c8986130d..1065f3fbf876 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -113,10 +113,9 @@ uno::Sequence< OUString> GetPropertyNames(std::u16string_view rScheme) static const ColorConfigEntryData_Impl cNames[] = { { std::u16string_view(u"/DocColor") ,false }, - { std::u16string_view(u"/DocBoundaries") ,true }, + { std::u16string_view(u"/DocBoundaries") ,false }, { std::u16string_view(u"/AppBackground") ,false }, - { std::u16string_view(u"/ObjectBoundaries"),true }, - { std::u16string_view(u"/TableBoundaries") ,true }, + { std::u16string_view(u"/TableBoundaries") ,false }, { std::u16string_view(u"/FontColor") ,false }, { std::u16string_view(u"/Links") ,true }, { std::u16string_view(u"/LinksVisited") ,true }, @@ -129,7 +128,7 @@ uno::Sequence< OUString> GetPropertyNames(std::u16string_view rScheme) { std::u16string_view(u"/WriterIdxShadings") ,true }, { std::u16string_view(u"/WriterDirectCursor") ,true }, { std::u16string_view(u"/WriterScriptIndicator") ,false }, - { std::u16string_view(u"/WriterSectionBoundaries") ,true }, + { std::u16string_view(u"/WriterSectionBoundaries") ,false }, { std::u16string_view(u"/WriterHeaderFooterMark") ,false }, { std::u16string_view(u"/WriterPageBreaks") ,false }, { std::u16string_view(u"/WriterNonPrintChars") ,false }, @@ -549,7 +548,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry, int nMod) { COL_WHITE, Color(0x1C1C1C) }, // DOCCOLOR { COL_LIGHTGRAY, Color(0x808080) }, // DOCBOUNDARIES { Color(0xDFDFDE), Color(0x333333) }, // APPBACKGROUND - { COL_LIGHTGRAY, Color(0x808080) }, // OBJECTBOUNDARIES { COL_LIGHTGRAY, Color(0x808080) }, // TABLEBOUNDARIES { COL_BLACK, COL_BLACK }, // FONTCOLOR { COL_BLUE, Color(0x1D99F3) }, // LINKS diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 5c7ad7250472..ff2740f17abf 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -43,26 +43,9 @@ Color GetStripeColorB() return Color(ColorTransparency, officecfg::Office::Common::Drawinglayer::StripeColorB::get()); } -static bool gbPixelSnapHairlineForwardInitial(false); -static bool gbPixelSnapHairlineForwardLast(true); - -bool IsAAPossibleOnThisSystem() -{ - static const bool gbAllowAA - = Application::GetDefaultDevice()->SupportsOperation(OutDevSupportType::TransparentRect); - return gbAllowAA; -} - - bool IsAntiAliasing() { - bool bAntiAliasing = drawinglayer::geometry::ViewInformation2D::getGlobalAntiAliasing(); - if (bAntiAliasing && !IsAAPossibleOnThisSystem()) - { - drawinglayer::geometry::ViewInformation2D::setGlobalAntiAliasing(false, true); - bAntiAliasing = false; - } - return bAntiAliasing; + return drawinglayer::geometry::ViewInformation2D::getGlobalAntiAliasing(); } /** @@ -78,16 +61,7 @@ void SetAntiAliasing( bool bOn, bool bTemporary ) bool IsSnapHorVerLinesToDiscrete() { - const bool bRetval(IsAntiAliasing() && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get()); - - if (!gbPixelSnapHairlineForwardInitial || gbPixelSnapHairlineForwardLast != bRetval) - { - gbPixelSnapHairlineForwardInitial = true; - gbPixelSnapHairlineForwardLast = bRetval; - drawinglayer::geometry::ViewInformation2D::forwardPixelSnapHairline(bRetval); - } - - return bRetval; + return IsAntiAliasing() && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get(); } sal_uInt16 GetTransparentSelectionPercent() diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 03666c97688b..5a056751b105 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -96,6 +96,7 @@ ValueSet::ValueSet(std::unique_ptr pScrolledWindow) mnUserCols = 0; mnUserVisLines = 0; mnSpacing = 0; + mnMargin = 0; mnFrameStyle = DrawFrameStyle::NONE; mbNoSelection = true; mbDoubleSel = false; @@ -861,6 +862,12 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext) else nOff = 0; + if ( mnMargin ) + { + aWinSize.AdjustWidth(-mnMargin * 2); + aWinSize.AdjustHeight(-mnMargin * 2); + } + // consider size, if NameField does exist if (nStyle & WB_NAMEFIELD) { @@ -876,6 +883,8 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext) else mnTextOffset = 0; + mnTextOffset += mnMargin; + // consider offset and size, if NoneField does exist if (nStyle & WB_NONEFIELD) { @@ -1038,6 +1047,9 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext) nStartY = 0; } + nStartX += mnMargin; + nStartY += mnMargin; + // calculate and draw items maVirDev->SetLineColor(); tools::Long x = nStartX; @@ -1648,6 +1660,12 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol aSize.AdjustHeight(nTxtHeight + n + mnSpacing ); } + if ( mnMargin ) + { + aSize.AdjustWidth(mnMargin * 2); + aSize.AdjustHeight(mnMargin * 2); + } + return aSize; } @@ -1820,6 +1838,12 @@ void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) } } +void ValueSet::SetMargin( sal_uInt16 nNewMargin ) +{ + mnMargin = nNewMargin; + QueueReformat(); +} + void ValueSet::SetFormat() { mbFormat = true; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 619c3443a42a..a0601c234946 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -158,6 +158,7 @@ namespace accessibility bool Delete( const ESelection& ) override { return false; } bool InsertText( const OUString&, const ESelection& ) override { return false; } bool QuickFormatDoc( bool ) override { return true; } + bool SupportsOutlineDepth() const override { return false; } sal_Int16 GetDepth( sal_Int32 ) const override { return -1; } bool SetDepth( sal_Int32, sal_Int16 ) override { return true; } diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index d83f3fcdefc5..2f3e0c26505e 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -224,7 +224,7 @@ namespace accessibility }; AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() : - maLastSelection( EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND,EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND ), + maLastSelection( ESelection::AtEnd() ), mnFirstVisibleChild( -1 ), mnLastVisibleChild( -2 ), mnStartIndex( 0 ), @@ -447,7 +447,7 @@ namespace accessibility // find the one with the cursor and get/set focus accordingly ESelection aSelection; if( GetEditViewForwarder().GetSelection( aSelection ) ) - SetChildFocus( aSelection.nEndPara, bHaveFocus ); + SetChildFocus(aSelection.end.nPara, bHaveFocus); } catch( const uno::Exception& ) {} } @@ -495,7 +495,7 @@ namespace accessibility if( GetEditViewForwarder().GetSelection( aSelection ) ) { if( maLastSelection != aSelection && - aSelection.nEndPara < maParaManager.GetNum() ) + aSelection.end.nPara < maParaManager.GetNum() ) { // #103998# Not that important, changed from assertion to trace if( mbThisHasFocus ) @@ -507,30 +507,30 @@ namespace accessibility // notify all affected paragraphs (TODO: may be suboptimal, // since some paragraphs might stay selected) - if( maLastSelection.nStartPara != EE_PARA_NOT_FOUND ) + if (maLastSelection.start.nPara != EE_PARA_MAX) { // Did the caret move from one paragraph to another? // #100530# no caret events if not focused. if( mbGroupHasFocus && - maLastSelection.nEndPara != aSelection.nEndPara ) + maLastSelection.end.nPara != aSelection.end.nPara ) { - if( maLastSelection.nEndPara < maParaManager.GetNum() ) + if (maLastSelection.end.nPara < maParaManager.GetNum()) { - maParaManager.FireEvent( ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex ), - ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex )+1, + maParaManager.FireEvent( ::std::min( maLastSelection.end.nPara, nMaxValidParaIndex ), + ::std::min( maLastSelection.end.nPara, nMaxValidParaIndex )+1, AccessibleEventId::CARET_CHANGED, uno::Any(static_cast(-1)), - uno::Any(maLastSelection.nEndPos) ); + uno::Any(maLastSelection.end.nIndex) ); } - ChangeChildFocus( aSelection.nEndPara ); + ChangeChildFocus(aSelection.end.nPara); SAL_INFO( "svx", "focus changed, Object: " << this - << ", Paragraph: " << aSelection.nEndPara + << ", Paragraph: " << aSelection.end.nPara << ", Last paragraph: " - << maLastSelection.nEndPara); + << maLastSelection.end.nPara); } } @@ -541,46 +541,46 @@ namespace accessibility // #i13705# The old cursor can only contain valid // values if it's the same paragraph! - if( maLastSelection.nStartPara != EE_PARA_NOT_FOUND && - maLastSelection.nEndPara == aSelection.nEndPara ) + if( maLastSelection.start.nPara != EE_PARA_MAX && + maLastSelection.end.nPara == aSelection.end.nPara ) { - aOldCursor <<= maLastSelection.nEndPos; + aOldCursor <<= maLastSelection.end.nIndex; } else { aOldCursor <<= static_cast(-1); } - maParaManager.FireEvent( aSelection.nEndPara, - aSelection.nEndPara+1, + maParaManager.FireEvent( aSelection.end.nPara, + aSelection.end.nPara+1, AccessibleEventId::CARET_CHANGED, - uno::Any(aSelection.nEndPos), + uno::Any(aSelection.end.nIndex), aOldCursor ); } SAL_INFO( "svx", "caret changed, Object: " << this << ", New pos: " - << aSelection.nEndPos << ", Old pos: " - << maLastSelection.nEndPos << ", New para: " - << aSelection.nEndPara << ", Old para: " - << maLastSelection.nEndPara); + << aSelection.end.nIndex << ", Old pos: " + << maLastSelection.end.nIndex << ", New para: " + << aSelection.end.nPara << ", Old para: " + << maLastSelection.end.nPara); // #108947# Sort new range before calling FireEvent ::std::pair sortedSelection( - makeSortedPair(::std::min( aSelection.nStartPara, nMaxValidParaIndex ), - ::std::min( aSelection.nEndPara, nMaxValidParaIndex ) ) ); + makeSortedPair(::std::min( aSelection.start.nPara, nMaxValidParaIndex ), + ::std::min( aSelection.end.nPara, nMaxValidParaIndex ) ) ); // #108947# Sort last range before calling FireEvent ::std::pair sortedLastSelection( - makeSortedPair(::std::min( maLastSelection.nStartPara, nMaxValidParaIndex ), - ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex ) ) ); + makeSortedPair(::std::min( maLastSelection.start.nPara, nMaxValidParaIndex ), + ::std::min( maLastSelection.end.nPara, nMaxValidParaIndex ) ) ); // event TEXT_SELECTION_CHANGED has to be submitted. (#i27299#) const sal_Int16 nTextSelChgEventId = AccessibleEventId::TEXT_SELECTION_CHANGED; // #107037# notify selection change - if( maLastSelection.nStartPara == EE_PARA_NOT_FOUND ) + if (maLastSelection.start.nPara == EE_PARA_MAX) { // last selection is undefined // use method (#i27299#) @@ -624,11 +624,11 @@ namespace accessibility ESelection aTmpSel( aSelection ); aTmpSel.Adjust(); // first submit event for new and changed selection - sal_Int32 nPara = aTmpSel.nStartPara; - for ( ; nPara <= aTmpSel.nEndPara; ++nPara ) + sal_Int32 nPara = aTmpSel.start.nPara; + for ( ; nPara <= aTmpSel.end.nPara; ++nPara ) { - if ( nPara < aTmpLastSel.nStartPara || - nPara > aTmpLastSel.nEndPara ) + if ( nPara < aTmpLastSel.start.nPara || + nPara > aTmpLastSel.end.nPara ) { // new selection on paragraph maParaManager.FireEvent( nPara, @@ -638,17 +638,17 @@ namespace accessibility { // check for changed selection on paragraph const sal_Int32 nParaStartPos = - nPara == aTmpSel.nStartPara - ? aTmpSel.nStartPos : 0; + nPara == aTmpSel.start.nPara + ? aTmpSel.start.nIndex : 0; const sal_Int32 nParaEndPos = - nPara == aTmpSel.nEndPara - ? aTmpSel.nEndPos : -1; + nPara == aTmpSel.end.nPara + ? aTmpSel.end.nIndex : -1; const sal_Int32 nLastParaStartPos = - nPara == aTmpLastSel.nStartPara - ? aTmpLastSel.nStartPos : 0; + nPara == aTmpLastSel.start.nPara + ? aTmpLastSel.start.nIndex : 0; const sal_Int32 nLastParaEndPos = - nPara == aTmpLastSel.nEndPara - ? aTmpLastSel.nEndPos : -1; + nPara == aTmpLastSel.end.nPara + ? aTmpLastSel.end.nIndex : -1; if ( nParaStartPos != nLastParaStartPos || nParaEndPos != nLastParaEndPos ) { @@ -658,11 +658,11 @@ namespace accessibility } } // second submit event for 'old' selections - nPara = aTmpLastSel.nStartPara; - for ( ; nPara <= aTmpLastSel.nEndPara; ++nPara ) + nPara = aTmpLastSel.start.nPara; + for ( ; nPara <= aTmpLastSel.end.nPara; ++nPara ) { - if ( nPara < aTmpSel.nStartPara || - nPara > aTmpSel.nEndPara ) + if ( nPara < aTmpSel.start.nPara || + nPara > aTmpSel.end.nPara ) { maParaManager.FireEvent( nPara, nTextSelChgEventId ); @@ -964,7 +964,7 @@ namespace accessibility pTextHint->GetId() == SfxHintId::TextParaRemoved )) ) return; - if( pTextHint->GetValue() == EE_PARA_ALL ) + if (pTextHint->GetValue() == EE_PARA_MAX) { mnParasChanged = -1; } @@ -1152,12 +1152,12 @@ namespace accessibility // focused child now loses focus ESelection aSelection; if( GetEditViewForwarder().GetSelection( aSelection ) ) - SetChildFocus( aSelection.nEndPara, false ); + SetChildFocus(aSelection.end.nPara, false); // change children state maParaManager.SetActive( false ); - maLastSelection = ESelection::NotFound(); + maLastSelection = ESelection::AtEnd(); break; } default: @@ -1212,7 +1212,7 @@ namespace accessibility // #108900# Delegate change event to children AccessibleTextHelper_ChildrenTextChanged aNotifyChildrenFunctor; - if( nPara == EE_PARA_ALL ) + if (nPara == EE_PARA_MAX) { // #108900# Call every child ::std::for_each( maParaManager.begin(), maParaManager.end(), diff --git a/svx/source/annotation/TextAPI.cxx b/svx/source/annotation/TextAPI.cxx index cd13acd76d3b..d3891f7f5958 100644 --- a/svx/source/annotation/TextAPI.cxx +++ b/svx/source/annotation/TextAPI.cxx @@ -167,7 +167,7 @@ void TextApiObject::SetText(OutlinerParaObject const& rText) pModel->AddUndo(std::make_unique(*pModel, this)); mpSource->SetText(rText); - maSelection.nStartPara = EE_PARA_MAX_COUNT; + maSelection.start.nPara = EE_PARA_MAX; } OUString TextApiObject::GetText() const { return mpSource->GetText(); } diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx index fa4388017fcb..56ac009a30f8 100644 --- a/svx/source/dialog/ClassificationEditView.cxx +++ b/svx/source/dialog/ClassificationEditView.cxx @@ -58,7 +58,7 @@ void ClassificationEditView::InvertSelectionWeight() { ESelection aSelection = m_xEditView->GetSelection(); - for (sal_Int32 nParagraph = aSelection.nStartPara; nParagraph <= aSelection.nEndPara; ++nParagraph) + for (sal_Int32 nParagraph = aSelection.start.nPara; nParagraph <= aSelection.end.nPara; ++nParagraph) { FontWeight eFontWeight = WEIGHT_BOLD; diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 887fc445dc0c..60adda1d7136 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -160,7 +160,7 @@ void Style::Set( const SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWid } } -Style& Style::MirrorSelf() +void Style::MirrorSelf() { if (mfSecn) { @@ -173,8 +173,6 @@ Style& Style::MirrorSelf() { meRefMode = (meRefMode == RefMode::Begin) ? RefMode::End : RefMode::Begin; } - - return *this; } bool Style::operator==( const Style& rOther) const diff --git a/svx/source/dialog/gotodlg.cxx b/svx/source/dialog/gotodlg.cxx index 82842ff4acc0..286536903eb5 100644 --- a/svx/source/dialog/gotodlg.cxx +++ b/svx/source/dialog/gotodlg.cxx @@ -26,7 +26,6 @@ namespace svx GotoPageDlg::GotoPageDlg(weld::Window* pParent, const OUString& title, const OUString& label, sal_uInt16 curPagePos, sal_uInt16 pageCnt) : GenericDialogController(pParent, u"svx/ui/gotopagedialog.ui"_ustr, u"GotoPageDialog"_ustr) - , mnMaxPageCnt(1) , mxMtrPageCtrl(m_xBuilder->weld_spin_button(u"page"_ustr)) , mxPageNumberLbl(m_xBuilder->weld_label(u"page_count"_ustr)) , mxPageLbl(m_xBuilder->weld_label(u"page_label"_ustr)) @@ -34,33 +33,13 @@ GotoPageDlg::GotoPageDlg(weld::Window* pParent, const OUString& title, const OUS set_title(title); mxPageLbl->set_label(label); + mxMtrPageCtrl->set_range(1, pageCnt); mxMtrPageCtrl->set_value(curPagePos); - sal_uInt16 nTotalPage = pageCnt; OUString sStr = mxPageNumberLbl->get_label(); - mxPageNumberLbl->set_label(sStr.replaceFirst("$1", OUString::number(nTotalPage))); - mnMaxPageCnt = nTotalPage; + mxPageNumberLbl->set_label(sStr.replaceFirst("$1", OUString::number(pageCnt))); - mxMtrPageCtrl->connect_changed(LINK(this, GotoPageDlg, PageModifiedHdl)); - mxMtrPageCtrl->set_position(-1); mxMtrPageCtrl->select_region(0, -1); } - -IMPL_LINK_NOARG(GotoPageDlg, PageModifiedHdl, weld::Entry&, void) -{ - if (mxMtrPageCtrl->get_text().isEmpty()) - return; - - auto page_value = mxMtrPageCtrl->get_text().toInt32(); - - if (page_value <= 0) - mxMtrPageCtrl->set_value(1); - else if (page_value > mnMaxPageCnt) - mxMtrPageCtrl->set_value(mnMaxPageCnt); - else - mxMtrPageCtrl->set_value(page_value); - - mxMtrPageCtrl->set_position(-1); -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 2f1ff16a862d..18539c449b5b 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -287,12 +287,9 @@ bool WeldEditView::KeyInput(const KeyEvent& rKEvt) { if (nKey == KEY_A) { - EditEngine* pEditEngine = GetEditEngine(); - sal_Int32 nPar = pEditEngine->GetParagraphCount(); - if (nPar) + if (GetEditEngine()->GetParagraphCount()) { - sal_Int32 nLen = pEditEngine->GetTextLen(nPar - 1); - pEditView->SetSelection(ESelection(0, 0, nPar - 1, nLen)); + pEditView->SetSelection(ESelection::All()); } return true; } @@ -412,6 +409,7 @@ public: virtual bool InsertText(const OUString&, const ESelection&) override; virtual bool QuickFormatDoc(bool bFull = false) override; + virtual bool SupportsOutlineDepth() const override { return false; }; virtual sal_Int16 GetDepth(sal_Int32 nPara) const override; virtual bool SetDepth(sal_Int32 nPara, sal_Int16 nNewDepth) override; @@ -964,7 +962,7 @@ SfxItemSet WeldTextForwarder::GetAttribs(const ESelection& rSel, { EditEngine* pEditEngine = m_rEditAcc.GetEditEngine(); assert(pEditEngine && "EditEngine missing"); - if (rSel.nStartPara == rSel.nEndPara) + if (rSel.start.nPara == rSel.end.nPara) { GetAttribsFlags nFlags = GetAttribsFlags::NONE; switch (nOnlyHardAttrib) @@ -979,7 +977,8 @@ SfxItemSet WeldTextForwarder::GetAttribs(const ESelection& rSel, SAL_WARN("svx", "unknown flags for WeldTextForwarder::GetAttribs"); } - return pEditEngine->GetAttribs(rSel.nStartPara, rSel.nStartPos, rSel.nEndPos, nFlags); + return pEditEngine->GetAttribs(rSel.start.nPara, rSel.start.nIndex, rSel.end.nIndex, + nFlags); } else { @@ -1111,17 +1110,17 @@ static SfxItemState GetSvxEditEngineItemState(EditEngine const& rEditEngine, con SfxItemState eState = SfxItemState::DEFAULT; // check all paragraphs inside the selection - for (sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++) + for (sal_Int32 nPara = rSel.start.nPara; nPara <= rSel.end.nPara; nPara++) { SfxItemState eParaState = SfxItemState::DEFAULT; // calculate start and endpos for this paragraph sal_Int32 nPos = 0; - if (rSel.nStartPara == nPara) - nPos = rSel.nStartPos; + if (rSel.start.nPara == nPara) + nPos = rSel.start.nIndex; - sal_Int32 nEndPos = rSel.nEndPos; - if (rSel.nEndPara != nPara) + sal_Int32 nEndPos = rSel.end.nIndex; + if (rSel.end.nPara != nPara) nEndPos = rEditEngine.GetTextLen(nPara); // get list of char attribs @@ -1243,14 +1242,14 @@ tools::Rectangle WeldTextForwarder::GetCharBounds(sal_Int32 nPara, sal_Int32 nIn if (nIndex >= pEditEngine->GetTextLen(nPara)) { if (nIndex) - aRect = pEditEngine->GetCharacterBounds(EPosition(nPara, nIndex - 1)); + aRect = pEditEngine->GetCharacterBounds(EPaM(nPara, nIndex - 1)); aRect.Move(aRect.Right() - aRect.Left(), 0); aRect.SetSize(Size(1, pEditEngine->GetTextHeight())); } else { - aRect = pEditEngine->GetCharacterBounds(EPosition(nPara, nIndex)); + aRect = pEditEngine->GetCharacterBounds(EPaM(nPara, nIndex)); } } return aRect; @@ -1291,7 +1290,7 @@ bool WeldTextForwarder::GetIndexAtPoint(const Point& rPos, sal_Int32& nPara, EditEngine* pEditEngine = m_rEditAcc.GetEditEngine(); if (pEditEngine) { - EPosition aDocPos = pEditEngine->FindDocPosition(rPos); + EPaM aDocPos = pEditEngine->FindDocPosition(rPos); nPara = aDocPos.nPara; nIndex = aDocPos.nIndex; bRes = true; @@ -1306,13 +1305,13 @@ bool WeldTextForwarder::GetWordIndices(sal_Int32 nPara, sal_Int32 nIndex, sal_In EditEngine* pEditEngine = m_rEditAcc.GetEditEngine(); if (pEditEngine) { - ESelection aRes = pEditEngine->GetWord(ESelection(nPara, nIndex, nPara, nIndex), - css::i18n::WordType::DICTIONARY_WORD); + ESelection aRes + = pEditEngine->GetWord(ESelection(nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD); - if (aRes.nStartPara == nPara && aRes.nStartPara == aRes.nEndPara) + if (aRes.start.nPara == nPara && aRes.start.nPara == aRes.end.nPara) { - nStart = aRes.nStartPos; - nEnd = aRes.nEndPos; + nStart = aRes.start.nIndex; + nEnd = aRes.end.nIndex; bRes = true; } @@ -1444,7 +1443,7 @@ sal_Int32 WeldTextForwarder::AppendTextPortion(sal_Int32 nPara, const OUString& pEditEngine->QuickInsertText(rText, aSel); // set attributes for new appended text - nRes = aSel.nEndPos = pEditEngine->GetTextLen(nPara); + nRes = aSel.end.nIndex = pEditEngine->GetTextLen(nPara); pEditEngine->QuickSetAttribs(rSet, aSel); } return nRes; diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 59fa0f638188..4394201511d0 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -168,26 +168,6 @@ void FmEntryData::newObject( const css::uno::Reference< css::uno::XInterface >& } -FmEntryData::FmEntryData( const FmEntryData& rEntryData ) -{ - pChildList.reset( new FmEntryDataList() ); - aText = rEntryData.GetText(); - m_aNormalImage = rEntryData.GetNormalImage(); - pParent = rEntryData.GetParent(); - - FmEntryData* pChildData; - size_t nEntryCount = rEntryData.GetChildList()->size(); - for( size_t i = 0; i < nEntryCount; i++ ) - { - pChildData = rEntryData.GetChildList()->at( i ); - std::unique_ptr pNewChildData = pChildData->Clone(); - pChildList->insert( std::move(pNewChildData), size_t(-1) ); - } - - m_xNormalizedIFace = rEntryData.m_xNormalizedIFace; - m_xProperties = rEntryData.m_xProperties; - m_xChild = rEntryData.m_xChild; -} @@ -242,19 +222,6 @@ FmFormData::~FmFormData() { } -FmFormData::FmFormData( const FmFormData& rFormData ) - :FmEntryData( rFormData ) -{ - m_xForm = rFormData.GetFormIface(); -} - - -std::unique_ptr FmFormData::Clone() -{ - return std::unique_ptr(new FmFormData( *this )); -} - - bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) { if(this == pEntryData) @@ -291,19 +258,6 @@ FmControlData::~FmControlData() } -FmControlData::FmControlData( const FmControlData& rControlData ) - :FmEntryData( rControlData ) -{ - m_xFormComponent = rControlData.GetFormComponent(); -} - - -std::unique_ptr FmControlData::Clone() -{ - return std::unique_ptr(new FmControlData( *this )); -} - - OUString FmControlData::GetImage() const { // Default-Image diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 2cedf38ba9b1..d88eb91fb3ec 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -797,7 +797,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) break; case SID_FM_USE_WIZARDS: - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (!SvtModuleOptions().IsDataBaseInstalled()) rSet.Put( SfxVisibilityItem( nWhich, false ) ); else if (!GetFormModel()) rSet.DisableItem( nWhich ); @@ -819,7 +819,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) case SID_FM_NAVIGATIONBAR: case SID_FM_DBGRID: - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (!SvtModuleOptions().IsDataBaseInstalled()) { rSet.Put( SfxVisibilityItem( nWhich, false ) ); break; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 204bc81fef44..9f639657f385 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -992,7 +992,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj const & _rFormObject ) // #i46898# no wizards if there is no Base installed - currently, all wizards are // database related - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (!SvtModuleOptions().IsDataBaseInstalled()) return; if ( m_nControlWizardEvent ) diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index ca69f4de3ff4..8028c7eb3aa9 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -145,7 +145,6 @@ protected: public: FmEntryData( FmEntryData* pParentData, const css::uno::Reference< css::uno::XInterface >& _rIFace ); - FmEntryData( const FmEntryData& rEntryData ); virtual ~FmEntryData(); void SetText( const OUString& rText ){ aText = rText; } @@ -158,7 +157,6 @@ public: FmEntryDataList* GetChildList() const { return pChildList.get(); } virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ); - virtual std::unique_ptr Clone() = 0; // note that the interface returned is normalized, i.e. querying the given XInterface of the object // for XInterface must return the interface itself. @@ -227,13 +225,11 @@ class FmFormData final : public FmEntryData public: FmFormData(const css::uno::Reference< css::form::XForm >& _rxForm, FmFormData* _pParent); - FmFormData( const FmFormData& rFormData ); virtual ~FmFormData() override; const css::uno::Reference< css::form::XForm >& GetFormIface() const { return m_xForm; } virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) override; - virtual std::unique_ptr Clone() override; }; @@ -249,12 +245,10 @@ public: const css::uno::Reference< css::form::XFormComponent >& _rxComponent, FmFormData* _pParent ); - FmControlData( const FmControlData& rControlData ); virtual ~FmControlData() override; const css::uno::Reference< css::form::XFormComponent >& GetFormComponent() const { return m_xFormComponent; } virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) override; - virtual std::unique_ptr Clone() override; void ModelReplaced(const css::uno::Reference< css::form::XFormComponent >& _rxNew); }; diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 05a2ff8bcb2c..736b3ab76e7a 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -32,21 +32,21 @@ SvxB3DVectorItem::~SvxB3DVectorItem() SvxB3DVectorItem::SvxB3DVectorItem( TypedWhichId _nWhich, const basegfx::B3DVector& rVal ) : SfxPoolItem( _nWhich, SfxItemType::SvxB3DVectorItemType ), - aVal( rVal ) + m_aVal( rVal ) { } SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : SfxPoolItem( rItem ), - aVal( rItem.aVal ) + m_aVal( rItem.m_aVal ) { } bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { assert(SfxPoolItem::operator==(rItem)); - return static_cast(rItem).aVal == aVal; + return static_cast(rItem).m_aVal == m_aVal; } SvxB3DVectorItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const @@ -56,14 +56,14 @@ SvxB3DVectorItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { - assert(!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ())); + assert(!std::isnan(m_aVal.getX()) && !std::isnan(m_aVal.getY()) && !std::isnan(m_aVal.getZ())); drawing::Direction3D aDirection; // enter values - aDirection.DirectionX = aVal.getX(); - aDirection.DirectionY = aVal.getY(); - aDirection.DirectionZ = aVal.getZ(); + aDirection.DirectionX = m_aVal.getX(); + aDirection.DirectionY = m_aVal.getY(); + aDirection.DirectionZ = m_aVal.getZ(); rVal <<= aDirection; return true; @@ -77,11 +77,11 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) if(!(rVal >>= aDirection)) return false; - aVal.setX(aDirection.DirectionX); - aVal.setY(aDirection.DirectionY); - aVal.setZ(aDirection.DirectionZ); + m_aVal.setX(aDirection.DirectionX); + m_aVal.setY(aDirection.DirectionY); + m_aVal.setZ(aDirection.DirectionZ); - assert(!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ())); + assert(!std::isnan(m_aVal.getX()) && !std::isnan(m_aVal.getY()) && !std::isnan(m_aVal.getZ())); return true; } @@ -91,9 +91,9 @@ void SvxB3DVectorItem::dumpAsXml(xmlTextWriterPtr pWriter) const { (void)xmlTextWriterStartElement(pWriter, BAD_CAST("SvxB3DVectorItem")); (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); - (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("x"), BAD_CAST(OString::number(aVal.getX()).getStr())); - (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("y"), BAD_CAST(OString::number(aVal.getY()).getStr())); - (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("z"), BAD_CAST(OString::number(aVal.getZ()).getStr())); + (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("x"), BAD_CAST(OString::number(m_aVal.getX()).getStr())); + (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("y"), BAD_CAST(OString::number(m_aVal.getY()).getStr())); + (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("z"), BAD_CAST(OString::number(m_aVal.getZ()).getStr())); (void)xmlTextWriterEndElement(pWriter); } diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index 9430ac55ba3e..46dca806420b 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -287,7 +287,7 @@ void ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& /* // add a gray outline frame, except not when printing if(bCreateGrayFrame) { - const Color aFrameColor(aColorConfig.GetColorValue(svtools::OBJECTBOUNDARIES).nColor); + const Color aFrameColor(aColorConfig.GetColorValue(svtools::DOCBOUNDARIES).nColor); basegfx::B2DPolygon aOwnOutline(basegfx::utils::createUnitPolygon()); aOwnOutline.transform(aPageObjectTransform); diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 3bf04f40d64f..0d8d9d8c925a 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -73,11 +73,8 @@ namespace sdr::overlay mnBlinkTime(impCheckBlinkTimeValueRange(500)), mbOverlayState(false) { - if(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) - { - // no animation in high contrast mode + if (!MiscSettings::IsAnimatedOthersAllowed()) bAnimate = false; - } // set AllowsAnimation flag to mark this object as animation capable mbAllowsAnimation = bAnimate; diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index ff0b3a4a12f7..6f9284696d51 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -106,12 +106,6 @@ namespace sdr::overlay // not possible when in high contrast mode return OverlayType::Invert; } - - if(!pOut->SupportsOperation(OutDevSupportType::TransparentRect)) - { - // not possible when no fast transparence paint is supported on the system - return OverlayType::Invert; - } } } diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 5fe5d20ab784..6642005039eb 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -328,7 +328,7 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const aPolyPolygon.append(aInnerPolygon); // create fill primitive - if (basegfx::fTools::lessOrEqual(getTransparence(), 0.0)) + if (getTransparence() <= 0.0) { // no transparence aRetval = new PolyPolygonColorPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 88cc3cf9bc61..7c697103c0bb 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -67,7 +67,7 @@ namespace drawinglayer::primitive2d getWordWrap())); // put text glow before, shape glow and shadow - if (!aTempContentText.empty() && !getSdrSTAttribute().getGlowText().isDefault()) + if (!getSdrSTAttribute().getGlowText().isDefault()) { // add text glow aTempContentText = createEmbeddedTextGlowPrimitive(std::move(aTempContentText), getSdrSTAttribute().getGlowText()); diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 7868303c5c08..9bbb06dde830 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -117,7 +117,7 @@ namespace drawinglayer::primitive2d return new GroupPrimitive2D(std::move(aContainer)); const svtools::ColorConfig aColorConfig; - const svtools::ColorConfigValue aColor(aColorConfig.GetColorValue(svtools::OBJECTBOUNDARIES)); + const svtools::ColorConfigValue aColor(aColorConfig.GetColorValue(svtools::DOCBOUNDARIES)); if(aColor.bIsVisible) { diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index cdfd75a88b98..e66285e6bb6e 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -103,7 +103,7 @@ namespace drawinglayer::primitive2d false)); // put text glow before, shape glow and shadow - if (!aTempContentText.empty() && !getSdrLFSTAttribute().getGlowText().isDefault()) + if (!getSdrLFSTAttribute().getGlowText().isDefault()) { // add text glow aTempContentText = createEmbeddedTextGlowPrimitive(std::move(aTempContentText), getSdrLFSTAttribute().getGlowText()); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index bf19b885db5c..cabe52ab68b7 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -501,18 +501,18 @@ namespace sdr::properties { if(EE_FEATURE_FIELD == rAttrib.pAttr->Which()) { - aSel.nEndPos = rAttrib.nStart; + aSel.end.nIndex = rAttrib.nStart; - if(aSel.nStartPos != aSel.nEndPos) + if (aSel.start.nIndex != aSel.end.nIndex) pEditEngine->QuickSetAttribs(aColorSet, aSel); - aSel.nStartPos = rAttrib.nEnd; + aSel.start.nIndex = rAttrib.nEnd; } } - aSel.nEndPos = pEditEngine->GetTextLen(nPara); + aSel.end.nIndex = pEditEngine->GetTextLen(nPara); - if(aSel.nStartPos != aSel.nEndPos) + if (aSel.start.nIndex != aSel.end.nIndex) { pEditEngine->QuickSetAttribs( aColorSet, aSel ); } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 885dd8fcc277..7e2a812e430e 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1470,10 +1470,10 @@ void SdrDragMove::applyCurrentTransformationToSdrObject(SdrObject& rTarget) SdrDragMove::SdrDragMove(SdrDragView& rNewView) : SdrDragMethod(rNewView) - , nBestXSnap(0) - , nBestYSnap(0) - , bXSnapped(false) - , bYSnapped(false) + , m_nBestXSnap(0) + , m_nBestYSnap(0) + , m_bXSnapped(false) + , m_bYSnapped(false) { setMoveOnly(true); } @@ -1518,43 +1518,43 @@ void SdrDragMove::ImpCheckSnap(const Point& rPt) if (nRet & SdrSnap::XSNAPPED) { - if (bXSnapped) + if (m_bXSnapped) { - if (std::abs(aPt.X())GetParagraph(nParaCnt > 1 ? nParaCnt - 1 : 0); ESelection aESel(mpTextEditOutlinerView->GetSelection()); - if (aESel.nStartPara == 0 && aESel.nStartPos == 0 && aESel.nEndPara == (nParaCnt - 1)) + if (aESel.start.nPara == 0 && aESel.start.nIndex == 0 + && aESel.end.nPara == (nParaCnt - 1)) { - if (mpTextEditOutliner->GetText(pLastPara).getLength() == aESel.nEndPos) + if (mpTextEditOutliner->GetText(pLastPara).getLength() == aESel.end.nIndex) bRet = true; } // in case the selection was done backwards - if (!bRet && aESel.nEndPara == 0 && aESel.nEndPos == 0 - && aESel.nStartPara == (nParaCnt - 1)) + if (!bRet && aESel.end.nPara == 0 && aESel.end.nIndex == 0 + && aESel.start.nPara == (nParaCnt - 1)) { - if (mpTextEditOutliner->GetText(pLastPara).getLength() == aESel.nStartPos) + if (mpTextEditOutliner->GetText(pLastPara).getLength() == aESel.start.nIndex) bRet = true; } } @@ -2822,11 +2823,11 @@ sal_uInt16 SdrObjEditView::GetSelectionLevel() const return 0xFFFF; //start and end position ESelection aSelect = mpTextEditOutlinerView->GetSelection(); - sal_uInt16 nStartPara = ::std::min(aSelect.nStartPara, aSelect.nEndPara); - sal_uInt16 nEndPara = ::std::max(aSelect.nStartPara, aSelect.nEndPara); + sal_Int32 nStartPara = ::std::min(aSelect.start.nPara, aSelect.end.nPara); + sal_Int32 nEndPara = ::std::max(aSelect.start.nPara, aSelect.end.nPara); //get level from each paragraph sal_uInt16 nLevel = 0; - for (sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++) + for (sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++) { sal_Int16 nDepth = mpTextEditOutliner->GetDepth(nPara); assert(nDepth >= 0 && nDepth <= 15); @@ -3095,7 +3096,7 @@ void SdrObjEditView::ApplyFormatPaintBrush(SfxItemSet& rFormatSet, sal_Int16 nDe ESelection aSel(pOLV->GetSelection()); bool fullParaSelection - = aSel.nEndPara != aSel.nStartPara || pOLV->GetEditView().IsSelectionFullPara(); + = aSel.end.nPara != aSel.start.nPara || pOLV->GetEditView().IsSelectionFullPara(); if (!aSel.HasRange()) pOLV->SetSelection(rEditEngine.GetWord(aSel, css::i18n::WordType::DICTIONARY_WORD)); const bool bRemoveParaAttribs = !bNoParagraphFormats && !fullParaSelection; @@ -3107,7 +3108,7 @@ void SdrObjEditView::ApplyFormatPaintBrush(SfxItemSet& rFormatSet, sal_Int16 nDe pOLV->SetAttribs(aPaintSet); if (!bNoParagraphFormats && nDepth > -2) { - for (sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; ++nPara) + for (sal_Int32 nPara = aSel.start.nPara; nPara <= aSel.end.nPara; ++nPara) pOLV->SetDepth(nPara, nDepth); } } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index e744fc613a27..2d123a6a360e 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1317,7 +1317,7 @@ rtl::Reference SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText) // gray outline pClone->SetMergedItem(XLineStyleItem(css::drawing::LineStyle_SOLID)); const svtools::ColorConfig aColorConfig; - const svtools::ColorConfigValue aColor(aColorConfig.GetColorValue(svtools::OBJECTBOUNDARIES)); + const svtools::ColorConfigValue aColor(aColorConfig.GetColorValue(svtools::DOCBOUNDARIES)); pClone->SetMergedItem(XLineColorItem(OUString(), aColor.nColor)); // bitmap fill diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index f9c3716b9d60..0380a691cbe0 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -262,9 +262,10 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) tools::Rectangle aRectangle = svx::polygonToRectangle(aPol, maGeo); setRectangle(aRectangle); - if (bRotate90) { + if (bRotate90) + { bool bRota90=maGeo.m_nRotationAngle.get() % 9000 ==0; - if (bRotate90 && !bRota90) { // there's seems to be a rounding error occurring: correct it + if (!bRota90) { // there's seems to be a rounding error occurring: correct it Degree100 a=NormAngle36000(maGeo.m_nRotationAngle); if (a<4500_deg100) a=0_deg100; else if (a<13500_deg100) a=9000_deg100; diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 665e932a18c9..33f7fb5913d1 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1236,9 +1236,9 @@ OUString SdrView::GetStatusText() else if (IsTextEdit() && mpTextEditOutlinerView != nullptr) { aStr=SvxResId(STR_ViewTextEdit); // "TextEdit - Row y, Column x"; ESelection aSel(mpTextEditOutlinerView->GetSelection()); - tools::Long nPar = aSel.nEndPara,nLin=0,nCol=aSel.nEndPos; - if (aSel.nEndPara>0) { - for (sal_Int32 nParaNum=0; nParaNum0) { + for (sal_Int32 nParaNum=0; nParaNumGetLineCount(nParaNum); } } @@ -1246,11 +1246,11 @@ OUString SdrView::GetStatusText() // At the end of a line of any multi-line paragraph, we display the // position of the next line of the same paragraph, if there is one. sal_uInt16 nParaLine = 0; - sal_uInt32 nParaLineCount = mpTextEditOutliner->GetLineCount(aSel.nEndPara); + sal_uInt32 nParaLineCount = mpTextEditOutliner->GetLineCount(aSel.end.nPara); bool bBrk = false; while (!bBrk) { - sal_uInt16 nLen = mpTextEditOutliner->GetLineLen(aSel.nEndPara, nParaLine); + sal_uInt16 nLen = mpTextEditOutliner->GetLineLen(aSel.end.nPara, nParaLine); bool bLastLine = (nParaLine == nParaLineCount - 1); if (nCol>nLen || (!bLastLine && nCol == nLen)) { @@ -1270,7 +1270,7 @@ OUString SdrView::GetStatusText() aStr = aStr.replaceFirst("%3", OUString::number(nCol + 1)); #ifdef DBG_UTIL - aStr += ", Level " + OUString::number(mpTextEditOutliner->GetDepth( aSel.nEndPara )); + aStr += ", Level " + OUString::number(mpTextEditOutliner->GetDepth( aSel.end.nPara )); #endif } @@ -1396,8 +1396,7 @@ void SdrView::UnmarkAll() { if (IsTextEdit()) { ESelection eSel=GetTextEditOutlinerView()->GetSelection(); - eSel.nStartPara=eSel.nEndPara; - eSel.nStartPos=eSel.nEndPos; + eSel.CollapseToEnd(); GetTextEditOutlinerView()->SetSelection(eSel); } else if (HasMarkedGluePoints()) UnmarkAllGluePoints(); else if (HasMarkedPoints()) UnmarkAllPoints(); // Marked, not Markable! diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index ab4fa320275c..78d89e135ac7 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -705,7 +705,8 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const if(!aSdrObjects.empty()) { - sdr::contact::ObjectContactOfObjListPainter aPainter(rOut, std::move(aSdrObjects), aSdrObjects[0]->getSdrPageFromSdrObject()); + SdrPage* pPage = aSdrObjects[0]->getSdrPageFromSdrObject(); + sdr::contact::ObjectContactOfObjListPainter aPainter(rOut, std::move(aSdrObjects), pPage); sdr::contact::DisplayInfo aDisplayInfo; // do processing diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx index 51c4d1d8ef87..f9bb278f4272 100644 --- a/svx/source/svdraw/textchaincursor.cxx +++ b/svx/source/svdraw/textchaincursor.cxx @@ -78,7 +78,7 @@ void TextChainCursorManager::impDetectEvent(const KeyEvent& rKEvt, sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); ESelection aCurSel = pOLV->GetSelection(); - ESelection aEndSelPrevBox(100000, 100000); + ESelection aEndSelPrevBox(ESelection::AtEnd()); sal_Int32 nLastPara = pOutl->GetParagraphCount()-1; OUString aLastParaText = pOutl->GetText(pOutl->GetParagraph(nLastPara)); @@ -144,8 +144,7 @@ void TextChainCursorManager::HandleCursorEventAfterChaining( // Move to end of prev box SdrTextObj *pPrevLink = mpTextObj->GetPrevLinkInChain(); - ESelection aEndSel(100000, 100000); - impChangeEditingTextObj(pPrevLink, aEndSel); + impChangeEditingTextObj(pPrevLink, ESelection::AtEnd()); return; } diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index b7dc65cf7106..b41d208e221b 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -124,8 +124,8 @@ void TextChainFlow::impUpdateCursorInfo() ESelection aSelAtUFTime = GetTextChain()->GetPreChainingSel(GetLinkTarget()); // Might be an invalid selection if the cursor at UF time was before // the (possibly UF-induced) Overflowing point but we don't use it in that case - maPostChainingSel = ESelection(aSelAtUFTime.nStartPara-maOverflowPosSel.nStartPara, - aSelAtUFTime.nStartPos-maOverflowPosSel.nStartPos ); + maPostChainingSel = ESelection(aSelAtUFTime.start.nPara-maOverflowPosSel.start.nPara, + aSelAtUFTime.start.nIndex-maOverflowPosSel.start.nIndex ); } // XXX: It may not be necessary anymore to keep this method separated from EditingTextChainFlow::impBroadcastCursorInfo diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index fb99029d6e92..637305c9e6fc 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -760,7 +760,7 @@ void Cell::SetOutlinerParaObject( std::optional pTextObject { bool bNullTextObject = !pTextObject; SdrText::SetOutlinerParaObject( std::move(pTextObject) ); - maSelection.nStartPara = EE_PARA_MAX_COUNT; + maSelection.start.nPara = EE_PARA_MAX; if( bNullTextObject ) ForceOutlinerParaObject( OutlinerMode::TextObject ); @@ -1682,7 +1682,7 @@ void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRang OUString SAL_CALL Cell::getString( ) { - maSelection.nStartPara = EE_PARA_MAX_COUNT; + maSelection.start.nPara = EE_PARA_MAX; return SvxUnoTextBase::getString(); } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 22b3ab5c406d..ee32304f2d93 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2094,7 +2094,7 @@ void SvxTableController::EditCell(const CellPos& rPos, vcl::Window* pWindow, Tbl ((nAction == TblAction::GotoRightCell) && (eMode == WritingMode_RL_TB)); if( bLast ) - aNewSelection = ESelection::NotFound(); + aNewSelection = ESelection::AtEnd(); } pOLV->SetSelection(aNewSelection); } diff --git a/svx/source/table/tablehtmlimporter.cxx b/svx/source/table/tablehtmlimporter.cxx index 7f7aace887cc..e9e35b93fb05 100644 --- a/svx/source/table/tablehtmlimporter.cxx +++ b/svx/source/table/tablehtmlimporter.cxx @@ -196,12 +196,12 @@ IMPL_LINK(SdrTableHTMLParser, HTMLImportHdl, HtmlImportInfo&, rInfo, void) ProcToken(&rInfo); break; case HtmlImportState::End: - if (rInfo.aSelection.nEndPos) + if (rInfo.aSelection.end.nIndex) { mpActDefault = nullptr; //TODO: ?? // rInfo.nToken = RTF_PAR; - rInfo.aSelection.nEndPara++; + rInfo.aSelection.end.nPara++; ProcToken(&rInfo); } break; @@ -442,7 +442,7 @@ void SdrTableHTMLParser::ProcToken(HtmlImportInfo* pInfo) RowColSpan aRowColSpan = lcl_GetRowColSpan(options); mpActDefault->mnColSpan = aRowColSpan.mnColSpan; mpActDefault->mnRowSpan = aRowColSpan.mnRowSpan; - mnCellStartPara = pInfo->aSelection.nStartPara; + mnCellStartPara = pInfo->aSelection.start.nPara; } break; case HtmlTokenId::TABLEDATA_OFF: @@ -456,7 +456,7 @@ void SdrTableHTMLParser::ProcToken(HtmlImportInfo* pInfo) if (mpActDefault->mnColSpan > 0) { mpActDefault->mnCellX = maColumnEdges[mnCellInRow + mpActDefault->mnColSpan - 1]; - InsertCell(mnCellStartPara, pInfo->aSelection.nEndPara); + InsertCell(mnCellStartPara, pInfo->aSelection.end.nPara); } NextColumn(); } diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index c411636ebdd1..a2cc1de2ec5e 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -189,11 +189,11 @@ IMPL_LINK( SdrTableRTFParser, RTFImportHdl, RtfImportInfo&, rInfo, void ) } break; case RtfImportState::End: - if ( rInfo.aSelection.nEndPos ) + if ( rInfo.aSelection.end.nIndex ) { mpActDefault = nullptr; rInfo.nToken = RTF_PAR; - rInfo.aSelection.nEndPara++; + rInfo.aSelection.end.nPara++; ProcToken( &rInfo ); } break; @@ -219,7 +219,7 @@ void SdrTableRTFParser::InsertCell( RtfImportInfo const * pInfo ) RTFCellInfoPtr xCellInfo = std::make_shared(mrItemPool); xCellInfo->mnStartPara = mnStartPara; - xCellInfo->mnParaCount = pInfo->aSelection.nEndPara - 1 - mnStartPara; + xCellInfo->mnParaCount = pInfo->aSelection.end.nPara - 1 - mnStartPara; xCellInfo->mnCellX = mpActDefault->mnCellX; xCellInfo->mnRowSpan = mpActDefault->mnRowSpan; @@ -254,7 +254,7 @@ void SdrTableRTFParser::InsertCell( RtfImportInfo const * pInfo ) xColumn->push_back( xCellInfo ); } - mnStartPara = pInfo->aSelection.nEndPara - 1; + mnStartPara = pInfo->aSelection.end.nPara - 1; } void SdrTableRTFParser::InsertColumnEdge( sal_Int32 nEdge ) diff --git a/svx/uiconfig/ui/gotopagedialog.ui b/svx/uiconfig/ui/gotopagedialog.ui index 42ac5e2a7de3..9f9346ef0996 100644 --- a/svx/uiconfig/ui/gotopagedialog.ui +++ b/svx/uiconfig/ui/gotopagedialog.ui @@ -1,33 +1,40 @@ - + + + 1 + 100000 + 1 + 1 + 10 + - False - 6 + False + 6 Go to Page False True - 0 - 0 - dialog + 0 + 0 + dialog - False + False vertical 12 - False - end + False + end _OK True - True - True - True - False + True + True + True + False True @@ -40,8 +47,8 @@ _Cancel True - True - True + True + True True @@ -54,59 +61,59 @@ False True - end + end 0 - + True - False + False center - 6 - 12 - 12 + 6 + 12 + 12 True - False + False True of $1 0 - 2 - 0 + 2 + 0 True - True - page_value - True + True + True + 5 True - 5 + page_value - 1 - 0 + 1 + 0 True - False + False end Page: - True - page + True + page 0 - 0 - 0 + 0 + 0 @@ -122,15 +129,5 @@ ok cancel - - - - - - 1 - 100000 - 1 - 1 - 10 diff --git a/sw/CppunitTest_sw_htmlexport2.mk b/sw/CppunitTest_sw_htmlexport2.mk new file mode 100644 index 000000000000..4d2cb5884034 --- /dev/null +++ b/sw/CppunitTest_sw_htmlexport2.mk @@ -0,0 +1,80 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,sw_htmlexport2)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_htmlexport2)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_htmlexport2, \ + sw/qa/extras/htmlexport/htmlexport2 \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport2, \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18nlangtag \ + msfilter \ + sal \ + sfx \ + subsequenttest \ + sot \ + sw \ + swqahelper \ + svl \ + svt \ + test \ + tl \ + unotest \ + utl \ + vcl \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_htmlexport2,\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_htmlexport2,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_htmlexport2,\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_htmlexport2)) +$(eval $(call gb_CppunitTest_use_vcl,sw_htmlexport2)) + +$(eval $(call gb_CppunitTest_use_custom_headers,sw_htmlexport2,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_htmlexport2,services)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport2)) + +ifeq ($(OS),WNT) +# Initializing DocumentSignatureManager will require gpgme-w32spawn.exe in workdir/LinkTarget/Executable +# In fact, it is not even required to complete test successfully, but the dialog would stop execution +$(eval $(call gb_CppunitTest_use_packages,sw_htmlexport2,\ + $(call gb_Helper_optional,GPGMEPP,gpgmepp)\ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_tiledrendering2.mk b/sw/CppunitTest_sw_tiledrendering2.mk index 7716af0bfe25..401bde88aae1 100644 --- a/sw/CppunitTest_sw_tiledrendering2.mk +++ b/sw/CppunitTest_sw_tiledrendering2.mk @@ -14,7 +14,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_tiledrendering2)) $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_tiledrendering2)) $(eval $(call gb_CppunitTest_add_exception_objects,sw_tiledrendering2, \ - sw/qa/extras/tiledrendering2/tiledrendering2 \ + sw/qa/extras/tiledrendering/tiledrendering2 \ )) $(eval $(call gb_CppunitTest_use_libraries,sw_tiledrendering2, \ diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 6b53fbbbde2b..6d4ed9f55967 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_docbookexport \ CppunitTest_sw_fodfexport \ CppunitTest_sw_htmlexport \ + CppunitTest_sw_htmlexport2 \ CppunitTest_sw_xhtmlexport \ CppunitTest_sw_htmlimport \ CppunitTest_sw_indexingexport \ diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 02d06446328b..e6bef505a03c 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -157,6 +157,7 @@ class SwUINumRuleItem; #define FN_DRAW_WRAP_DLG TypedWhichId(FN_VIEW + 3) /* Draw wrapping dlg */ #define FN_RULER (FN_VIEW + 11) /* Horizontal ruler */ +#define FN_VIEW_BOUNDARIES (FN_VIEW + 12) /* View text, section, table boundaries */ #define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* View graphic */ #define FN_VIEW_BOUNDS (FN_VIEW + 14) /* View bounds */ #define FN_VIEW_FIELDS (FN_VIEW + 15) /* View fields */ @@ -164,6 +165,7 @@ class SwUINumRuleItem; #define FN_VSCROLLBAR (FN_VIEW + 17) /* Vertical Scrollbar */ #define FN_HSCROLLBAR (FN_VIEW + 18) /* Horizontal Scrollbar */ #define FN_VIEW_SECTION_BOUNDARIES (FN_VIEW + 19) /* View section boundaries */ +// slot number 20220 conflicts with FN_BUL_NUM_RULE_INDEX! #define FN_VIEW_META_CHARS (FN_VIEW + 24) /* View meta chars */ #define FN_VIEW_MARKS (FN_VIEW + 25) /* View marks */ diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 2d7f279c8aa3..2fc9598401cc 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -663,7 +663,7 @@ public: // select the given range of OutlineNodes. Optionally including the children // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell) void MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineNodes::size_type nEndPos, - bool bWithChildren, bool bKillPams = true ); + bool bWithChildren, bool bKillPams = true, SwOutlineNodesInline* pOutlNdsInline = nullptr); bool GotoNextOutline(); bool GotoPrevOutline(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7d0c2955721e..ca8da4e293e3 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1050,7 +1050,9 @@ public: bool OutlineUpDown(const SwPaM& rPam, short nOffset, SwRootFrame const* pLayout = nullptr); /// Outline - move up / move down. - bool MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type nOffset); + bool MoveOutlinePara( const SwPaM& rPam, + SwOutlineNodes::difference_type nOffset, + SwOutlineNodesInline* pOutlNdsInline = nullptr); SW_DLLPUBLIC bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame const* = nullptr) const; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 0e9d8064901b..5a16812e89da 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -498,7 +498,8 @@ public: bool OutlineUpDown( short nOffset = 1 ); - bool MoveOutlinePara( SwOutlineNodes::difference_type nOffset ); + bool MoveOutlinePara( SwOutlineNodes::difference_type nOffset, + SwOutlineNodesInline* pOutlineNodesInline = nullptr ); bool IsProtectedOutlinePara() const; diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 75d0f0e51a0a..546ef7019c08 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -193,62 +193,62 @@ inline constexpr OUString CH_TXT_ATR_SUBST_FIELDEND = u"]"_ustr; * Enums for the hints */ -constexpr sal_uInt16 HINT_BEGIN = 1; +inline constexpr sal_uInt16 HINT_BEGIN = 1; -constexpr sal_uInt16 POOLATTR_BEGIN(HINT_BEGIN); +inline constexpr sal_uInt16 POOLATTR_BEGIN(HINT_BEGIN); // Ranges for the IDs of the format-attributes. // Which-values for character-format attributes. -constexpr sal_uInt16 RES_CHRATR_BEGIN(HINT_BEGIN); -constexpr TypedWhichId RES_CHRATR_CASEMAP(RES_CHRATR_BEGIN); // 1 -constexpr TypedWhichId RES_CHRATR_CHARSETCOLOR(2); -constexpr TypedWhichId RES_CHRATR_COLOR(3); -constexpr TypedWhichId RES_CHRATR_CONTOUR(4); -constexpr TypedWhichId RES_CHRATR_CROSSEDOUT(5); -constexpr TypedWhichId RES_CHRATR_ESCAPEMENT(6); -constexpr TypedWhichId RES_CHRATR_FONT(7); -constexpr TypedWhichId RES_CHRATR_FONTSIZE(8); -constexpr TypedWhichId RES_CHRATR_KERNING(9); -constexpr TypedWhichId RES_CHRATR_LANGUAGE(10); -constexpr TypedWhichId RES_CHRATR_POSTURE(11); -constexpr TypedWhichId RES_CHRATR_UNUSED1(12); -constexpr TypedWhichId RES_CHRATR_SHADOWED(13); -constexpr TypedWhichId RES_CHRATR_UNDERLINE(14); -constexpr TypedWhichId RES_CHRATR_WEIGHT(15); -constexpr TypedWhichId RES_CHRATR_WORDLINEMODE(16); -constexpr TypedWhichId RES_CHRATR_AUTOKERN(17); -constexpr TypedWhichId RES_CHRATR_BLINK(18); -constexpr TypedWhichId RES_CHRATR_NOHYPHEN(19); -constexpr TypedWhichId RES_CHRATR_UNUSED2(20); -constexpr TypedWhichId RES_CHRATR_BACKGROUND(21); -constexpr TypedWhichId RES_CHRATR_CJK_FONT(22); -constexpr TypedWhichId RES_CHRATR_CJK_FONTSIZE(23); -constexpr TypedWhichId RES_CHRATR_CJK_LANGUAGE(24); -constexpr TypedWhichId RES_CHRATR_CJK_POSTURE(25); -constexpr TypedWhichId RES_CHRATR_CJK_WEIGHT(26); -constexpr TypedWhichId RES_CHRATR_CTL_FONT(27); -constexpr TypedWhichId RES_CHRATR_CTL_FONTSIZE(28); -constexpr TypedWhichId RES_CHRATR_CTL_LANGUAGE(29); -constexpr TypedWhichId RES_CHRATR_CTL_POSTURE(30); -constexpr TypedWhichId RES_CHRATR_CTL_WEIGHT(31); -constexpr TypedWhichId RES_CHRATR_ROTATE(32); -constexpr TypedWhichId RES_CHRATR_EMPHASIS_MARK(33); -constexpr TypedWhichId RES_CHRATR_TWO_LINES(34); -constexpr TypedWhichId RES_CHRATR_SCALEW(35); -constexpr TypedWhichId RES_CHRATR_RELIEF(36); -constexpr TypedWhichId RES_CHRATR_HIDDEN(37); -constexpr TypedWhichId RES_CHRATR_OVERLINE(38); -constexpr TypedWhichId RES_CHRATR_RSID(39); -constexpr TypedWhichId RES_CHRATR_BOX(40); -constexpr TypedWhichId RES_CHRATR_SHADOW(41); -constexpr TypedWhichId RES_CHRATR_HIGHLIGHT(42); -constexpr TypedWhichId RES_CHRATR_GRABBAG(43); -constexpr TypedWhichId RES_CHRATR_BIDIRTL(44); -constexpr TypedWhichId RES_CHRATR_IDCTHINT(45); -constexpr sal_uInt16 RES_CHRATR_END(46); +inline constexpr sal_uInt16 RES_CHRATR_BEGIN(HINT_BEGIN); +inline constexpr TypedWhichId RES_CHRATR_CASEMAP(RES_CHRATR_BEGIN); // 1 +inline constexpr TypedWhichId RES_CHRATR_CHARSETCOLOR(2); +inline constexpr TypedWhichId RES_CHRATR_COLOR(3); +inline constexpr TypedWhichId RES_CHRATR_CONTOUR(4); +inline constexpr TypedWhichId RES_CHRATR_CROSSEDOUT(5); +inline constexpr TypedWhichId RES_CHRATR_ESCAPEMENT(6); +inline constexpr TypedWhichId RES_CHRATR_FONT(7); +inline constexpr TypedWhichId RES_CHRATR_FONTSIZE(8); +inline constexpr TypedWhichId RES_CHRATR_KERNING(9); +inline constexpr TypedWhichId RES_CHRATR_LANGUAGE(10); +inline constexpr TypedWhichId RES_CHRATR_POSTURE(11); +inline constexpr TypedWhichId RES_CHRATR_UNUSED1(12); +inline constexpr TypedWhichId RES_CHRATR_SHADOWED(13); +inline constexpr TypedWhichId RES_CHRATR_UNDERLINE(14); +inline constexpr TypedWhichId RES_CHRATR_WEIGHT(15); +inline constexpr TypedWhichId RES_CHRATR_WORDLINEMODE(16); +inline constexpr TypedWhichId RES_CHRATR_AUTOKERN(17); +inline constexpr TypedWhichId RES_CHRATR_BLINK(18); +inline constexpr TypedWhichId RES_CHRATR_NOHYPHEN(19); +inline constexpr TypedWhichId RES_CHRATR_UNUSED2(20); +inline constexpr TypedWhichId RES_CHRATR_BACKGROUND(21); +inline constexpr TypedWhichId RES_CHRATR_CJK_FONT(22); +inline constexpr TypedWhichId RES_CHRATR_CJK_FONTSIZE(23); +inline constexpr TypedWhichId RES_CHRATR_CJK_LANGUAGE(24); +inline constexpr TypedWhichId RES_CHRATR_CJK_POSTURE(25); +inline constexpr TypedWhichId RES_CHRATR_CJK_WEIGHT(26); +inline constexpr TypedWhichId RES_CHRATR_CTL_FONT(27); +inline constexpr TypedWhichId RES_CHRATR_CTL_FONTSIZE(28); +inline constexpr TypedWhichId RES_CHRATR_CTL_LANGUAGE(29); +inline constexpr TypedWhichId RES_CHRATR_CTL_POSTURE(30); +inline constexpr TypedWhichId RES_CHRATR_CTL_WEIGHT(31); +inline constexpr TypedWhichId RES_CHRATR_ROTATE(32); +inline constexpr TypedWhichId RES_CHRATR_EMPHASIS_MARK(33); +inline constexpr TypedWhichId RES_CHRATR_TWO_LINES(34); +inline constexpr TypedWhichId RES_CHRATR_SCALEW(35); +inline constexpr TypedWhichId RES_CHRATR_RELIEF(36); +inline constexpr TypedWhichId RES_CHRATR_HIDDEN(37); +inline constexpr TypedWhichId RES_CHRATR_OVERLINE(38); +inline constexpr TypedWhichId RES_CHRATR_RSID(39); +inline constexpr TypedWhichId RES_CHRATR_BOX(40); +inline constexpr TypedWhichId RES_CHRATR_SHADOW(41); +inline constexpr TypedWhichId RES_CHRATR_HIGHLIGHT(42); +inline constexpr TypedWhichId RES_CHRATR_GRABBAG(43); +inline constexpr TypedWhichId RES_CHRATR_BIDIRTL(44); +inline constexpr TypedWhichId RES_CHRATR_IDCTHINT(45); +inline constexpr sal_uInt16 RES_CHRATR_END(46); // this Attribute used only in a TextNodes SwpAttr-Array -constexpr sal_uInt16 RES_TXTATR_BEGIN(RES_CHRATR_END); +inline constexpr sal_uInt16 RES_TXTATR_BEGIN(RES_CHRATR_END); /** text attributes with start and end. #i105453#: @@ -266,196 +266,197 @@ constexpr sal_uInt16 RES_TXTATR_BEGIN(RES_CHRATR_END); - INETFMT should precede CJK_RUBY (for UNO API it does not matter...) - META and METAFIELD must precede CJK_RUBY and INETFMT */ -constexpr sal_uInt16 RES_TXTATR_WITHEND_BEGIN(RES_TXTATR_BEGIN); -constexpr TypedWhichId RES_TXTATR_REFMARK(RES_TXTATR_WITHEND_BEGIN); // 46 -constexpr TypedWhichId RES_TXTATR_TOXMARK(47); -constexpr TypedWhichId RES_TXTATR_META(48); -constexpr TypedWhichId RES_TXTATR_METAFIELD(49); -constexpr TypedWhichId RES_TXTATR_AUTOFMT(50); -constexpr TypedWhichId RES_TXTATR_INETFMT(51); -constexpr TypedWhichId RES_TXTATR_CHARFMT(52); -constexpr TypedWhichId RES_TXTATR_CJK_RUBY(53); -constexpr TypedWhichId RES_TXTATR_UNKNOWN_CONTAINER(54); -constexpr TypedWhichId RES_TXTATR_INPUTFIELD(55); -constexpr TypedWhichId RES_TXTATR_CONTENTCONTROL(56); -constexpr sal_uInt16 RES_TXTATR_WITHEND_END(57); +inline constexpr sal_uInt16 RES_TXTATR_WITHEND_BEGIN(RES_TXTATR_BEGIN); +inline constexpr TypedWhichId RES_TXTATR_REFMARK(RES_TXTATR_WITHEND_BEGIN); // 46 +inline constexpr TypedWhichId RES_TXTATR_TOXMARK(47); +inline constexpr TypedWhichId RES_TXTATR_META(48); +inline constexpr TypedWhichId RES_TXTATR_METAFIELD(49); +inline constexpr TypedWhichId RES_TXTATR_AUTOFMT(50); +inline constexpr TypedWhichId RES_TXTATR_INETFMT(51); +inline constexpr TypedWhichId RES_TXTATR_CHARFMT(52); +inline constexpr TypedWhichId RES_TXTATR_CJK_RUBY(53); +inline constexpr TypedWhichId RES_TXTATR_UNKNOWN_CONTAINER(54); +inline constexpr TypedWhichId RES_TXTATR_INPUTFIELD(55); +inline constexpr TypedWhichId RES_TXTATR_CONTENTCONTROL(56); +inline constexpr sal_uInt16 RES_TXTATR_WITHEND_END(57); // all TextAttributes without an end -constexpr sal_uInt16 RES_TXTATR_NOEND_BEGIN(RES_TXTATR_WITHEND_END); -constexpr TypedWhichId RES_TXTATR_FIELD(RES_TXTATR_NOEND_BEGIN); // 57 -constexpr TypedWhichId RES_TXTATR_FLYCNT(58); -constexpr TypedWhichId RES_TXTATR_FTN(59); -constexpr TypedWhichId RES_TXTATR_ANNOTATION(60); -constexpr TypedWhichId RES_TXTATR_LINEBREAK(61); -constexpr TypedWhichId RES_TXTATR_DUMMY1(62); -constexpr sal_uInt16 RES_TXTATR_NOEND_END(63); -constexpr sal_uInt16 RES_TXTATR_END(RES_TXTATR_NOEND_END); +inline constexpr sal_uInt16 RES_TXTATR_NOEND_BEGIN(RES_TXTATR_WITHEND_END); +inline constexpr TypedWhichId RES_TXTATR_FIELD(RES_TXTATR_NOEND_BEGIN); // 57 +inline constexpr TypedWhichId RES_TXTATR_FLYCNT(58); +inline constexpr TypedWhichId RES_TXTATR_FTN(59); +inline constexpr TypedWhichId RES_TXTATR_ANNOTATION(60); +inline constexpr TypedWhichId RES_TXTATR_LINEBREAK(61); +inline constexpr TypedWhichId RES_TXTATR_DUMMY1(62); +inline constexpr sal_uInt16 RES_TXTATR_NOEND_END(63); +inline constexpr sal_uInt16 RES_TXTATR_END(RES_TXTATR_NOEND_END); -constexpr sal_uInt16 RES_PARATR_BEGIN(RES_TXTATR_END); -constexpr TypedWhichId RES_PARATR_LINESPACING(RES_PARATR_BEGIN); // 63 -constexpr TypedWhichId RES_PARATR_ADJUST(64); -constexpr TypedWhichId RES_PARATR_SPLIT(65); -constexpr TypedWhichId RES_PARATR_ORPHANS(66); -constexpr TypedWhichId RES_PARATR_WIDOWS(67); -constexpr TypedWhichId RES_PARATR_TABSTOP(68); -constexpr TypedWhichId RES_PARATR_HYPHENZONE(69); -constexpr TypedWhichId RES_PARATR_DROP(70); -constexpr TypedWhichId RES_PARATR_REGISTER(71); -constexpr TypedWhichId RES_PARATR_NUMRULE(72); -constexpr TypedWhichId RES_PARATR_SCRIPTSPACE(73); -constexpr TypedWhichId RES_PARATR_HANGINGPUNCTUATION(74); -constexpr TypedWhichId RES_PARATR_FORBIDDEN_RULES(75); -constexpr TypedWhichId RES_PARATR_VERTALIGN(76); -constexpr TypedWhichId RES_PARATR_SNAPTOGRID(77); -constexpr TypedWhichId RES_PARATR_CONNECT_BORDER(78); -constexpr TypedWhichId RES_PARATR_OUTLINELEVEL(79); -constexpr TypedWhichId RES_PARATR_RSID(80); -constexpr TypedWhichId RES_PARATR_GRABBAG(81); -constexpr sal_uInt16 RES_PARATR_END(82); +inline constexpr sal_uInt16 RES_PARATR_BEGIN(RES_TXTATR_END); +inline constexpr TypedWhichId RES_PARATR_LINESPACING(RES_PARATR_BEGIN); // 63 +inline constexpr TypedWhichId RES_PARATR_ADJUST(64); +inline constexpr TypedWhichId RES_PARATR_SPLIT(65); +inline constexpr TypedWhichId RES_PARATR_ORPHANS(66); +inline constexpr TypedWhichId RES_PARATR_WIDOWS(67); +inline constexpr TypedWhichId RES_PARATR_TABSTOP(68); +inline constexpr TypedWhichId RES_PARATR_HYPHENZONE(69); +inline constexpr TypedWhichId RES_PARATR_DROP(70); +inline constexpr TypedWhichId RES_PARATR_REGISTER(71); +inline constexpr TypedWhichId RES_PARATR_NUMRULE(72); +inline constexpr TypedWhichId RES_PARATR_SCRIPTSPACE(73); +inline constexpr TypedWhichId RES_PARATR_HANGINGPUNCTUATION(74); +inline constexpr TypedWhichId RES_PARATR_FORBIDDEN_RULES(75); +inline constexpr TypedWhichId RES_PARATR_VERTALIGN(76); +inline constexpr TypedWhichId RES_PARATR_SNAPTOGRID(77); +inline constexpr TypedWhichId RES_PARATR_CONNECT_BORDER(78); +inline constexpr TypedWhichId RES_PARATR_OUTLINELEVEL(79); +inline constexpr TypedWhichId RES_PARATR_RSID(80); +inline constexpr TypedWhichId RES_PARATR_GRABBAG(81); +inline constexpr sal_uInt16 RES_PARATR_END(82); // list attributes for paragraphs. // intentionally these list attributes are not contained in paragraph styles -constexpr sal_uInt16 RES_PARATR_LIST_BEGIN(RES_PARATR_END); -constexpr TypedWhichId RES_PARATR_LIST_ID(RES_PARATR_LIST_BEGIN); // 82 -constexpr TypedWhichId RES_PARATR_LIST_LEVEL(83); -constexpr TypedWhichId RES_PARATR_LIST_ISRESTART(84); -constexpr TypedWhichId RES_PARATR_LIST_RESTARTVALUE(85); -constexpr TypedWhichId RES_PARATR_LIST_ISCOUNTED(86); -constexpr TypedWhichId +inline constexpr sal_uInt16 RES_PARATR_LIST_BEGIN(RES_PARATR_END); +inline constexpr TypedWhichId RES_PARATR_LIST_ID(RES_PARATR_LIST_BEGIN); // 82 +inline constexpr TypedWhichId RES_PARATR_LIST_LEVEL(83); +inline constexpr TypedWhichId RES_PARATR_LIST_ISRESTART(84); +inline constexpr TypedWhichId RES_PARATR_LIST_RESTARTVALUE(85); +inline constexpr TypedWhichId RES_PARATR_LIST_ISCOUNTED(86); +inline constexpr TypedWhichId RES_PARATR_LIST_AUTOFMT(87); //TypedWhichId(87) -constexpr sal_uInt16 RES_PARATR_LIST_END(88); +inline constexpr sal_uInt16 RES_PARATR_LIST_END(88); -constexpr sal_uInt16 RES_FRMATR_BEGIN(RES_PARATR_LIST_END); -constexpr TypedWhichId RES_FILL_ORDER(RES_FRMATR_BEGIN); -constexpr TypedWhichId RES_FRM_SIZE(89); -constexpr TypedWhichId RES_PAPER_BIN(90); -constexpr TypedWhichId RES_MARGIN_FIRSTLINE(91); -constexpr TypedWhichId RES_MARGIN_TEXTLEFT(92); -constexpr TypedWhichId RES_MARGIN_RIGHT(93); -constexpr TypedWhichId RES_MARGIN_LEFT(94); -constexpr TypedWhichId RES_MARGIN_GUTTER(95); -constexpr TypedWhichId RES_MARGIN_GUTTER_RIGHT(96); -constexpr TypedWhichId RES_LR_SPACE(97); -constexpr TypedWhichId RES_UL_SPACE(98); -constexpr TypedWhichId RES_PAGEDESC(99); -constexpr TypedWhichId RES_BREAK(100); -constexpr TypedWhichId RES_CNTNT(101); -constexpr TypedWhichId RES_HEADER(102); -constexpr TypedWhichId RES_FOOTER(103); -constexpr TypedWhichId RES_PRINT(104); -constexpr TypedWhichId RES_OPAQUE(105); -constexpr TypedWhichId RES_PROTECT(106); -constexpr TypedWhichId RES_SURROUND(107); -constexpr TypedWhichId RES_VERT_ORIENT(108); -constexpr TypedWhichId RES_HORI_ORIENT(109); -constexpr TypedWhichId RES_ANCHOR(110); -constexpr TypedWhichId RES_BACKGROUND(111); -constexpr TypedWhichId RES_BOX(112); -constexpr TypedWhichId RES_SHADOW(113); -constexpr TypedWhichId RES_FRMMACRO(114); -constexpr TypedWhichId RES_COL(115); -constexpr TypedWhichId RES_KEEP(116); -constexpr TypedWhichId RES_URL(117); -constexpr TypedWhichId RES_EDIT_IN_READONLY(118); -constexpr TypedWhichId RES_LAYOUT_SPLIT(119); -constexpr TypedWhichId RES_CHAIN(120); -constexpr TypedWhichId RES_TEXTGRID(121); -constexpr TypedWhichId RES_LINENUMBER(122); -constexpr TypedWhichId RES_FTN_AT_TXTEND(123); -constexpr TypedWhichId RES_END_AT_TXTEND(124); -constexpr TypedWhichId RES_COLUMNBALANCE(125); -constexpr TypedWhichId RES_FRAMEDIR(126); -constexpr TypedWhichId RES_HEADER_FOOTER_EAT_SPACING(127); -constexpr TypedWhichId RES_ROW_SPLIT(128); -constexpr TypedWhichId RES_FLY_SPLIT(129); -constexpr TypedWhichId RES_FOLLOW_TEXT_FLOW(130); -constexpr TypedWhichId RES_COLLAPSING_BORDERS(131); -constexpr TypedWhichId RES_WRAP_INFLUENCE_ON_OBJPOS(132); -constexpr TypedWhichId RES_AUTO_STYLE(133); -constexpr TypedWhichId RES_FRMATR_STYLE_NAME(134); -constexpr TypedWhichId RES_FRMATR_CONDITIONAL_STYLE_NAME(135); -constexpr TypedWhichId RES_FRMATR_GRABBAG(136); -constexpr TypedWhichId RES_TEXT_VERT_ADJUST(137); -constexpr TypedWhichId RES_BACKGROUND_FULL_SIZE(138); -constexpr TypedWhichId RES_RTL_GUTTER(139); -constexpr TypedWhichId RES_DECORATIVE(140); -constexpr TypedWhichId RES_WRAP_TEXT_AT_FLY_START(141); -constexpr sal_uInt16 RES_FRMATR_END(142); +inline constexpr sal_uInt16 RES_FRMATR_BEGIN(RES_PARATR_LIST_END); +inline constexpr TypedWhichId RES_FILL_ORDER(RES_FRMATR_BEGIN); +inline constexpr TypedWhichId RES_FRM_SIZE(89); +inline constexpr TypedWhichId RES_PAPER_BIN(90); +inline constexpr TypedWhichId RES_MARGIN_FIRSTLINE(91); +inline constexpr TypedWhichId RES_MARGIN_TEXTLEFT(92); +inline constexpr TypedWhichId RES_MARGIN_RIGHT(93); +inline constexpr TypedWhichId RES_MARGIN_LEFT(94); +inline constexpr TypedWhichId RES_MARGIN_GUTTER(95); +inline constexpr TypedWhichId RES_MARGIN_GUTTER_RIGHT(96); +inline constexpr TypedWhichId RES_LR_SPACE(97); +inline constexpr TypedWhichId RES_UL_SPACE(98); +inline constexpr TypedWhichId RES_PAGEDESC(99); +inline constexpr TypedWhichId RES_BREAK(100); +inline constexpr TypedWhichId RES_CNTNT(101); +inline constexpr TypedWhichId RES_HEADER(102); +inline constexpr TypedWhichId RES_FOOTER(103); +inline constexpr TypedWhichId RES_PRINT(104); +inline constexpr TypedWhichId RES_OPAQUE(105); +inline constexpr TypedWhichId RES_PROTECT(106); +inline constexpr TypedWhichId RES_SURROUND(107); +inline constexpr TypedWhichId RES_VERT_ORIENT(108); +inline constexpr TypedWhichId RES_HORI_ORIENT(109); +inline constexpr TypedWhichId RES_ANCHOR(110); +inline constexpr TypedWhichId RES_BACKGROUND(111); +inline constexpr TypedWhichId RES_BOX(112); +inline constexpr TypedWhichId RES_SHADOW(113); +inline constexpr TypedWhichId RES_FRMMACRO(114); +inline constexpr TypedWhichId RES_COL(115); +inline constexpr TypedWhichId RES_KEEP(116); +inline constexpr TypedWhichId RES_URL(117); +inline constexpr TypedWhichId RES_EDIT_IN_READONLY(118); +inline constexpr TypedWhichId RES_LAYOUT_SPLIT(119); +inline constexpr TypedWhichId RES_CHAIN(120); +inline constexpr TypedWhichId RES_TEXTGRID(121); +inline constexpr TypedWhichId RES_LINENUMBER(122); +inline constexpr TypedWhichId RES_FTN_AT_TXTEND(123); +inline constexpr TypedWhichId RES_END_AT_TXTEND(124); +inline constexpr TypedWhichId RES_COLUMNBALANCE(125); +inline constexpr TypedWhichId RES_FRAMEDIR(126); +inline constexpr TypedWhichId RES_HEADER_FOOTER_EAT_SPACING(127); +inline constexpr TypedWhichId RES_ROW_SPLIT(128); +inline constexpr TypedWhichId RES_FLY_SPLIT(129); +inline constexpr TypedWhichId RES_FOLLOW_TEXT_FLOW(130); +inline constexpr TypedWhichId RES_COLLAPSING_BORDERS(131); +inline constexpr TypedWhichId RES_WRAP_INFLUENCE_ON_OBJPOS(132); +inline constexpr TypedWhichId RES_AUTO_STYLE(133); +inline constexpr TypedWhichId RES_FRMATR_STYLE_NAME(134); +inline constexpr TypedWhichId RES_FRMATR_CONDITIONAL_STYLE_NAME(135); +inline constexpr TypedWhichId RES_FRMATR_GRABBAG(136); +inline constexpr TypedWhichId RES_TEXT_VERT_ADJUST(137); +inline constexpr TypedWhichId RES_BACKGROUND_FULL_SIZE(138); +inline constexpr TypedWhichId RES_RTL_GUTTER(139); +inline constexpr TypedWhichId RES_DECORATIVE(140); +inline constexpr TypedWhichId RES_WRAP_TEXT_AT_FLY_START(141); +inline constexpr sal_uInt16 RES_FRMATR_END(142); -constexpr sal_uInt16 RES_GRFATR_BEGIN(RES_FRMATR_END); -constexpr TypedWhichId RES_GRFATR_MIRRORGRF(RES_GRFATR_BEGIN); -constexpr TypedWhichId RES_GRFATR_CROPGRF(143); +inline constexpr sal_uInt16 RES_GRFATR_BEGIN(RES_FRMATR_END); +inline constexpr TypedWhichId RES_GRFATR_MIRRORGRF(RES_GRFATR_BEGIN); +inline constexpr TypedWhichId RES_GRFATR_CROPGRF(143); -constexpr TypedWhichId RES_GRFATR_ROTATION(144); -constexpr TypedWhichId RES_GRFATR_LUMINANCE(145); -constexpr TypedWhichId RES_GRFATR_CONTRAST(146); -constexpr TypedWhichId RES_GRFATR_CHANNELR(147); -constexpr TypedWhichId RES_GRFATR_CHANNELG(148); -constexpr TypedWhichId RES_GRFATR_CHANNELB(149); -constexpr TypedWhichId RES_GRFATR_GAMMA(150); -constexpr TypedWhichId RES_GRFATR_INVERT(151); -constexpr TypedWhichId RES_GRFATR_TRANSPARENCY(152); -constexpr TypedWhichId RES_GRFATR_DRAWMODE(153); +inline constexpr TypedWhichId RES_GRFATR_ROTATION(144); +inline constexpr TypedWhichId RES_GRFATR_LUMINANCE(145); +inline constexpr TypedWhichId RES_GRFATR_CONTRAST(146); +inline constexpr TypedWhichId RES_GRFATR_CHANNELR(147); +inline constexpr TypedWhichId RES_GRFATR_CHANNELG(148); +inline constexpr TypedWhichId RES_GRFATR_CHANNELB(149); +inline constexpr TypedWhichId RES_GRFATR_GAMMA(150); +inline constexpr TypedWhichId RES_GRFATR_INVERT(151); +inline constexpr TypedWhichId RES_GRFATR_TRANSPARENCY(152); +inline constexpr TypedWhichId RES_GRFATR_DRAWMODE(153); -constexpr TypedWhichId RES_GRFATR_DUMMY4(154); -constexpr TypedWhichId RES_GRFATR_DUMMY5(155); -constexpr sal_uInt16 RES_GRFATR_END(156); +inline constexpr TypedWhichId RES_GRFATR_DUMMY4(154); +inline constexpr TypedWhichId RES_GRFATR_DUMMY5(155); +inline constexpr sal_uInt16 RES_GRFATR_END(156); -constexpr sal_uInt16 RES_BOXATR_BEGIN(RES_GRFATR_END); -constexpr TypedWhichId RES_BOXATR_FORMAT(RES_BOXATR_BEGIN); -constexpr TypedWhichId RES_BOXATR_FORMULA(157); -constexpr TypedWhichId RES_BOXATR_VALUE(158); -constexpr sal_uInt16 RES_BOXATR_END(159); +inline constexpr sal_uInt16 RES_BOXATR_BEGIN(RES_GRFATR_END); +inline constexpr TypedWhichId RES_BOXATR_FORMAT(RES_BOXATR_BEGIN); +inline constexpr TypedWhichId RES_BOXATR_FORMULA(157); +inline constexpr TypedWhichId RES_BOXATR_VALUE(158); +inline constexpr sal_uInt16 RES_BOXATR_END(159); -constexpr sal_uInt16 RES_UNKNOWNATR_BEGIN(RES_BOXATR_END); -constexpr TypedWhichId RES_UNKNOWNATR_CONTAINER(RES_UNKNOWNATR_BEGIN); -constexpr sal_uInt16 RES_UNKNOWNATR_END(160); +inline constexpr sal_uInt16 RES_UNKNOWNATR_BEGIN(RES_BOXATR_END); +inline constexpr TypedWhichId + RES_UNKNOWNATR_CONTAINER(RES_UNKNOWNATR_BEGIN); +inline constexpr sal_uInt16 RES_UNKNOWNATR_END(160); -constexpr sal_uInt16 POOLATTR_END(RES_UNKNOWNATR_END); +inline constexpr sal_uInt16 POOLATTR_END(RES_UNKNOWNATR_END); // Format IDs -constexpr sal_uInt16 RES_FMT_BEGIN(RES_UNKNOWNATR_END); -constexpr TypedWhichId RES_CHRFMT(RES_FMT_BEGIN); -constexpr TypedWhichId RES_FRMFMT(161); -constexpr TypedWhichId RES_FLYFRMFMT(162); -constexpr TypedWhichId RES_TXTFMTCOLL(163); -constexpr TypedWhichId RES_GRFFMTCOLL(164); -constexpr TypedWhichId RES_DRAWFRMFMT(165); -constexpr TypedWhichId RES_CONDTXTFMTCOLL(166); -constexpr sal_uInt16 RES_FMT_END(167); +inline constexpr sal_uInt16 RES_FMT_BEGIN(RES_UNKNOWNATR_END); +inline constexpr TypedWhichId RES_CHRFMT(RES_FMT_BEGIN); +inline constexpr TypedWhichId RES_FRMFMT(161); +inline constexpr TypedWhichId RES_FLYFRMFMT(162); +inline constexpr TypedWhichId RES_TXTFMTCOLL(163); +inline constexpr TypedWhichId RES_GRFFMTCOLL(164); +inline constexpr TypedWhichId RES_DRAWFRMFMT(165); +inline constexpr TypedWhichId RES_CONDTXTFMTCOLL(166); +inline constexpr sal_uInt16 RES_FMT_END(167); // ID's for Messages in the Formats -constexpr sal_uInt16 RES_FORMAT_MSG_BEGIN(RES_FMT_END); -constexpr TypedWhichId RES_OBJECTDYING(RES_FORMAT_MSG_BEGIN); // 167 -constexpr TypedWhichId RES_FMT_CHG(168); -constexpr TypedWhichId RES_ATTRSET_CHG(169); -constexpr TypedWhichId RES_UPDATE_ATTR(170); -constexpr TypedWhichId RES_HIDDENPARA_PRINT(178); -constexpr TypedWhichId RES_REMOVE_UNO_OBJECT(181); +inline constexpr sal_uInt16 RES_FORMAT_MSG_BEGIN(RES_FMT_END); +inline constexpr TypedWhichId RES_OBJECTDYING(RES_FORMAT_MSG_BEGIN); // 167 +inline constexpr TypedWhichId RES_FMT_CHG(168); +inline constexpr TypedWhichId RES_ATTRSET_CHG(169); +inline constexpr TypedWhichId RES_UPDATE_ATTR(170); +inline constexpr TypedWhichId RES_HIDDENPARA_PRINT(178); +inline constexpr TypedWhichId RES_REMOVE_UNO_OBJECT(181); // empty -constexpr sal_uInt16 RES_FORMAT_MSG_END(190); +inline constexpr sal_uInt16 RES_FORMAT_MSG_END(190); // An ID for the RTF-reader. The stylesheets are treated like attributes, // i.e. there is a StyleSheet-attribute. To avoid collision with other // Which()-values, the value is listed here. (The help system too defines // new attributes!) -constexpr sal_uInt16 RES_FLTRATTR_BEGIN(RES_FORMAT_MSG_END); -constexpr TypedWhichId RES_FLTR_BOOKMARK(RES_FLTRATTR_BEGIN); -constexpr TypedWhichId RES_FLTR_ANCHOR(191); -constexpr TypedWhichId RES_FLTR_NUMRULE(192); -constexpr TypedWhichId RES_FLTR_TOX(193); -constexpr TypedWhichId RES_FLTR_REDLINE(194); -constexpr TypedWhichId RES_FLTR_ANNOTATIONMARK(195); -constexpr TypedWhichId RES_FLTR_RDFMARK(196); -constexpr sal_uInt16 RES_FLTRATTR_END(197); +inline constexpr sal_uInt16 RES_FLTRATTR_BEGIN(RES_FORMAT_MSG_END); +inline constexpr TypedWhichId RES_FLTR_BOOKMARK(RES_FLTRATTR_BEGIN); +inline constexpr TypedWhichId RES_FLTR_ANCHOR(191); +inline constexpr TypedWhichId RES_FLTR_NUMRULE(192); +inline constexpr TypedWhichId RES_FLTR_TOX(193); +inline constexpr TypedWhichId RES_FLTR_REDLINE(194); +inline constexpr TypedWhichId RES_FLTR_ANNOTATIONMARK(195); +inline constexpr TypedWhichId RES_FLTR_RDFMARK(196); +inline constexpr sal_uInt16 RES_FLTRATTR_END(197); -constexpr sal_uInt16 RES_TBX_DUMMY(RES_FLTRATTR_END + 1); +inline constexpr sal_uInt16 RES_TBX_DUMMY(RES_FLTRATTR_END + 1); -constexpr TypedWhichId HINT_END(RES_TBX_DUMMY); +inline constexpr TypedWhichId HINT_END(RES_TBX_DUMMY); // Error recognition!! -constexpr sal_uInt16 INVALID_HINT(HINT_END); -constexpr sal_uInt16 RES_WHICHHINT_END(HINT_END); +inline constexpr sal_uInt16 INVALID_HINT(HINT_END); +inline constexpr sal_uInt16 RES_WHICHHINT_END(HINT_END); inline bool isATR(const sal_uInt16 nWhich) { diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 7bcebeda22db..5c423e11378c 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -81,6 +81,21 @@ public: static constexpr auto npos = std::numeric_limits::max(); bool Seek_Entry(const SwNode* rP, size_type* pnPos) const; + static const SwNode* GetRootNode(const SwNode* pNode); +}; + +struct CompareSwOutlineNodesInline +{ + bool operator()(const SwNode* lhs, const SwNode* rhs) const; +}; + +class SwOutlineNodesInline : public o3tl::sorted_vector +{ +public: + static constexpr auto npos = std::numeric_limits::max(); + + bool Seek_Entry(const SwNode* rP, size_type* pnPos) const; + bool Seek_Entry_By_Anchor(const SwNode* rAnchor, size_type* pnPos) const; }; struct SwTableToTextSave; diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 9b3736e69ac2..174a88e74c53 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -619,6 +619,8 @@ public: /** Returns outline level of this text node. + @param bInlineHeading it can return the outline level of the inline heading + If a text node has an outline number (i.e. it has an SwNodeNum and an outline numbering rule) the outline level is the level of this SwNodeNum. @@ -627,7 +629,10 @@ public: attached the outline level is the outline level of the paragraph style. - Otherwise the text node has no outline level (NO_NUMBERING). + Otherwise the text node has no outline level (NO_NUMBERING), + except if bInlineHeading is true, and there is an inline heading + at the beginning of the paragraph anchored as character and + with a different outline level. NOTE: The outline level of text nodes is subject to change. The plan is to have an SwTextNode::nOutlineLevel member that is @@ -636,7 +641,7 @@ public: @return outline level or NO_NUMBERING if there is no outline level */ - int GetAttrOutlineLevel() const; + int GetAttrOutlineLevel(bool bInlineHeading = false) const; /** Sets the out line level *at* a text node. @@ -655,10 +660,9 @@ public: /** * @brief GetAttrOutlineContentVisible - * @param bOutlineContentVisibleAttr the value stored in RES_PARATR_GRABBAG for 'OutlineContentVisibleAttr' * @return true if 'OutlineContentVisibleAttr' is found in RES_PARATR_GRABBAG */ - void GetAttrOutlineContentVisible(bool& bOutlineContentVisibleAttr); + bool GetAttrOutlineContentVisible() const; void SetAttrOutlineContentVisible(bool bVisible); bool IsEmptyListStyleDueToSetOutlineLevelAttr() const { return mbEmptyListStyleSetDueToSetOutlineLevelAttr;} diff --git a/sw/inc/nodeoffset.hxx b/sw/inc/nodeoffset.hxx index f6deac6609b0..e905d63add24 100644 --- a/sw/inc/nodeoffset.hxx +++ b/sw/inc/nodeoffset.hxx @@ -31,7 +31,7 @@ template inline SwNodeOffset operator-(SwNodeOffset a, inline SwNodeOffset abs(const SwNodeOffset& a) { return a > SwNodeOffset(0) ? a : -a; } inline SwNodeOffset min(const SwNodeOffset& a, const SwNodeOffset& b) { return a > b ? a : b; } -constexpr SwNodeOffset NODE_OFFSET_MAX(SAL_MAX_INT32); +inline constexpr SwNodeOffset NODE_OFFSET_MAX(SAL_MAX_INT32); SW_DLLPUBLIC std::ostream& operator<<(std::ostream& s, const SwNodeOffset& index); diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 334faf772738..c77fa3d0d7b7 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -251,11 +251,12 @@ public: SW_DLLPUBLIC void RegisterAutomationApplicationEventsCaller(css::uno::Reference< ooo::vba::XSinkCaller > const& xCaller); void CallAutomationApplicationEventSinks(const OUString& Method, css::uno::Sequence< css::uno::Any >& Arguments); + +// Access to SwModule + static auto get() { return static_cast(SfxApplication::GetModule(SfxToolsModule::Writer)); } }; -// Access to SwModule, the View and the shell. - -#define SW_MOD() ( static_cast(SfxApplication::GetModule(SfxToolsModule::Writer))) +// Access to the View and the shell. SAL_RET_MAYBENULL SW_DLLPUBLIC SwView* GetActiveView(); SAL_RET_MAYBENULL SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 1aedb38d243b..1a9139ecc8d8 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -69,7 +69,11 @@ struct ViewOptFlags1 bool bShowOutlineContentVisibilityButton : 1; bool bShowChangesInMargin : 1; //tracked deletions in margin bool bShowChangesInMargin2 : 1; //tracked insertions in margin + bool bTextBoundaries : 1; // text boundaries bool bTextBoundariesFull : 1; // true = frame around text, false = crop marks at edges + bool bSectionBoundaries : 1; // section boundaries + bool bTableBoundaries : 1; // table boundaries + bool bShowBoundaries : 1; // show all boundaries ViewOptFlags1() : bUseHeaderFooterMenu(false) @@ -103,7 +107,11 @@ struct ViewOptFlags1 , bShowOutlineContentVisibilityButton(false) , bShowChangesInMargin(false) , bShowChangesInMargin2(false) + , bTextBoundaries(true) , bTextBoundariesFull(false) + , bSectionBoundaries(true) + , bTableBoundaries(true) + , bShowBoundaries(false) {} bool operator==(const ViewOptFlags1& rOther) const @@ -139,7 +147,11 @@ struct ViewOptFlags1 && bShowOutlineContentVisibilityButton == rOther.bShowOutlineContentVisibilityButton && bShowChangesInMargin == rOther.bShowChangesInMargin && bShowChangesInMargin2 == rOther.bShowChangesInMargin2 - && bTextBoundariesFull == rOther.bTextBoundariesFull; + && bTextBoundaries == rOther.bTextBoundaries + && bTextBoundariesFull == rOther.bTextBoundariesFull + && bSectionBoundaries == rOther.bSectionBoundaries + && bTableBoundaries == rOther.bTableBoundaries + && bShowBoundaries == rOther.bShowBoundaries; } void dumpAsXml(xmlTextWriterPtr pWriter) const; @@ -185,15 +197,11 @@ namespace o3tl { // Appearance flags. enum class ViewOptFlags { NONE = 0x0000, - DocBoundaries = 0x0001, - ObjectBoundaries = 0x0002, - TableBoundaries = 0x0004, - IndexShadings = 0x0008, - Links = 0x0010, - VisitedLinks = 0x0020, - FieldShadings = 0x0040, - SectionBoundaries = 0x0080, - Shadow = 0x0100, + IndexShadings = 0x0001, + Links = 0x0002, + VisitedLinks = 0x0004, + FieldShadings = 0x0008, + Shadow = 0x0010, }; namespace o3tl { template<> struct typed_flags : is_typed_flags {}; @@ -207,7 +215,6 @@ struct SwViewColors { return m_aDocColor == rOther.m_aDocColor && m_aDocBoundColor == rOther.m_aDocBoundColor - && m_aObjectBoundColor == rOther.m_aObjectBoundColor && m_aAppBackgroundColor == rOther.m_aAppBackgroundColor && m_aTableBoundColor == rOther.m_aTableBoundColor && m_aFontColor == rOther.m_aFontColor @@ -229,7 +236,6 @@ struct SwViewColors } Color m_aDocColor; // color of document boundaries Color m_aDocBoundColor; // color of document boundaries - Color m_aObjectBoundColor; // color of object boundaries Color m_aAppBackgroundColor; // application background Color m_aTableBoundColor; // color of table boundaries Color m_aFontColor; @@ -665,9 +671,21 @@ public: bool IsMultipageView() const { return IsViewLayoutBookMode() || GetViewLayoutColumns() == 0; } + bool IsTextBoundaries() const { return m_nCoreOptions.bTextBoundaries; } + void SetTextBoundaries( bool b) { m_nCoreOptions.bTextBoundaries = b; } + bool IsTextBoundariesFull() const { return m_nCoreOptions.bTextBoundariesFull; } void SetTextBoundariesFull( bool b) { m_nCoreOptions.bTextBoundariesFull = b; } + bool IsSectionBoundaries() const { return m_nCoreOptions.bSectionBoundaries; } + void SetSectionBoundaries( bool b) { m_nCoreOptions.bSectionBoundaries = b; } + + bool IsTableBoundaries() const { return m_nCoreOptions.bTableBoundaries; } + void SetTableBoundaries( bool b) { m_nCoreOptions.bTableBoundaries = b; } + + bool IsShowBoundaries() const { return m_nCoreOptions.bShowBoundaries; } + void SetShowBoundaries( bool b ) { m_nCoreOptions.bShowBoundaries = b; } + #ifdef DBG_UTIL // Correspond to statements in ui/config/cfgvw.src. bool IsTest1() const { return m_bTest1; } @@ -842,7 +860,6 @@ public: SW_DLLPUBLIC const Color& GetDocColor() const; SW_DLLPUBLIC const Color& GetDocBoundariesColor() const; const Color& GetAppBackgroundColor() const; - const Color& GetObjectBoundariesColor() const; const Color& GetTableBoundariesColor() const; const Color& GetIndexShadingsColor() const; const Color& GetLinksColor() const; @@ -861,20 +878,14 @@ public: bool IsAppearanceFlag(ViewOptFlags nFlag) const; - bool IsDocBoundaries() const {return IsAppearanceFlag(ViewOptFlags::DocBoundaries);} - bool IsObjectBoundaries() const {return IsAppearanceFlag(ViewOptFlags::ObjectBoundaries);} - bool IsTableBoundaries() const {return IsAppearanceFlag(ViewOptFlags::TableBoundaries);} bool IsIndexShadings() const {return IsAppearanceFlag(ViewOptFlags::IndexShadings);} bool IsLinks() const {return IsAppearanceFlag(ViewOptFlags::Links);} bool IsVisitedLinks() const {return IsAppearanceFlag(ViewOptFlags::VisitedLinks);} bool IsFieldShadings() const {return IsAppearanceFlag(ViewOptFlags::FieldShadings);} - bool IsSectionBoundaries() const {return IsAppearanceFlag(ViewOptFlags::SectionBoundaries);} bool IsShadow() const {return IsAppearanceFlag(ViewOptFlags::Shadow);} void SetAppearanceFlag(ViewOptFlags nFlag, bool bSet, bool bSaveInConfig = false); - void SetDocBoundaries(bool bSet) {SetAppearanceFlag(ViewOptFlags::DocBoundaries, bSet);} - // get/set default anchor (0..2); use GetDefaultAnchorType() to convert into RndStdIds::FLY_* sal_Int32 GetDefaultAnchor() const { return m_nDefaultAnchor; } diff --git a/sw/qa/core/attr/attr.cxx b/sw/qa/core/attr/attr.cxx index fcb68493875f..fbacf044cb48 100644 --- a/sw/qa/core/attr/attr.cxx +++ b/sw/qa/core/attr/attr.cxx @@ -39,7 +39,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSwAttrSet) dispatchCommand(mxComponent, u".uno:Cut"_ustr, {}); dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {}); rtl::Reference xTransferable(new SwTransferable(*pWrtShell)); - SwModule* pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); SwTransferable* pOldTransferable = pMod->m_pXSelection; pMod->m_pXSelection = xTransferable.get(); diff --git a/sw/qa/core/layout/data/tdf158713_footnoteInHeadline.odt b/sw/qa/core/layout/data/tdf158713_footnoteInHeadline.odt new file mode 100644 index 000000000000..d1c470c23cda Binary files /dev/null and b/sw/qa/core/layout/data/tdf158713_footnoteInHeadline.odt differ diff --git a/sw/qa/core/layout/ftnfrm.cxx b/sw/qa/core/layout/ftnfrm.cxx index 215d766682dd..0bd0b2c5d077 100644 --- a/sw/qa/core/layout/ftnfrm.cxx +++ b/sw/qa/core/layout/ftnfrm.cxx @@ -65,6 +65,20 @@ CPPUNIT_TEST_FIXTURE(Test, testFlySplitFootnoteLayout) CPPUNIT_ASSERT(pPage->FindFootnoteCont()); } +CPPUNIT_TEST_FIXTURE(Test, testTdf158713_footnoteInHeadline) +{ + // Given a file with table-with-headline split across multiple pages, + // and a footnote in the table's repeated heading row: + createSwDoc("tdf158713_footnoteInHeadline.odt"); + + // delete first paragraph, so table now fits all on the first page - no more "follow table"... + dispatchCommand(mxComponent, u".uno:Delete"_ustr, {}); + + // ensure the footnote text has not been removed from the layout + xmlDocUniquePtr pLayout = parseLayoutDump(); + assertXPath(pLayout, "/root/page/ftncont/ftn", 1); +} + CPPUNIT_TEST_FIXTURE(Test, testInlineEndnoteAndFootnote) { // Given a DOC file with an endnote and then a footnote: diff --git a/sw/qa/extras/htmlexport/data/ul_with_disc.fodt b/sw/qa/extras/htmlexport/data/ul_with_disc.fodt new file mode 100644 index 000000000000..b41da841cf61 --- /dev/null +++ b/sw/qa/extras/htmlexport/data/ul_with_disc.fodt @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + list header + + + + + + + \ No newline at end of file diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 44eca01a2b13..fa6b75e9da92 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -7,275 +7,39 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include "htmlmodeltestbase.hxx" #include -#include #include -#include -#include #include #include #include #include -#include #include #include #include -#include #include -#include -#include - -#include -#include #include -#include #include #include -#include -#include -#include -#include #include #include -#include -#include #include #include -#include #include -#include -#include #include #include #include #include #include -#include #include #include -#include -#include namespace { -/// Test RTF parser that just extracts a single OLE2 object from a file. -class TestReqIfRtfReader : public SvRTFParser -{ -public: - TestReqIfRtfReader(SvStream& rStream); - void NextToken(int nToken) override; - bool WriteObjectData(SvStream& rOLE); - tools::Long GetObjw() const { return m_nObjw; } - tools::Long GetObjh() const { return m_nObjh; } - int getWmetafile() const { return m_nWmetafile; } - -private: - bool m_bInObjData = false; - OStringBuffer m_aHex; - tools::Long m_nObjw = 0; - tools::Long m_nObjh = 0; - int m_nWmetafile = 0; -}; - -TestReqIfRtfReader::TestReqIfRtfReader(SvStream& rStream) - : SvRTFParser(rStream) -{ -} - -void TestReqIfRtfReader::NextToken(int nToken) -{ - switch (nToken) - { - case '}': - m_bInObjData = false; - break; - case RTF_TEXTTOKEN: - if (m_bInObjData) - m_aHex.append(OUStringToOString(aToken, RTL_TEXTENCODING_ASCII_US)); - break; - case RTF_OBJDATA: - m_bInObjData = true; - break; - case RTF_OBJW: - m_nObjw = nTokenValue; - break; - case RTF_OBJH: - m_nObjh = nTokenValue; - break; - case RTF_WMETAFILE: - m_nWmetafile = nTokenValue; - break; - } -} - -bool TestReqIfRtfReader::WriteObjectData(SvStream& rOLE) -{ - OString aObjdata = m_aHex.makeStringAndClear(); - - SvMemoryStream aStream; - int b = 0; - int count = 2; - - // Feed the destination text to a stream. - for (int i = 0; i < aObjdata.getLength(); ++i) - { - char ch = aObjdata[i]; - if (ch != 0x0d && ch != 0x0a) - { - b = b << 4; - sal_Int8 parsed = msfilter::rtfutil::AsHex(ch); - if (parsed == -1) - return false; - b += parsed; - count--; - if (!count) - { - aStream.WriteChar(b); - count = 2; - b = 0; - } - } - } - - aStream.Seek(0); - rOLE.WriteStream(aStream); - return true; -} - -/// Parser for [MS-OLEDS] 2.2.5 EmbeddedObject, aka OLE1. -struct OLE1Reader -{ - sal_uInt32 m_nNativeDataSize; - std::vector m_aNativeData; - sal_uInt32 m_nPresentationDataSize; - - OLE1Reader(SvStream& rStream); -}; - -OLE1Reader::OLE1Reader(SvStream& rStream) -{ - // Skip ObjectHeader, see [MS-OLEDS] 2.2.4. - rStream.Seek(0); - CPPUNIT_ASSERT(rStream.remainingSize()); - sal_uInt32 nData; - rStream.ReadUInt32(nData); // OLEVersion - rStream.ReadUInt32(nData); // FormatID - rStream.ReadUInt32(nData); // ClassName - rStream.SeekRel(nData); - rStream.ReadUInt32(nData); // TopicName - rStream.SeekRel(nData); - rStream.ReadUInt32(nData); // ItemName - rStream.SeekRel(nData); - - rStream.ReadUInt32(m_nNativeDataSize); - m_aNativeData.resize(m_nNativeDataSize); - rStream.ReadBytes(m_aNativeData.data(), m_aNativeData.size()); - - rStream.ReadUInt32(nData); // OLEVersion for presentation data - CPPUNIT_ASSERT(rStream.good()); - rStream.ReadUInt32(nData); // FormatID - rStream.ReadUInt32(nData); // ClassName - rStream.SeekRel(nData); - rStream.ReadUInt32(nData); // Width - rStream.ReadUInt32(nData); // Height - rStream.ReadUInt32(nData); // PresentationDataSize - m_nPresentationDataSize = nData; -} - -/// Covers sw/source/filter/html/wrthtml.cxx and related fixes. -class HtmlExportTest : public SwModelTestBase, public HtmlTestTools -{ -public: - HtmlExportTest() - : SwModelTestBase(u"/sw/qa/extras/htmlexport/data/"_ustr, u"HTML (StarWriter)"_ustr) - { - } - - /// Wraps an RTF fragment into a complete RTF file, so an RTF parser can handle it. - static void wrapRtfFragment(const OUString& rURL, SvMemoryStream& rStream) - { - SvFileStream aRtfStream(rURL, StreamMode::READ); - rStream.WriteOString("{\\rtf1"); - rStream.WriteStream(aRtfStream); - rStream.WriteOString("}"); - rStream.Seek(0); - } -}; - -/// HTML export of the sw doc model tests. -class SwHtmlDomExportTest : public SwModelTestBase, public HtmlTestTools -{ -public: - SwHtmlDomExportTest() - : SwModelTestBase(u"/sw/qa/extras/htmlexport/data/"_ustr) - { - } - - OUString GetObjectPath(const OUString& ext); - /// Get the .ole path, assuming maTempFile is an XHTML export result. - OUString GetOlePath() { return GetObjectPath(u".ole"_ustr); } - OUString GetPngPath() { return GetObjectPath(u".png"_ustr); } - /// Parse the ole1 data out of an RTF fragment URL. - void ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryStream& rOle1); - /// Export using the C++ HTML export filter, with xhtmlns=reqif-xhtml. - void ExportToReqif(); - /// Import using the C++ HTML import filter, with xhtmlns=reqif-xhtml. - void ImportFromReqif(const OUString& rUrl); - /// Export using the C++ HTML export filter - void ExportToHTML(); -}; - -OUString SwHtmlDomExportTest::GetObjectPath(const OUString& ext) -{ - assert(ext.startsWith(".")); - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - OUString aOlePath = getXPath( - pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(aOlePath.endsWith(ext)); - INetURLObject aUrl(maTempFile.GetURL()); - aUrl.setBase(aOlePath.subView(0, aOlePath.getLength() - ext.getLength())); - aUrl.setExtension(ext.subView(1)); - return aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE); -} - -void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryStream& rOle1) -{ - SvMemoryStream aRtf; - HtmlExportTest::wrapRtfFragment(rRtfUrl, aRtf); - tools::SvRef xReader(new TestReqIfRtfReader(aRtf)); - CPPUNIT_ASSERT(xReader->CallParser() != SvParserState::Error); - CPPUNIT_ASSERT(xReader->WriteObjectData(rOle1)); - CPPUNIT_ASSERT(rOle1.Tell()); -} - -void SwHtmlDomExportTest::ExportToReqif() -{ - setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr); - save(u"HTML (StarWriter)"_ustr); -} - -void SwHtmlDomExportTest::ExportToHTML() -{ - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - }; - saveWithParams(aStoreProperties); -} - -void SwHtmlDomExportTest::ImportFromReqif(const OUString& rUrl) -{ - uno::Sequence aLoadProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - }; - loadWithParams(rUrl, aLoadProperties); -} - CPPUNIT_TEST_FIXTURE(HtmlExportTest, testFdo81276) { auto verify = [this]() { @@ -337,8 +101,8 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testFdo86857) CPPUNIT_TEST_FIXTURE(HtmlExportTest, testCharacterBorder) { // FIXME if padding-top gets exported as inches, not cms, we get rounding errors. - SwGlobals::ensure(); // make sure that SW_MOD() is not 0 - SwMasterUsrPref* pPref = const_cast(SW_MOD()->GetUsrPref(false)); + SwGlobals::ensure(); // make sure that SwModule::get() is not 0 + SwMasterUsrPref* pPref = const_cast(SwModule::get()->GetUsrPref(false)); FieldUnit eUnit = pPref->GetMetric(); pPref->SetMetric(FieldUnit::CM); comphelper::ScopeGuard g([pPref, eUnit]() { pPref->SetMetric(eUnit); }); @@ -1818,1580 +1582,19 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedJPGShapeDirectly) u"image/png"); } -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedPNGShapeAsOLE) +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifNoTypeInUL) { - // Given a document with an image shape: - createSwDoc(); - uno::Reference xFactory(mxComponent, uno::UNO_QUERY); - uno::Reference xShape( - xFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); - xShape->setSize(awt::Size(10000, 10000)); - uno::Reference xShapeProps(xShape, uno::UNO_QUERY); - xShapeProps->setPropertyValue(u"GraphicURL"_ustr, uno::Any(createFileURL(u"ole2.png"))); - uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); - xDrawPageSupplier->getDrawPage()->add(xShape); - - // When exporting to XHTML: - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), - }; - saveWithParams(aStoreProperties); - - // Then make sure the PNG is embedded with an RTF wrapper: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: text/rtf - // - Actual : image/png - // i.e. the OLE wrapper around the PNG was missing. - assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"text/rtf"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNG) -{ - // FIXME: the DPI check should be removed when either (1) the test is fixed to work with - // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. - if (!IsDefaultDPI()) - return; - // Given a document with a shape: - createSwDoc(); - uno::Reference xFactory(mxComponent, uno::UNO_QUERY); - uno::Reference xShape( - xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); - xShape->setSize(awt::Size(10000, 10000)); - uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); - xDrawPageSupplier->getDrawPage()->add(xShape); + // Given a document with an unordered list: + createSwDoc("ul_with_disc.fodt"); // When exporting to XHTML: ExportToReqif(); - // Then make sure the shape is embedded as a PNG: + // Check that 'ul' element has no 'type' attribute xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: image/png - // - Actual : image/x-vclgraphic - // i.e. the result was invalid ReqIF. - assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"image/png"); - - // Then check the pixel size of the shape: - Size aPixelSize(Application::GetDefaultDevice()->LogicToPixel(Size(10000, 10000), - MapMode(MapUnit::Map100thMM))); - // Without the accompanying fix in place, this test would have failed with: - // - no attribute 'width' exist - // i.e. shapes had no width. - assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "width", - OUString::number(aPixelSize.getWidth())); + // Without the accompanying fix in place, this test would have failed + assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul", "type"); } - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testShapeAsImageHtml) -{ - // Given a document with a shape: - createSwDoc(); - uno::Reference xFactory(mxComponent, uno::UNO_QUERY); - uno::Reference xShape( - xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); - xShape->setSize(awt::Size(5080, 2540)); - uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); - xDrawPageSupplier->getDrawPage()->add(xShape); - - // When exporting to plain HTML: - saveAndReload(u"HTML (StarWriter)"_ustr); - - // Without the accompanying fix in place, this test would have failed with: - // - Expected: - // - Actual : /> - // i.e. the output was not well-formed. - CPPUNIT_ASSERT_EQUAL(u" "_ustr, getParagraph(1)->getString()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testJson) -{ - // Given a document with a shape: - createSwDoc(); - uno::Reference xFactory(mxComponent, uno::UNO_QUERY); - uno::Reference xShape( - xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); - xShape->setSize(awt::Size(2540, 2540)); - uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); - xDrawPageSupplier->getDrawPage()->add(xShape); - - // When exporting to HTML, and specifying options as JSON: - setFilterOptions(u"{\"XhtmlNs\":{\"type\":\"string\", \"value\":\"reqif-xhtml\"}," - "\"ShapeDPI\":{\"type\":\"long\",\"value\":\"192\"}}"_ustr); - save(u"HTML (StarWriter)"_ustr); - - // Then make sure those options are not ignored: - // Without the accompanying fix in place, this test would have failed, as GetPngPath() expects - // XML output, but xhtmlns=reqif-xhtml was ignored. - OUString aPngUrl = GetPngPath(); - SvFileStream aFileStream(aPngUrl, StreamMode::READ); - GraphicDescriptor aDescriptor(aFileStream, nullptr); - aDescriptor.Detect(/*bExtendedInfo=*/true); - // Make sure that the increased DPI is taken into account: - tools::Long nExpected = 192; - CPPUNIT_ASSERT_EQUAL(nExpected, aDescriptor.GetSizePixel().getWidth()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNGCustomDPI) -{ - // FIXME: the DPI check should be removed when either (1) the test is fixed to work with - // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. - if (!IsDefaultDPI()) - return; - // Given a document with a shape: - createSwDoc(); - uno::Reference xFactory(mxComponent, uno::UNO_QUERY); - uno::Reference xShape( - xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); - xShape->setSize(awt::Size(5080, 2540)); - uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); - xDrawPageSupplier->getDrawPage()->add(xShape); - sal_Int32 nDPI = 600; - - // When exporting to XHTML: - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"ShapeDPI"_ustr, nDPI), - }; - saveWithParams(aStoreProperties); - - // Then make sure the shape is embedded as a PNG: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"image/png"); - - // Then check the pixel size of the shape: - Size aPixelSize(Application::GetDefaultDevice()->LogicToPixel(Size(5080, 2540), - MapMode(MapUnit::Map100thMM))); - tools::Long nPNGWidth = 1200; - OUString aPngUrl = GetPngPath(); - SvFileStream aFileStream(aPngUrl, StreamMode::READ); - GraphicDescriptor aDescriptor(aFileStream, nullptr); - aDescriptor.Detect(/*bExtendedInfo=*/true); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: 1200 - // - Actual : 1000 - // i.e. first setting a double DPI didn't result in larger pixel width of the PNG, then it was - // limited to 1000 pixels (because the pixel limit was 500k). - CPPUNIT_ASSERT_EQUAL(nPNGWidth, aDescriptor.GetSizePixel().getWidth()); - - // Then make sure the shape's logic size (in CSS pixels) don't change: - assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "width", - OUString::number(aPixelSize.getWidth())); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOleBmpTransparent) -{ - // Given a document with a transparent image: - createSwDoc(); - uno::Sequence aArgs = { - comphelper::makePropertyValue(u"FileName"_ustr, createFileURL(u"transparent.png")), - }; - dispatchCommand(mxComponent, u".uno:InsertGraphic"_ustr, aArgs); - - // When exporting to reqif with ExportImagesAsOLE=true: - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), - }; - saveWithParams(aStoreProperties); - - // Then make sure the transparent pixel turns into white: - SvMemoryStream aOle1; - ParseOle1FromRtfUrl(GetOlePath(), aOle1); - OLE1Reader aOle1Reader(aOle1); - SvMemoryStream aBitmapStream(aOle1Reader.m_aNativeData.data(), aOle1Reader.m_aNativeData.size(), - StreamMode::READ); - Bitmap aBitmap; - ReadDIB(aBitmap, aBitmapStream, /*bFileHeader=*/true); - Size aBitmapSize = aBitmap.GetSizePixel(); - BitmapEx aBitmapEx(aBitmap); - Color nActualColor - = aBitmapEx.GetPixelColor(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: Color: R:255 G:255 B:255 A:0 - // - Actual : Color: R:0 G:0 B:0 A:0 - // i.e. the bitmap without an alpha channel was black, not white. - CPPUNIT_ASSERT_EQUAL(COL_WHITE, nActualColor); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testListsHeading) -{ - // Given a document with lh, lh, li, li, lh and lh nodes: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"list 1, header 1"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"list 1, header 2"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"list 2, item 1"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"list 2, item 2"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"list 3, header 1"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"list 3, header 2"_ustr); - SwDoc* pDoc = pWrtShell->GetDoc(); - pWrtShell->Up(false, 5); - { - sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); - SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - rTextNode.SetCountedInList(false); - } - pWrtShell->Down(false, 1); - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - rTextNode.SetCountedInList(false); - } - } - pWrtShell->Down(false, 1); - { - sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); - SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - } - pWrtShell->Down(false, 1); - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - } - } - pWrtShell->Down(false, 1); - { - sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); - SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - rTextNode.SetCountedInList(false); - } - pWrtShell->Down(false, 1); - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - rTextNode.SetCountedInList(false); - } - } - - // When exporting to ReqIF: - ExportToReqif(); - - // Then make sure the output is valid xhtml: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - - OUString aContent - = getXPathContent(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol/" - "reqif-xhtml:li[@style='display: block']/reqif-xhtml:p"); - CPPUNIT_ASSERT_EQUAL(u"list 1, header 1"_ustr, aContent.trim()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testOleEmfPreviewToHtml) -{ - // Given a document containing an embedded object, with EMF preview: - createSwDoc("ole2.odt"); - - // When exporting to HTML: - ExportToHTML(); - - // Then make sure the tag has matching file extension and data: - htmlDocUniquePtr pDoc = parseHtml(maTempFile); - OUString aPath = getXPath(pDoc, "/html/body/p/img", "src"); - // Without the accompanying fix in place, this test would have failed, as aPath was - // ole_html_3978e5f373402b43.JPG, with EMF data. - CPPUNIT_ASSERT(aPath.endsWith("gif")); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testNestedBullets) -{ - // Given a documented with nested lists: - createSwDoc(); - SwDoc* pDoc = getSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"first"_ustr); - sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); - SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - rTextNode.SetAttrListLevel(0); - } - pWrtShell->SplitNode(); - pWrtShell->Insert(u"second"_ustr); - { - SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); - SwTextNode& rTextNode = *rNode.GetTextNode(); - rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); - rTextNode.SetAttrListLevel(1); - } - - // When exporting to xhtml: - ExportToReqif(); - - // Then make sure that there is a
  • between the outer and the inner
      : - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - XPath '//reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p' not found - // i.e. the
    1. inside the outer
        was missing. - assertXPathContent( - pXmlDoc, "//reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p", - u"second"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTrailingLineBreak) -{ - // Given a document with a trailing line-break: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"test\n"_ustr); - - // When exporting to reqif-xhtml: - ExportToReqif(); - - // Then make sure that we still have a single line-break: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: 1 - // - Actual : 2 - // - XPath '//reqif-xhtml:br' number of nodes is incorrect - assertXPath(pXmlDoc, "//reqif-xhtml:br", 1); - - // Then test the import side: - // Given an empty document: - // When importing a
        from reqif-xhtml: - ImportFromReqif(maTempFile.GetURL()); - - // Then make sure that line-break is not lost: - pWrtShell = getSwDocShell()->GetWrtShell(); - OUString aActual = pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText(); - // Without the accompanying fix in place, this test would have failed, as the trailing - // line-break was lost. - CPPUNIT_ASSERT_EQUAL(u"test\n"_ustr, aActual); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTab) -{ - // Given a document with leading tabs: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"\t first"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"\t\t second"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"thi \t rd"_ustr); - - // When exporting to HTML, using LeadingTabWidth=2: - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"LeadingTabWidth"_ustr, static_cast(2)), - }; - saveWithParams(aStoreProperties); - - // Then make sure that leading tabs are replaced with 2 nbsps: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: first - // - Actual : first - // i.e. the leading tab was not replaced by 2 nbsps. - assertXPathContent(pXmlDoc, "//reqif-xhtml:p[1]", u"\xa0\xa0 first"); - // Test a leading tab that is not at the start of the paragraph: - assertXPathContent(pXmlDoc, "//reqif-xhtml:p[2]", u"\xa0\xa0\xa0\xa0 second"); - // Test a tab which is not leading: - assertXPathContent(pXmlDoc, "//reqif-xhtml:p[3]", u"thi \t rd"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTabHTML) -{ - // Given a document with leading tabs: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"\t test"_ustr); - - // When exporting to plain HTML, using LeadingTabWidth=2: - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"LeadingTabWidth"_ustr, static_cast(2)), - }; - saveWithParams(aStoreProperties); - - // Then make sure that leading tabs are replaced with 2 nbsps: - htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); - CPPUNIT_ASSERT(pHtmlDoc); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: test - // - Actual : test - // i.e. the leading tab was not replaced by 2 nbsps. - assertXPathContent(pHtmlDoc, "/html/body/p", SAL_NEWLINE_STRING u"\xa0\xa0 test"); -} - -CPPUNIT_TEST_FIXTURE(HtmlExportTest, testClearingBreak) -{ - auto verify = [this]() { - uno::Reference xParagraph(getParagraph(1), uno::UNO_QUERY); - uno::Reference xPortions = xParagraph->createEnumeration(); - uno::Reference xPortion; - OUString aPortionType; - while (true) - { - // Ignore leading comments. - xPortion.set(xPortions->nextElement(), uno::UNO_QUERY); - xPortion->getPropertyValue(u"TextPortionType"_ustr) >>= aPortionType; - if (aPortionType != "Annotation") - { - break; - } - } - // Skip "foo". - // Without the accompanying fix in place, this test would have failed with: - // An uncaught exception of type com.sun.star.container.NoSuchElementException - // i.e. the first para was just comments + text portion, the clearing break was lost. - xPortion.set(xPortions->nextElement(), uno::UNO_QUERY); - xPortion->getPropertyValue(u"TextPortionType"_ustr) >>= aPortionType; - CPPUNIT_ASSERT_EQUAL(u"LineBreak"_ustr, aPortionType); - uno::Reference xLineBreak; - xPortion->getPropertyValue(u"LineBreak"_ustr) >>= xLineBreak; - sal_Int16 eClear{}; - uno::Reference xLineBreakProps(xLineBreak, uno::UNO_QUERY); - xLineBreakProps->getPropertyValue(u"Clear"_ustr) >>= eClear; - CPPUNIT_ASSERT_EQUAL(static_cast(SwLineBreakClear::ALL), eClear); - }; - - // Given a document with an at-para anchored image + a clearing break: - // When loading that file: - createSwWebDoc("clearing-break.html"); - // Then make sure that the clear property of the break is not ignored: - verify(); - saveAndReload(mpFilter); - // Make sure that the clear property of the break is not ignored during export: - verify(); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTableBackground) -{ - // Given a document with two tables: first stable has a background, second table has a - // background in its first row: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - SwInsertTableOptions aInsertTableOptions(SwInsertTableFlags::DefaultBorder, - /*nRowsToRepeat=*/0); - pWrtShell->InsertTable(aInsertTableOptions, /*nRows=*/1, /*nCols=*/1); - pWrtShell->MoveTable(GotoPrevTable, fnTableStart); - SvxBrushItem aBrush(COL_LIGHTRED, RES_BACKGROUND); - pWrtShell->SetTabBackground(aBrush); - pWrtShell->Down(/*bSelect=*/false); - pWrtShell->SplitNode(); - pWrtShell->InsertTable(aInsertTableOptions, /*nRows=*/2, /*nCols=*/1); - pWrtShell->MoveTable(GotoPrevTable, fnTableStart); - aBrush.SetColor(COL_LIGHTGREEN); - pWrtShell->SetRowBackground(aBrush); - pWrtShell->Down(/*bSelect=*/false); - // Second row has an explicit transparent background. - aBrush.SetColor(COL_TRANSPARENT); - pWrtShell->SetRowBackground(aBrush); - - // When exporting to reqif-xhtml: - ExportToReqif(); - - // Then make sure that CSS markup is used, not HTML one: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - XPath '//reqif-xhtml:table[1]' no attribute 'style' exist - // i.e. HTML markup was used for the table background color. - assertXPath(pXmlDoc, "//reqif-xhtml:table[1]", "style", u"background: #ff0000"); - assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:table[1]", "bgcolor"); - assertXPath(pXmlDoc, "//reqif-xhtml:table[2]/reqif-xhtml:tr[1]", "style", - u"background: #00ff00"); - assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:table[2]/reqif-xhtml:tr[1]", "bgcolor"); - // Second row has no explicit style, the default is not written. - assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:table[2]/reqif-xhtml:tr[2]", "style"); -} - -CPPUNIT_TEST_FIXTURE(HtmlExportTest, testImageKeepRatio) -{ - // Given a document with an image: width is relative, height is "keep ratio": - createSwDoc(); - uno::Reference xFactory(mxComponent, uno::UNO_QUERY); - uno::Reference xTextGraphic( - xFactory->createInstance(u"com.sun.star.text.TextGraphicObject"_ustr), uno::UNO_QUERY); - xTextGraphic->setPropertyValue(u"AnchorType"_ustr, - uno::Any(text::TextContentAnchorType_AS_CHARACTER)); - xTextGraphic->setPropertyValue(u"RelativeWidth"_ustr, uno::Any(static_cast(42))); - xTextGraphic->setPropertyValue(u"IsSyncHeightToWidth"_ustr, uno::Any(true)); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xBodyText = xTextDocument->getText(); - uno::Reference xCursor(xBodyText->createTextCursor()); - uno::Reference xTextContent(xTextGraphic, uno::UNO_QUERY); - xBodyText->insertTextContent(xCursor, xTextContent, false); - - // When exporting to HTML: - save(mpFilter); - - // Then make sure that the width is not a fixed size, that would break on resizing the browser - // window: - htmlDocUniquePtr pDoc = parseHtml(maTempFile); - // Without the accompanying fix in place, this test would have failed with: - // - Expected: auto - // - Actual : 2 - // i.e. a static (CSS pixel) height was written. - assertXPath(pDoc, "/html/body/p/img", "height", u"auto"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testSectionDir) -{ - // Given a document with a section: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"test"_ustr); - pWrtShell->SelAll(); - SwSectionData aSectionData(SectionType::Content, u"mysect"_ustr); - pWrtShell->InsertSection(aSectionData); - - // When exporting to (reqif-)xhtml: - ExportToReqif(); - - // Then make sure CSS is used to export the text direction of the section: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - // Without the accompanying fix in place, this test would have failed with: - // - XPath '//reqif-xhtml:div[@id='mysect']' no attribute 'style' exist - // i.e. the dir="ltr" HTML attribute was used instead. - assertXPath(pXmlDoc, "//reqif-xhtml:div[@id='mysect']", "style", u"dir: ltr"); -} - -CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf114769) -{ - // Create document from scratch since relative urls to filesystem can be replaced - // by absolute during save/load - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - pWrtShell->Insert(u"Hyperlink1"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"Hyperlink2"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"Hyperlink3"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"Hyperlink4"_ustr); - pWrtShell->SplitNode(); - pWrtShell->Insert(u"Hyperlink5"_ustr); - pWrtShell->SplitNode(); - - // Normal external URL - uno::Reference xRun(getRun(getParagraph(1), 1), uno::UNO_QUERY); - xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"http://libreoffice.org/"_ustr)); - - // Bookmark reference - xRun.set(getRun(getParagraph(2), 1), uno::UNO_QUERY); - xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"#some_bookmark"_ustr)); - - // Filesystem absolute link - xRun.set(getRun(getParagraph(3), 1), uno::UNO_QUERY); - xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"C:\\test.txt"_ustr)); - - // Filesystem relative link - xRun.set(getRun(getParagraph(4), 1), uno::UNO_QUERY); - xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"..\\..\\test.odt"_ustr)); - - // Filesystem relative link - xRun.set(getRun(getParagraph(5), 1), uno::UNO_QUERY); - xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u".\\another.odt"_ustr)); - - // Export - save(mpFilter); - - htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); - CPPUNIT_ASSERT(pHtmlDoc); - - assertXPath(pHtmlDoc, "/html/body/p[1]/a", "href", u"http://libreoffice.org/"); - assertXPath(pHtmlDoc, "/html/body/p[2]/a", "href", u"#some_bookmark"); - assertXPath(pHtmlDoc, "/html/body/p[3]/a", "href", u"C:\\test.txt"); - assertXPath(pHtmlDoc, "/html/body/p[4]/a", "href", u"..\\..\\test.odt"); - assertXPath(pHtmlDoc, "/html/body/p[5]/a", "href", u".\\another.odt"); -} - -CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf153923) -{ - createSwDoc("TableWithIndent.fodt"); - save(mpFilter); - - // Parse it as XML (strict!) - xmlDocUniquePtr pDoc = parseXml(maTempFile); - // Without the fix in place, this would fail - CPPUNIT_ASSERT(pDoc); - - assertXPath(pDoc, "/html/body//dl", 3); - // The 'dd' tag was not closed - assertXPath(pDoc, "/html/body//dd", 3); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf153923_ReqIF) -{ - createSwDoc("TableWithIndent.fodt"); - ExportToReqif(); - - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - assertXPath(pDoc, "//reqif-xhtml:table"); - // There should be no 'dd' or 'dl' tags, used as a hack for table indentation - assertXPath(pDoc, "//reqif-xhtml:dl", 0); - assertXPath(pDoc, "//reqif-xhtml:dd", 0); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIfTransparentTifImg) -{ - // reqIf export must keep the TIF encoding of the image - createSwDoc("reqif-transparent-tif-img.odt"); - ExportToReqif(); - - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object[1]", "type", u"image/tiff"); - OUString imageName = getXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object[1]", "data"); - // Without the accompanying fix in place, this test would have failed, - // ending with .gif, because XOutFlags::UseGifIfSensible flag combined - // with the transparent image would result in GIF export - CPPUNIT_ASSERT(imageName.endsWith(".tif")); - - INetURLObject aURL(maTempFile.GetURL()); - aURL.setName(imageName); - GraphicDescriptor aDescriptor(aURL); - aDescriptor.Detect(); - CPPUNIT_ASSERT_EQUAL(GraphicFileFormat::TIF, aDescriptor.GetFileFormat()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155387) -{ - createSwDoc("sub_li_and_ctd.fodt"); - ExportToReqif(); - - // Without the fix in place, this would fail - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // Single top-level list - assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul"); - // Single top-level item - assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li"); - // 4 top-level paragraphs in the item - assertXPath(pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:p", 4); - // 2 sublists in the item - assertXPath( - pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul", 2); - // 2 items in the first sublist - assertXPath(pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul[1]/" - "reqif-xhtml:li", - 2); - // Check the last (most nested) subitem's text - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul[2]/" - "reqif-xhtml:li/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:p", - u"l3"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155496) -{ - createSwDoc("listItemSubheader.fodt"); - ExportToReqif(); - - // Without the fix in place, this would fail - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // Two top-level lists - assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul", 2); - // Single top-level item - assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li"); - // One top-level paragraph in the item - assertXPath(pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:p"); - // One sublist in the item - assertXPath( - pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:ul"); - // One item in the sublist - assertXPath(pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:ul/" - "reqif-xhtml:li"); - // Check its text - OUString aContent = getXPathContent( - pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:ul/" - "reqif-xhtml:li/reqif-xhtml:p"); - CPPUNIT_ASSERT_EQUAL(u"list 1 item 1\n\t\tsub-header"_ustr, aContent.trim()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_RightAlignedTable) -{ - createSwDoc("tableRight.fodt"); - ExportToReqif(); - - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // No 'align' attribute must be present in 'div' - assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:div", "align"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_ListsWithNumFormat) -{ - createSwDoc("listsWithNumFormat.fodt"); - ExportToReqif(); - - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // No 'type' attribute must be present in 'ol' - assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[1]", "type"); - assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[2]", "type"); - assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[3]", "type"); - assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[4]", "type"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155871) -{ - createSwDoc("tdf155871.fodt"); - ExportToReqif(); - - // Without the fix in place, this would fail - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_ListsNoStartAttribute) -{ - createSwDoc("twoListsWithSameStyle.fodt"); - ExportToReqif(); - - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // No 'start' attribute must be present in 'ol' - assertXPath(pDoc, "//reqif-xhtml:ol[@start]", 0); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_FrameTextAsObjectAltText) -{ - createSwDoc("frameWithText.fodt"); - ExportToReqif(); - - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // Without the fix, this would fail with - // - Expected: Some text in frame & - // - Actual : Frame1 - // i.e., frame name was used as the object element content, not frame text - assertXPathContent(pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object", - u"Some text in frame & "); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testSingleOleExport) -{ - // Given a document containing an embedded OLE object: - createSwDoc("ole2.odt"); - - // Create a selection for that object: - auto xDrawPageSupplier(mxComponent.queryThrow()); - auto xDrawPage(xDrawPageSupplier->getDrawPage()); - auto xModel(mxComponent.queryThrow()); - auto xController(xModel->getCurrentController().queryThrow()); - xController->select(xDrawPage->getByIndex(0)); - - // Store only the selection - css::uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"RTFOLEMimeType"_ustr, u"text/rtf"_ustr), - comphelper::makePropertyValue(u"SelectionOnly"_ustr, true), - }; - saveWithParams(aStoreProperties); - - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - - // The root element must be reqif-xhtml:object - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", "type", u"text/rtf"); - // It has no children - assertXPathChildren(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", 0); - // And the content is empty - assertXPathContent(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", u""); - - OUString aRtfData = getXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", "data"); - INetURLObject aUrl(maTempFile.GetURL()); - aUrl.setName(aRtfData); - SvMemoryStream aRtf; - HtmlExportTest::wrapRtfFragment(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE), aRtf); - tools::SvRef xReader(new TestReqIfRtfReader(aRtf)); - // The RTF OLE exports correctly - CPPUNIT_ASSERT(xReader->CallParser() != SvParserState::Error); - CPPUNIT_ASSERT_EQUAL(tools::Long(9358), xReader->GetObjw()); - CPPUNIT_ASSERT_EQUAL(tools::Long(450), xReader->GetObjh()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_Tdf156602) -{ - createSwDoc("NestingInA1.fodt"); - ExportToReqif(); - - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // The outer table must be kept in the document where the outer table is the first element, - // and its A1 starts with a nested table - - // Only two sub-elements must be inside the div: an outer table and a trailing paragraph - assertXPathChildren(pDoc, "/reqif-xhtml:html/reqif-xhtml:div", 2); - // The outer table must have exactly two rows - assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr", 2); - // First outer table cell must have two sub-elements: an inner table and a trailing paragraph - assertXPathChildren( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]", - 2); - // The inner table must have exactly two rows - assertXPath( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" - "reqif-xhtml:table/reqif-xhtml:tr", - 2); - // Check all the elements' content - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" - "reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/reqif-xhtml:p", - u"Inner.A1"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" - "reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[2]/reqif-xhtml:p", - u"Inner.B1"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" - "reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[1]/reqif-xhtml:p", - u"Inner.A2"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" - "reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[2]/reqif-xhtml:p", - u"Inner.B2"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" - "reqif-xhtml:p", - u"Outer.A1"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[2]/" - "reqif-xhtml:p", - u"Outer.B1"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[1]/" - "reqif-xhtml:p", - u"Outer.A2"); - assertXPathContent( - pDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[2]/" - "reqif-xhtml:p", - u"Outer.B2"); - assertXPathContent(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p", u"Following text"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf156647_CellPaddingRoundtrip) -{ - // Given a document with a table with cell padding: - createSwDoc("table_cell_padding.fodt"); - { - auto xTable = getParagraphOrTable(1); - auto aTableBorder = getProperty(xTable, u"TableBorder2"_ustr); - CPPUNIT_ASSERT_EQUAL(sal_Int16(1270), aTableBorder.Distance); - CPPUNIT_ASSERT(aTableBorder.IsDistanceValid); - } - // When exporting to reqif-xhtml: - ExportToReqif(); - // Make sure that we export it: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "//reqif-xhtml:table", "cellpadding", u"48"); // px - // Now import it - ImportFromReqif(maTempFile.GetURL()); - // Then make sure that padding is not lost: - { - auto xTable = getParagraphOrTable(1); - auto aTableBorder = getProperty(xTable, u"TableBorder2"_ustr); - // Without the accompanying fix in place, this test would have failed: - // - Expected: 1270 - // - Actual : 97 - // as the padding was lost, and the default 55 twip padding was used. - CPPUNIT_ASSERT_EQUAL(sal_Int16(1270), aTableBorder.Distance); - CPPUNIT_ASSERT(aTableBorder.IsDistanceValid); - } -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf157643_WideHBorder) -{ - // Given a document with a table with a wide border between its two rows: - createSwDoc("table_with_wide_horizontal_border.fodt"); - // When exporting to reqif-xhtml: - ExportToReqif(); - // Make sure that there's no extra tr's: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr", 2); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_PreserveSpaces) -{ - // Given a document with leading, trailing, and repeating intermediate spaces: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - static constexpr OUString paraText = u"\t test \t more text \t"_ustr; - pWrtShell->Insert(paraText); - - // When exporting to plain HTML, using PreserveSpaces: - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), - }); - - // Then make sure that "white-space: pre-wrap" is written into the paragraph's style: - htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); - CPPUNIT_ASSERT(pHtmlDoc); - const OUString style = getXPath(pHtmlDoc, "/html/body/p", "style"); - CPPUNIT_ASSERT(style.indexOf("white-space: pre-wrap") >= 0); - // Also check that the paragraph text is correct, without modifications in whitespace - assertXPathContent(pHtmlDoc, "/html/body/p", paraText); - - // Test import - - setImportFilterName(u"HTML (StarWriter)"_ustr); - loadFromURL(maTempFile.GetURL()); - CPPUNIT_ASSERT_EQUAL(paraText, getParagraph(1)->getString()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_PreserveSpaces) -{ - // Given a document with leading, trailing, and repeating intermediate spaces: - createSwDoc(); - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - static constexpr OUString paraText = u"\t test \t more text \t"_ustr; - pWrtShell->Insert(paraText); - - // When exporting to ReqIF, using PreserveSpaces: - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), - }); - - // Then make sure that xml:space="preserve" attribute exists in the paragraph element: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p", "space", u"preserve"); - // Also check that the paragraph text is correct, without modifications in whitespace - assertXPathContent(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p", paraText); - - // Test import - - setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr); - setImportFilterName(u"HTML (StarWriter)"_ustr); - loadFromURL(maTempFile.GetURL()); - CPPUNIT_ASSERT_EQUAL(paraText, getParagraph(1)->getString()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_NoPreserveSpaces) -{ - // Test cases where "PreserveSpaces" should not introduce respective markup - - const auto assertXPath_NoWhiteSpaceInStyle - = [this](const xmlDocUniquePtr& pDoc, const char* pXPath) { - xmlXPathObjectPtr pXmlObj = getXPathNode(pDoc, pXPath); - xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; - CPPUNIT_ASSERT_EQUAL_MESSAGE(pXPath, 1, xmlXPathNodeSetGetLength(pXmlNodes)); - CPPUNIT_ASSERT(pXmlNodes); - xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0]; - if (xmlChar* prop = xmlGetProp(pXmlNode, BAD_CAST("style"))) - { - OUString style = OUString::fromUtf8(reinterpret_cast(prop)); - CPPUNIT_ASSERT_MESSAGE(pXPath, style.indexOf("white-space:") < 0); - } - xmlXPathFreeObject(pXmlObj); - }; - const auto assertXPath_HasWhiteSpaceInStyle - = [this](const xmlDocUniquePtr& pDoc, const char* pXPath) { - const OUString style = getXPath(pDoc, pXPath, "style"); - CPPUNIT_ASSERT_MESSAGE(pXPath, style.indexOf("white-space: pre-wrap") >= 0); - }; - - createSwDoc("test_no_space_preserve.fodt"); - - // Export to plain HTML, using PreserveSpaces: - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), - }); - - htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); - CPPUNIT_ASSERT(pHtmlDoc); - - // No whitespace preservation, where no leading / trailing / double whitespace - assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[1]"); - // Whitespace preserved for a leading space - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[2]"); - // Whitespace preserved for a trailing space - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[3]"); - // Whitespace preserved for a double space - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[4]"); - // No whitespace preservation for leading / trailing breaks - assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[5]"); - // Whitespace preserved for a leading break + space - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[6]"); - // Whitespace preserved for a trailing space + break - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[7]"); - // No whitespace preservation for a middle break - assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[8]"); - // Whitespace preserved for a middle space + break - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[9]"); - // Whitespace preserved for a middle break + space - assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[10]"); - // No whitespace preservation for a trailing space and SVG - assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[11]"); - - // Test import - - setImportFilterName(u"HTML (StarWriter)"_ustr); - loadFromURL(maTempFile.GetURL()); - - CPPUNIT_ASSERT_EQUAL(u"No special spaces"_ustr, getParagraph(1)->getString()); - CPPUNIT_ASSERT_EQUAL(u" Leading space"_ustr, getParagraph(2)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Trailing space "_ustr, getParagraph(3)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Double space"_ustr, getParagraph(4)->getString()); - // Trailing break is removed in SwHTMLParser::AppendTextNode, and replaced with para spacing - CPPUNIT_ASSERT_EQUAL(u"\nLeading/trailing breaks"_ustr, getParagraph(5)->getString()); - CPPUNIT_ASSERT_EQUAL(u"\n Leading break + space"_ustr, getParagraph(6)->getString()); - // Trailing break is removed in SwHTMLParser::AppendTextNode, and replaced with para spacing - CPPUNIT_ASSERT_EQUAL(u"Trailing space + break "_ustr, getParagraph(7)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Middle\nbreak"_ustr, getParagraph(8)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Middle space \n+ break"_ustr, getParagraph(9)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Middle break\n + space"_ustr, getParagraph(10)->getString()); - // The SVG is replaced by a space in SwXParagraph::getString() - CPPUNIT_ASSERT_EQUAL(u"Trailing space and SVG "_ustr, getParagraph(11)->getString()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_NoPreserveSpaces) -{ - // Test cases where "PreserveSpaces" should not introduce respective markup - - createSwDoc("test_no_space_preserve.fodt"); - - // Export to ReqIF, using PreserveSpaces: - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), - }); - - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - - // No whitespace preservation, where no leading / trailing / double whitespace - assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[1]", "space"); - // Whitespace preserved for a leading space - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]", "space", - u"preserve"); - // Whitespace preserved for a trailing space - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[3]", "space", - u"preserve"); - // Whitespace preserved for a double space - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[4]", "space", - u"preserve"); - // No whitespace preservation for leading / trailing breaks - assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[5]", "space"); - // Whitespace preserved for a leading break + space - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[6]", "space", - u"preserve"); - // No whitespace preservation for a trailing space + break - assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[7]", "space"); - // No whitespace preservation for a middle break - assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[8]", "space"); - // No whitespace preservation for a middle space + break - assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[9]", "space"); - // Whitespace preserved for a middle break + space - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[10]", "space", - u"preserve"); - // No whitespace preservation for a trailing space and SVG - assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[11]", "space"); - - // Test import - - setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr); - setImportFilterName(u"HTML (StarWriter)"_ustr); - loadFromURL(maTempFile.GetURL()); - - CPPUNIT_ASSERT_EQUAL(u"No special spaces"_ustr, getParagraph(1)->getString()); - CPPUNIT_ASSERT_EQUAL(u" Leading space"_ustr, getParagraph(2)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Trailing space "_ustr, getParagraph(3)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Double space"_ustr, getParagraph(4)->getString()); - CPPUNIT_ASSERT_EQUAL(u"\nLeading/trailing breaks\n"_ustr, getParagraph(5)->getString()); - CPPUNIT_ASSERT_EQUAL(u"\n Leading break + space"_ustr, getParagraph(6)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Trailing space + break \n"_ustr, getParagraph(7)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Middle\nbreak"_ustr, getParagraph(8)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Middle space \n+ break"_ustr, getParagraph(9)->getString()); - CPPUNIT_ASSERT_EQUAL(u"Middle break\n + space"_ustr, getParagraph(10)->getString()); - // The SVG is replaced by a space in SwXParagraph::getString() - CPPUNIT_ASSERT_EQUAL(u"Trailing space and SVG "_ustr, getParagraph(11)->getString()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_ExportFormulasAsPDF) -{ - // Given a document with a formula: - createSwDoc("embedded_formula.fodt"); - - // When exporting to reqif with ExportFormulasAsPDF=true: - uno::Sequence aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"ExportFormulasAsPDF"_ustr, true), - }; - saveWithParams(aStoreProperties); - - // Make sure that the formula is exported as PDF: - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object", - "type", u"application/pdf"); - - css::uno::Sequence descr{ - comphelper::makePropertyValue(u"URL"_ustr, GetObjectPath(u".pdf"_ustr)), - }; - - uno::Reference xFactory( - comphelper::getProcessComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW); - uno::Reference xTypeDetection( - xFactory->createInstance(u"com.sun.star.document.TypeDetection"_ustr), - uno::UNO_QUERY_THROW); - - CPPUNIT_ASSERT_EQUAL(u"pdf_Portable_Document_Format"_ustr, - xTypeDetection->queryTypeByDescriptor(descr, true)); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_NoBrClearForImageWrap) -{ - // Given a document with a paragraph-anchored image with "none" wrap: - createSwDoc("image_anchored_to_paragraph_no_wrap.fodt"); - // When exporting to reqif: - ExportToReqif(); - // Make sure that there's no 'br' elements in the 'object' (used to represent the wrapping - // in HTML export, using 'clear' attribute): - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object"); - assertXPath(pXmlDoc, - "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object/reqif-xhtml:br", - 0); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_Tdf160017_spanClosingOrder) -{ - // Given a document with a paragraph having explicit font color and character border properties: - createSwDoc("char_border_and_font_color.fodt"); - // When exporting to reqif: - ExportToReqif(); - // Without the fix, this would fail, because there was an extra closing - WrapReqifFromTempFile(); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_Tdf160017_spanClosingOrder) -{ - // Given a document with a paragraph having explicit font color and character border properties: - createSwDoc("char_border_and_font_color.fodt"); - // When exporting to HTML: - ExportToHTML(); - // Parse it as XML (strict!) - // Without the fix, this would fail, because span and font elements closed in wrong order - CPPUNIT_ASSERT(parseXml(maTempFile)); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_Tdf160390) -{ - // This document must not hang infinitely on HTML export - createSwDoc("tdf160390.fodt"); - ExportToHTML(); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_160867) -{ - // Given a document with an image with hyperlink, and text with hyperlink, both in a frame: - createSwDoc("tdf160867_image_with_link.fodt"); - // When exporting to HTML: - ExportToHTML(); - // Parse it as XML (strict!) - xmlDocUniquePtr pDoc = parseXml(maTempFile); - CPPUNIT_ASSERT(pDoc); - assertXPath(pDoc, "/html/body/p", 2); - - // Test export of image and text hyperlinks in the image map. - // Without the fix, the test would fail with - // - Expected: 1 - // - Actual : 0 - // - In <>, XPath '/html/body/p[2]/map' number of nodes is incorrect - const OUString mapName = getXPath(pDoc, "/html/body/p[2]/map", "name"); - assertXPath(pDoc, "/html/body/p[2]/map/area[1]", "shape", u"rect"); - CPPUNIT_ASSERT(getXPath(pDoc, "/html/body/p[2]/map/area[1]", "href").endsWith("foo/bar")); - assertXPath(pDoc, "/html/body/p[2]/map/area[2]", "shape", u"rect"); - CPPUNIT_ASSERT(getXPath(pDoc, "/html/body/p[2]/map/area[2]", "href").endsWith("baz")); - assertXPath(pDoc, "/html/body/p[2]/img", "usemap", Concat2View("#" + mapName)); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_160867) -{ - // Given a document with an image with hyperlink, and text with hyperlink, both in a frame: - createSwDoc("tdf160867_image_with_link.fodt"); - // When exporting to reqif: - ExportToReqif(); - // For now, we don't (yet) output the whole map in ReqIF case. - // Make sure that the first hyperlink from the objects in the frame is output as an element - // around the whole image of the frame. - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - assertXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a/reqif-xhtml:object"); - CPPUNIT_ASSERT( - getXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a", "href").endsWith("foo/bar")); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_161979) -{ - // Given a document with two embedded metafiles: - createSwDoc("tdf161979_metafile.fodt"); - ExportToHTML(); - xmlDocUniquePtr pDoc = parseXml(maTempFile); - CPPUNIT_ASSERT(pDoc); - // First image: it has no EMF+ actions, and didn't use canvas rendering before the fix; - // yet, it didn't export correctly. - OUString imgName = getXPath(pDoc, "/html/body/p[2]/img", "src"); - CPPUNIT_ASSERT(imgName.endsWith(".gif")); - INetURLObject aUrl(maTempFile.GetURL()); - aUrl.setName(imgName); - Graphic graphic; - CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, GraphicFilter().ImportGraphic(graphic, aUrl)); - - // Check that only ~4% of pixels are not transparent (before the fix, it was completely black) - BitmapEx bitmap = graphic.GetBitmapEx(); - Size size = bitmap.GetSizePixel(); - int numNonTransparent = 0; - for (tools::Long y = 0; y < size.Height(); ++y) - for (tools::Long x = 0; x < size.Width(); ++x) - if (bitmap.GetPixelColor(x, y) != COL_TRANSPARENT) - ++numNonTransparent; - CPPUNIT_ASSERT_DOUBLES_EQUAL(0.04, numNonTransparent / double(size.Height() * size.Width()), - 0.01); - - // Second image: it consists of EMF+ records (no EMF fallback). It used canvas rendering - // before the fix; it also didn't export correctly. - imgName = getXPath(pDoc, "/html/body/p[4]/img", "src"); - CPPUNIT_ASSERT(imgName.endsWith(".gif")); - aUrl.SetURL(maTempFile.GetURL()); - aUrl.setName(imgName); - graphic.Clear(); - CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, GraphicFilter().ImportGraphic(graphic, aUrl)); - - // Check that some pixels are transparent (before the fix, it was completely black) - bitmap = graphic.GetBitmapEx(); - size = bitmap.GetSizePixel(); - numNonTransparent = 0; - for (tools::Long y = 0; y < size.Height(); ++y) - for (tools::Long x = 0; x < size.Width(); ++x) - if (bitmap.GetPixelColor(x, y) != COL_TRANSPARENT) - ++numNonTransparent; - CPPUNIT_ASSERT(numNonTransparent > 0); - CPPUNIT_ASSERT(numNonTransparent < size.Height() * size.Width()); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_exportAbsoluteURLs_ownRelative) -{ - auto pBatch(comphelper::ConfigurationChanges::create()); - Resetter resetter([ - bInternetPreviousValue = officecfg::Office::Common::Save::URL::Internet::get(), - bFileSystemPreviousValue = officecfg::Office::Common::Save::URL::FileSystem::get(), pBatch - ]() { - officecfg::Office::Common::Save::URL::Internet::set(bInternetPreviousValue, pBatch); - officecfg::Office::Common::Save::URL::FileSystem::set(bFileSystemPreviousValue, pBatch); - return pBatch->commit(); - }); - // Set saving absolute URLs - officecfg::Office::Common::Save::URL::Internet::set(false, pBatch); - officecfg::Office::Common::Save::URL::FileSystem::set(false, pBatch); - pBatch->commit(); - - createSwDoc("URLs.odt"); - // Export to ReqIF, using absolute URLs - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), - comphelper::makePropertyValue(u"RelativeOwnObjectURL"_ustr, true), - }); - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - - // HTTP URL: must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:p[1]/reqif-xhtml:a", "href", u"http://www.example.org/"); - // file URL: must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a", "href", - createFileURL(u"NonExistingPath/NonExistingFile.html")); - // form URL: must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:form", "action", u"https://www.example.org/submit"); - // linked image exported as object: generated, must be relative - OUString url = getXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".ole")); - // its original image URL: must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object/reqif-xhtml:object", "data", - createFileURL(u"external.png")); - // embedded image exported as object: generated, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".ole")); - // its image URL: generated, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".png")); - // unordered list with image bullet - it gets embedded as base64 data - OUString style = getXPath(pXmlDoc, "//reqif-xhtml:ul", "style"); - CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); - // an as-char frame, exported as a whole to an object, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".ole")); - // its file hyperlink must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a", "href", - createFileURL(u"foo/bar")); - // its image URL: generated, must be relative - url = getXPath( - pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".png")); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_exportRelativeURLs) -{ - CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::Internet::get()); - CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::FileSystem::get()); - - createSwDoc("URLs.odt"); - // Export to ReqIF, using relative URLs (the default) - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), - comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), - }); - xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); - - // HTTP URL: must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:p[1]/reqif-xhtml:a", "href", u"http://www.example.org/"); - // file URL: must be relative - OUString url = getXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a", "href"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith("NonExistingPath/NonExistingFile.html")); - // form URL: must be absolute - assertXPath(pXmlDoc, "//reqif-xhtml:form", "action", u"https://www.example.org/submit"); - // linked image exported as object: generated, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".ole")); - // its original image URL: must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith("external.png")); - // embedded image exported as object: generated, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".ole")); - // its image URL: generated, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".png")); - // unordered list with image bullet - it gets embedded as base64 data - OUString style = getXPath(pXmlDoc, "//reqif-xhtml:ul", "style"); - CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); - // an as-char frame, exported as a whole to an object, must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".ole")); - // its file hyperlink must be relative - url = getXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a", "href"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith("foo/bar")); - // its image URL: generated, must be relative - url = getXPath( - pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".png")); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_exportAbsoluteURLs_ownRelative) -{ - auto pBatch(comphelper::ConfigurationChanges::create()); - Resetter resetter([ - bInternetPreviousValue = officecfg::Office::Common::Save::URL::Internet::get(), - bFileSystemPreviousValue = officecfg::Office::Common::Save::URL::FileSystem::get(), pBatch - ]() { - officecfg::Office::Common::Save::URL::Internet::set(bInternetPreviousValue, pBatch); - officecfg::Office::Common::Save::URL::FileSystem::set(bFileSystemPreviousValue, pBatch); - return pBatch->commit(); - }); - // Set saving absolute URLs - officecfg::Office::Common::Save::URL::Internet::set(false, pBatch); - officecfg::Office::Common::Save::URL::FileSystem::set(false, pBatch); - pBatch->commit(); - - createSwDoc("URLs.odt"); - // Export to HTML, using absolute URLs - saveWithParams({ - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - comphelper::makePropertyValue(u"RelativeOwnObjectURL"_ustr, true), - }); - htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); - - // HTTP URL: must be absolute - assertXPath(pHtmlDoc, "//p[1]/a", "href", u"http://www.example.org/"); - // file URL: must be absolute - assertXPath(pHtmlDoc, "//p[2]/a", "href", - createFileURL(u"NonExistingPath/NonExistingFile.html")); - // form URL: must be absolute - assertXPath(pHtmlDoc, "//form", "action", u"https://www.example.org/submit"); - // linked image: must be absolute - assertXPath(pHtmlDoc, "//p[3]/img", "src", createFileURL(u"external.png")); - // embedded image: generated, must be relative - OUString url = getXPath(pHtmlDoc, "//p[4]/img", "src"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".png")); - // unordered list with image bullet - it gets embedded as base64 data - OUString style = getXPath(pHtmlDoc, "//ul", "style"); - CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); - // image-in-frame file hyperlink must be absolute; FIXME: HTMLOutFuncs::Out_ImageMap - // assertXPath(pHtmlDoc, "//p[5]/map/area", "href", createFileURL(u"foo/bar")); - // its image URL: generated, must be relative - url = getXPath(pHtmlDoc, "//p[5]/img", "src"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".gif")); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_exportRelativeURLs) -{ - CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::Internet::get()); - CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::FileSystem::get()); - - createSwDoc("URLs.odt"); - // Export to HTML, using relative URLs (the default) - ExportToHTML(); - htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); - - // HTTP URL: must be absolute - assertXPath(pHtmlDoc, "//p[1]/a", "href", u"http://www.example.org/"); - // file URL: must be relative - OUString url = getXPath(pHtmlDoc, "//p[2]/a", "href"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith("NonExistingPath/NonExistingFile.html")); - // form URL: must be absolute - assertXPath(pHtmlDoc, "//form", "action", u"https://www.example.org/submit"); - // linked image: must be relative - url = getXPath(pHtmlDoc, "//p[3]/img", "src"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith("external.png")); - // embedded image: generated, must be relative - url = getXPath(pHtmlDoc, "//p[4]/img", "src"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".png")); - // unordered list with image bullet - it gets embedded as base64 data - OUString style = getXPath(pHtmlDoc, "//ul", "style"); - CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); - // image-in-frame file hyperlink must be relative - url = getXPath(pHtmlDoc, "//p[5]/map/area", "href"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith("foo/bar")); - // its image URL: generated, must be relative - url = getXPath(pHtmlDoc, "//p[5]/img", "src"); - CPPUNIT_ASSERT(!url.startsWith("file:")); - CPPUNIT_ASSERT(url.endsWith(".gif")); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_162282) -{ - // Given a document with an embedded metafile: - createSwDoc("tdf162282.odt"); - ExportToReqif(); - xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); - - // Check that the exported EMF is exactly the same as in the ODF package - assertXPath(pDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"image/x-emf"); - OUString imgName = getXPath(pDoc, "//reqif-xhtml:p/reqif-xhtml:object", "data"); - CPPUNIT_ASSERT(imgName.endsWith(".emf")); - INetURLObject aUrl(maTempFile.GetURL()); - aUrl.setName(imgName); - SvFileStream aEmfStream(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE), - StreamMode::READ); - - // without the fix, this would fail with - // - Expected: 220 - // - Actual : 111260 - CPPUNIT_ASSERT_EQUAL(sal_uInt64(220), aEmfStream.TellEnd()); - - css::uno::Sequence emfData(220); - aEmfStream.ReadBytes(emfData.getArray(), emfData.getLength()); - - const css::uno::Sequence correctData{ - 0x01, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xF4, 0x01, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x88, 0x13, 0x00, 0x00, 0x88, 0x13, 0x00, 0x00, 0x20, 0x45, 0x4D, 0x46, 0x00, - 0x00, 0x01, 0x00, 0xDC, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, - 0x00, 0x38, 0x04, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0xF4, - 0x01, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x2D, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, - 0x00, 0xFA, 0x00, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x28, - 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, - 0x2C, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x2C, 0x01, 0x00, - 0x00, 0xC8, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - }; - CPPUNIT_ASSERT_EQUAL(correctData, emfData); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_162426) -{ - // Given a document with an image with style:wrap="none": - createSwDoc("tdf162426_image_with_wrap_none.fodt"); - // Before the fix, an assertion failed in HtmlWriter::attribute when exporting to HTML : - ExportToHTML(); - - xmlDocUniquePtr pDoc = parseXml(maTempFile); - CPPUNIT_ASSERT(pDoc); - - // Before the fix, the 'border' attribute was written after the 'img' tag was already closed, - // so without the assertion, this would fail with - // - In <>, XPath '/html/body/p/img' no attribute 'border' exist - assertXPath(pDoc, "/html/body/p/img", "border", u"0"); -} - -CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_163873) -{ - // Given a document with an image with style:wrap="none": - createSwDoc("tdf131728.docx"); - // Before the fix, an assertion failed in HtmlWriter::attribute when exporting to HTML : - ExportToHTML(); - - xmlDocUniquePtr pDoc = parseXml(maTempFile); - CPPUNIT_ASSERT(pDoc); - - // Before the fix, inline headings weren't inline - assertXPath(pDoc, "/html/body/p[5]/span/h2", "style", u"display:inline;"); - assertXPath(pDoc, "/html/body/p[6]/span/h2", "style", u"display:inline;"); - assertXPath(pDoc, "/html/body/p[7]/span/h2", "style", u"display:inline;"); - assertXPath(pDoc, "/html/body/p[11]/span/h2", "style", u"display:inline;"); - assertXPath(pDoc, "/html/body/p[14]/span/h2", "style", u"display:inline;"); -} - } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/htmlexport/htmlexport2.cxx b/sw/qa/extras/htmlexport/htmlexport2.cxx new file mode 100644 index 000000000000..99e9d5347b15 --- /dev/null +++ b/sw/qa/extras/htmlexport/htmlexport2.cxx @@ -0,0 +1,1612 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "htmlmodeltestbase.hxx" + +#include + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +namespace +{ +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedPNGShapeAsOLE) +{ + // Given a document with an image shape: + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xShape( + xFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); + xShape->setSize(awt::Size(10000, 10000)); + uno::Reference xShapeProps(xShape, uno::UNO_QUERY); + xShapeProps->setPropertyValue(u"GraphicURL"_ustr, uno::Any(createFileURL(u"ole2.png"))); + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + xDrawPageSupplier->getDrawPage()->add(xShape); + + // When exporting to XHTML: + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), + }; + saveWithParams(aStoreProperties); + + // Then make sure the PNG is embedded with an RTF wrapper: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: text/rtf + // - Actual : image/png + // i.e. the OLE wrapper around the PNG was missing. + assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"text/rtf"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNG) +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + // Given a document with a shape: + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xShape( + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); + xShape->setSize(awt::Size(10000, 10000)); + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + xDrawPageSupplier->getDrawPage()->add(xShape); + + // When exporting to XHTML: + ExportToReqif(); + + // Then make sure the shape is embedded as a PNG: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: image/png + // - Actual : image/x-vclgraphic + // i.e. the result was invalid ReqIF. + assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"image/png"); + + // Then check the pixel size of the shape: + Size aPixelSize(Application::GetDefaultDevice()->LogicToPixel(Size(10000, 10000), + MapMode(MapUnit::Map100thMM))); + // Without the accompanying fix in place, this test would have failed with: + // - no attribute 'width' exist + // i.e. shapes had no width. + assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "width", + OUString::number(aPixelSize.getWidth())); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testShapeAsImageHtml) +{ + // Given a document with a shape: + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xShape( + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); + xShape->setSize(awt::Size(5080, 2540)); + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + xDrawPageSupplier->getDrawPage()->add(xShape); + + // When exporting to plain HTML: + saveAndReload(u"HTML (StarWriter)"_ustr); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: + // - Actual : /> + // i.e. the output was not well-formed. + CPPUNIT_ASSERT_EQUAL(u" "_ustr, getParagraph(1)->getString()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testJson) +{ + // Given a document with a shape: + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xShape( + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); + xShape->setSize(awt::Size(2540, 2540)); + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + xDrawPageSupplier->getDrawPage()->add(xShape); + + // When exporting to HTML, and specifying options as JSON: + setFilterOptions(u"{\"XhtmlNs\":{\"type\":\"string\", \"value\":\"reqif-xhtml\"}," + "\"ShapeDPI\":{\"type\":\"long\",\"value\":\"192\"}}"_ustr); + save(u"HTML (StarWriter)"_ustr); + + // Then make sure those options are not ignored: + // Without the accompanying fix in place, this test would have failed, as GetPngPath() expects + // XML output, but xhtmlns=reqif-xhtml was ignored. + OUString aPngUrl = GetPngPath(); + SvFileStream aFileStream(aPngUrl, StreamMode::READ); + GraphicDescriptor aDescriptor(aFileStream, nullptr); + aDescriptor.Detect(/*bExtendedInfo=*/true); + // Make sure that the increased DPI is taken into account: + tools::Long nExpected = 192; + CPPUNIT_ASSERT_EQUAL(nExpected, aDescriptor.GetSizePixel().getWidth()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNGCustomDPI) +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + // Given a document with a shape: + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xShape( + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); + xShape->setSize(awt::Size(5080, 2540)); + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + xDrawPageSupplier->getDrawPage()->add(xShape); + sal_Int32 nDPI = 600; + + // When exporting to XHTML: + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"ShapeDPI"_ustr, nDPI), + }; + saveWithParams(aStoreProperties); + + // Then make sure the shape is embedded as a PNG: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"image/png"); + + // Then check the pixel size of the shape: + Size aPixelSize(Application::GetDefaultDevice()->LogicToPixel(Size(5080, 2540), + MapMode(MapUnit::Map100thMM))); + tools::Long nPNGWidth = 1200; + OUString aPngUrl = GetPngPath(); + SvFileStream aFileStream(aPngUrl, StreamMode::READ); + GraphicDescriptor aDescriptor(aFileStream, nullptr); + aDescriptor.Detect(/*bExtendedInfo=*/true); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 1200 + // - Actual : 1000 + // i.e. first setting a double DPI didn't result in larger pixel width of the PNG, then it was + // limited to 1000 pixels (because the pixel limit was 500k). + CPPUNIT_ASSERT_EQUAL(nPNGWidth, aDescriptor.GetSizePixel().getWidth()); + + // Then make sure the shape's logic size (in CSS pixels) don't change: + assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object", "width", + OUString::number(aPixelSize.getWidth())); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOleBmpTransparent) +{ + // Given a document with a transparent image: + createSwDoc(); + uno::Sequence aArgs = { + comphelper::makePropertyValue(u"FileName"_ustr, createFileURL(u"transparent.png")), + }; + dispatchCommand(mxComponent, u".uno:InsertGraphic"_ustr, aArgs); + + // When exporting to reqif with ExportImagesAsOLE=true: + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), + }; + saveWithParams(aStoreProperties); + + // Then make sure the transparent pixel turns into white: + SvMemoryStream aOle1; + ParseOle1FromRtfUrl(GetOlePath(), aOle1); + OLE1Reader aOle1Reader(aOle1); + SvMemoryStream aBitmapStream(aOle1Reader.m_aNativeData.data(), aOle1Reader.m_aNativeData.size(), + StreamMode::READ); + Bitmap aBitmap; + ReadDIB(aBitmap, aBitmapStream, /*bFileHeader=*/true); + Size aBitmapSize = aBitmap.GetSizePixel(); + BitmapEx aBitmapEx(aBitmap); + Color nActualColor + = aBitmapEx.GetPixelColor(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: Color: R:255 G:255 B:255 A:0 + // - Actual : Color: R:0 G:0 B:0 A:0 + // i.e. the bitmap without an alpha channel was black, not white. + CPPUNIT_ASSERT_EQUAL(COL_WHITE, nActualColor); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testListsHeading) +{ + // Given a document with lh, lh, li, li, lh and lh nodes: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"list 1, header 1"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"list 1, header 2"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"list 2, item 1"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"list 2, item 2"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"list 3, header 1"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"list 3, header 2"_ustr); + SwDoc* pDoc = pWrtShell->GetDoc(); + pWrtShell->Up(false, 5); + { + sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); + SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + rTextNode.SetCountedInList(false); + } + pWrtShell->Down(false, 1); + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + rTextNode.SetCountedInList(false); + } + } + pWrtShell->Down(false, 1); + { + sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); + SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + } + pWrtShell->Down(false, 1); + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + } + } + pWrtShell->Down(false, 1); + { + sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); + SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + rTextNode.SetCountedInList(false); + } + pWrtShell->Down(false, 1); + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + rTextNode.SetCountedInList(false); + } + } + + // When exporting to ReqIF: + ExportToReqif(); + + // Then make sure the output is valid xhtml: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + + OUString aContent + = getXPathContent(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol/" + "reqif-xhtml:li[@style='display: block']/reqif-xhtml:p"); + CPPUNIT_ASSERT_EQUAL(u"list 1, header 1"_ustr, aContent.trim()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testOleEmfPreviewToHtml) +{ + // Given a document containing an embedded object, with EMF preview: + createSwDoc("ole2.odt"); + + // When exporting to HTML: + ExportToHTML(); + + // Then make sure the tag has matching file extension and data: + htmlDocUniquePtr pDoc = parseHtml(maTempFile); + OUString aPath = getXPath(pDoc, "/html/body/p/img", "src"); + // Without the accompanying fix in place, this test would have failed, as aPath was + // ole_html_3978e5f373402b43.JPG, with EMF data. + CPPUNIT_ASSERT(aPath.endsWith("gif")); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testNestedBullets) +{ + // Given a documented with nested lists: + createSwDoc(); + SwDoc* pDoc = getSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"first"_ustr); + sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName()); + SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos]; + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + rTextNode.SetAttrListLevel(0); + } + pWrtShell->SplitNode(); + pWrtShell->Insert(u"second"_ustr); + { + SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->GetNode(); + SwTextNode& rTextNode = *rNode.GetTextNode(); + rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName())); + rTextNode.SetAttrListLevel(1); + } + + // When exporting to xhtml: + ExportToReqif(); + + // Then make sure that there is a
      1. between the outer and the inner
          : + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - XPath '//reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p' not found + // i.e. the
        1. inside the outer
            was missing. + assertXPathContent( + pXmlDoc, "//reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p", + u"second"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTrailingLineBreak) +{ + // Given a document with a trailing line-break: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"test\n"_ustr); + + // When exporting to reqif-xhtml: + ExportToReqif(); + + // Then make sure that we still have a single line-break: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 1 + // - Actual : 2 + // - XPath '//reqif-xhtml:br' number of nodes is incorrect + assertXPath(pXmlDoc, "//reqif-xhtml:br", 1); + + // Then test the import side: + // Given an empty document: + // When importing a
            from reqif-xhtml: + ImportFromReqif(maTempFile.GetURL()); + + // Then make sure that line-break is not lost: + pWrtShell = getSwDocShell()->GetWrtShell(); + OUString aActual = pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText(); + // Without the accompanying fix in place, this test would have failed, as the trailing + // line-break was lost. + CPPUNIT_ASSERT_EQUAL(u"test\n"_ustr, aActual); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTab) +{ + // Given a document with leading tabs: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"\t first"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"\t\t second"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"thi \t rd"_ustr); + + // When exporting to HTML, using LeadingTabWidth=2: + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"LeadingTabWidth"_ustr, static_cast(2)), + }; + saveWithParams(aStoreProperties); + + // Then make sure that leading tabs are replaced with 2 nbsps: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: first + // - Actual : first + // i.e. the leading tab was not replaced by 2 nbsps. + assertXPathContent(pXmlDoc, "//reqif-xhtml:p[1]", u"\xa0\xa0 first"); + // Test a leading tab that is not at the start of the paragraph: + assertXPathContent(pXmlDoc, "//reqif-xhtml:p[2]", u"\xa0\xa0\xa0\xa0 second"); + // Test a tab which is not leading: + assertXPathContent(pXmlDoc, "//reqif-xhtml:p[3]", u"thi \t rd"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTabHTML) +{ + // Given a document with leading tabs: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"\t test"_ustr); + + // When exporting to plain HTML, using LeadingTabWidth=2: + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"LeadingTabWidth"_ustr, static_cast(2)), + }; + saveWithParams(aStoreProperties); + + // Then make sure that leading tabs are replaced with 2 nbsps: + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + CPPUNIT_ASSERT(pHtmlDoc); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: test + // - Actual : test + // i.e. the leading tab was not replaced by 2 nbsps. + assertXPathContent(pHtmlDoc, "/html/body/p", SAL_NEWLINE_STRING u"\xa0\xa0 test"); +} + +CPPUNIT_TEST_FIXTURE(HtmlExportTest, testClearingBreak) +{ + auto verify = [this]() { + uno::Reference xParagraph(getParagraph(1), uno::UNO_QUERY); + uno::Reference xPortions = xParagraph->createEnumeration(); + uno::Reference xPortion; + OUString aPortionType; + while (true) + { + // Ignore leading comments. + xPortion.set(xPortions->nextElement(), uno::UNO_QUERY); + xPortion->getPropertyValue(u"TextPortionType"_ustr) >>= aPortionType; + if (aPortionType != "Annotation") + { + break; + } + } + // Skip "foo". + // Without the accompanying fix in place, this test would have failed with: + // An uncaught exception of type com.sun.star.container.NoSuchElementException + // i.e. the first para was just comments + text portion, the clearing break was lost. + xPortion.set(xPortions->nextElement(), uno::UNO_QUERY); + xPortion->getPropertyValue(u"TextPortionType"_ustr) >>= aPortionType; + CPPUNIT_ASSERT_EQUAL(u"LineBreak"_ustr, aPortionType); + uno::Reference xLineBreak; + xPortion->getPropertyValue(u"LineBreak"_ustr) >>= xLineBreak; + sal_Int16 eClear{}; + uno::Reference xLineBreakProps(xLineBreak, uno::UNO_QUERY); + xLineBreakProps->getPropertyValue(u"Clear"_ustr) >>= eClear; + CPPUNIT_ASSERT_EQUAL(static_cast(SwLineBreakClear::ALL), eClear); + }; + + // Given a document with an at-para anchored image + a clearing break: + // When loading that file: + createSwWebDoc("clearing-break.html"); + // Then make sure that the clear property of the break is not ignored: + verify(); + saveAndReload(mpFilter); + // Make sure that the clear property of the break is not ignored during export: + verify(); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTableBackground) +{ + // Given a document with two tables: first stable has a background, second table has a + // background in its first row: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + SwInsertTableOptions aInsertTableOptions(SwInsertTableFlags::DefaultBorder, + /*nRowsToRepeat=*/0); + pWrtShell->InsertTable(aInsertTableOptions, /*nRows=*/1, /*nCols=*/1); + pWrtShell->MoveTable(GotoPrevTable, fnTableStart); + SvxBrushItem aBrush(COL_LIGHTRED, RES_BACKGROUND); + pWrtShell->SetTabBackground(aBrush); + pWrtShell->Down(/*bSelect=*/false); + pWrtShell->SplitNode(); + pWrtShell->InsertTable(aInsertTableOptions, /*nRows=*/2, /*nCols=*/1); + pWrtShell->MoveTable(GotoPrevTable, fnTableStart); + aBrush.SetColor(COL_LIGHTGREEN); + pWrtShell->SetRowBackground(aBrush); + pWrtShell->Down(/*bSelect=*/false); + // Second row has an explicit transparent background. + aBrush.SetColor(COL_TRANSPARENT); + pWrtShell->SetRowBackground(aBrush); + + // When exporting to reqif-xhtml: + ExportToReqif(); + + // Then make sure that CSS markup is used, not HTML one: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - XPath '//reqif-xhtml:table[1]' no attribute 'style' exist + // i.e. HTML markup was used for the table background color. + assertXPath(pXmlDoc, "//reqif-xhtml:table[1]", "style", u"background: #ff0000"); + assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:table[1]", "bgcolor"); + assertXPath(pXmlDoc, "//reqif-xhtml:table[2]/reqif-xhtml:tr[1]", "style", + u"background: #00ff00"); + assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:table[2]/reqif-xhtml:tr[1]", "bgcolor"); + // Second row has no explicit style, the default is not written. + assertXPathNoAttribute(pXmlDoc, "//reqif-xhtml:table[2]/reqif-xhtml:tr[2]", "style"); +} + +CPPUNIT_TEST_FIXTURE(HtmlExportTest, testImageKeepRatio) +{ + // Given a document with an image: width is relative, height is "keep ratio": + createSwDoc(); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference xTextGraphic( + xFactory->createInstance(u"com.sun.star.text.TextGraphicObject"_ustr), uno::UNO_QUERY); + xTextGraphic->setPropertyValue(u"AnchorType"_ustr, + uno::Any(text::TextContentAnchorType_AS_CHARACTER)); + xTextGraphic->setPropertyValue(u"RelativeWidth"_ustr, uno::Any(static_cast(42))); + xTextGraphic->setPropertyValue(u"IsSyncHeightToWidth"_ustr, uno::Any(true)); + uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); + uno::Reference xBodyText = xTextDocument->getText(); + uno::Reference xCursor(xBodyText->createTextCursor()); + uno::Reference xTextContent(xTextGraphic, uno::UNO_QUERY); + xBodyText->insertTextContent(xCursor, xTextContent, false); + + // When exporting to HTML: + save(mpFilter); + + // Then make sure that the width is not a fixed size, that would break on resizing the browser + // window: + htmlDocUniquePtr pDoc = parseHtml(maTempFile); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: auto + // - Actual : 2 + // i.e. a static (CSS pixel) height was written. + assertXPath(pDoc, "/html/body/p/img", "height", u"auto"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testSectionDir) +{ + // Given a document with a section: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"test"_ustr); + pWrtShell->SelAll(); + SwSectionData aSectionData(SectionType::Content, u"mysect"_ustr); + pWrtShell->InsertSection(aSectionData); + + // When exporting to (reqif-)xhtml: + ExportToReqif(); + + // Then make sure CSS is used to export the text direction of the section: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + // Without the accompanying fix in place, this test would have failed with: + // - XPath '//reqif-xhtml:div[@id='mysect']' no attribute 'style' exist + // i.e. the dir="ltr" HTML attribute was used instead. + assertXPath(pXmlDoc, "//reqif-xhtml:div[@id='mysect']", "style", u"dir: ltr"); +} + +CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf114769) +{ + // Create document from scratch since relative urls to filesystem can be replaced + // by absolute during save/load + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + pWrtShell->Insert(u"Hyperlink1"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"Hyperlink2"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"Hyperlink3"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"Hyperlink4"_ustr); + pWrtShell->SplitNode(); + pWrtShell->Insert(u"Hyperlink5"_ustr); + pWrtShell->SplitNode(); + + // Normal external URL + uno::Reference xRun(getRun(getParagraph(1), 1), uno::UNO_QUERY); + xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"http://libreoffice.org/"_ustr)); + + // Bookmark reference + xRun.set(getRun(getParagraph(2), 1), uno::UNO_QUERY); + xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"#some_bookmark"_ustr)); + + // Filesystem absolute link + xRun.set(getRun(getParagraph(3), 1), uno::UNO_QUERY); + xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"C:\\test.txt"_ustr)); + + // Filesystem relative link + xRun.set(getRun(getParagraph(4), 1), uno::UNO_QUERY); + xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u"..\\..\\test.odt"_ustr)); + + // Filesystem relative link + xRun.set(getRun(getParagraph(5), 1), uno::UNO_QUERY); + xRun->setPropertyValue(u"HyperLinkURL"_ustr, uno::Any(u".\\another.odt"_ustr)); + + // Export + save(mpFilter); + + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + CPPUNIT_ASSERT(pHtmlDoc); + + assertXPath(pHtmlDoc, "/html/body/p[1]/a", "href", u"http://libreoffice.org/"); + assertXPath(pHtmlDoc, "/html/body/p[2]/a", "href", u"#some_bookmark"); + assertXPath(pHtmlDoc, "/html/body/p[3]/a", "href", u"C:\\test.txt"); + assertXPath(pHtmlDoc, "/html/body/p[4]/a", "href", u"..\\..\\test.odt"); + assertXPath(pHtmlDoc, "/html/body/p[5]/a", "href", u".\\another.odt"); +} + +CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf153923) +{ + createSwDoc("TableWithIndent.fodt"); + save(mpFilter); + + // Parse it as XML (strict!) + xmlDocUniquePtr pDoc = parseXml(maTempFile); + // Without the fix in place, this would fail + CPPUNIT_ASSERT(pDoc); + + assertXPath(pDoc, "/html/body//dl", 3); + // The 'dd' tag was not closed + assertXPath(pDoc, "/html/body//dd", 3); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf153923_ReqIF) +{ + createSwDoc("TableWithIndent.fodt"); + ExportToReqif(); + + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + assertXPath(pDoc, "//reqif-xhtml:table"); + // There should be no 'dd' or 'dl' tags, used as a hack for table indentation + assertXPath(pDoc, "//reqif-xhtml:dl", 0); + assertXPath(pDoc, "//reqif-xhtml:dd", 0); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIfTransparentTifImg) +{ + // reqIf export must keep the TIF encoding of the image + createSwDoc("reqif-transparent-tif-img.odt"); + ExportToReqif(); + + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object[1]", "type", u"image/tiff"); + OUString imageName = getXPath(pXmlDoc, "//reqif-xhtml:p/reqif-xhtml:object[1]", "data"); + // Without the accompanying fix in place, this test would have failed, + // ending with .gif, because XOutFlags::UseGifIfSensible flag combined + // with the transparent image would result in GIF export + CPPUNIT_ASSERT(imageName.endsWith(".tif")); + + INetURLObject aURL(maTempFile.GetURL()); + aURL.setName(imageName); + GraphicDescriptor aDescriptor(aURL); + aDescriptor.Detect(); + CPPUNIT_ASSERT_EQUAL(GraphicFileFormat::TIF, aDescriptor.GetFileFormat()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155387) +{ + createSwDoc("sub_li_and_ctd.fodt"); + ExportToReqif(); + + // Without the fix in place, this would fail + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // Single top-level list + assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul"); + // Single top-level item + assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li"); + // 4 top-level paragraphs in the item + assertXPath(pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:p", 4); + // 2 sublists in the item + assertXPath( + pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul", 2); + // 2 items in the first sublist + assertXPath(pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul[1]/" + "reqif-xhtml:li", + 2); + // Check the last (most nested) subitem's text + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul[2]/" + "reqif-xhtml:li/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:p", + u"l3"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155496) +{ + createSwDoc("listItemSubheader.fodt"); + ExportToReqif(); + + // Without the fix in place, this would fail + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // Two top-level lists + assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul", 2); + // Single top-level item + assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li"); + // One top-level paragraph in the item + assertXPath(pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:p"); + // One sublist in the item + assertXPath( + pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:ul"); + // One item in the sublist + assertXPath(pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:ul/" + "reqif-xhtml:li"); + // Check its text + OUString aContent = getXPathContent( + pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul[1]/reqif-xhtml:li/reqif-xhtml:ul/" + "reqif-xhtml:li/reqif-xhtml:p"); + CPPUNIT_ASSERT_EQUAL(u"list 1 item 1\n\t\tsub-header"_ustr, aContent.trim()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_RightAlignedTable) +{ + createSwDoc("tableRight.fodt"); + ExportToReqif(); + + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // No 'align' attribute must be present in 'div' + assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:div", "align"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_ListsWithNumFormat) +{ + createSwDoc("listsWithNumFormat.fodt"); + ExportToReqif(); + + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // No 'type' attribute must be present in 'ol' + assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[1]", "type"); + assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[2]", "type"); + assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[3]", "type"); + assertXPathNoAttribute(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[4]", "type"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155871) +{ + createSwDoc("tdf155871.fodt"); + ExportToReqif(); + + // Without the fix in place, this would fail + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_ListsNoStartAttribute) +{ + createSwDoc("twoListsWithSameStyle.fodt"); + ExportToReqif(); + + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // No 'start' attribute must be present in 'ol' + assertXPath(pDoc, "//reqif-xhtml:ol[@start]", 0); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_FrameTextAsObjectAltText) +{ + createSwDoc("frameWithText.fodt"); + ExportToReqif(); + + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // Without the fix, this would fail with + // - Expected: Some text in frame & + // - Actual : Frame1 + // i.e., frame name was used as the object element content, not frame text + assertXPathContent(pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object", + u"Some text in frame & "); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testSingleOleExport) +{ + // Given a document containing an embedded OLE object: + createSwDoc("ole2.odt"); + + // Create a selection for that object: + auto xDrawPageSupplier(mxComponent.queryThrow()); + auto xDrawPage(xDrawPageSupplier->getDrawPage()); + auto xModel(mxComponent.queryThrow()); + auto xController(xModel->getCurrentController().queryThrow()); + xController->select(xDrawPage->getByIndex(0)); + + // Store only the selection + css::uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"RTFOLEMimeType"_ustr, u"text/rtf"_ustr), + comphelper::makePropertyValue(u"SelectionOnly"_ustr, true), + }; + saveWithParams(aStoreProperties); + + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + + // The root element must be reqif-xhtml:object + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", "type", u"text/rtf"); + // It has no children + assertXPathChildren(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", 0); + // And the content is empty + assertXPathContent(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", u""); + + OUString aRtfData = getXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:object", "data"); + INetURLObject aUrl(maTempFile.GetURL()); + aUrl.setName(aRtfData); + SvMemoryStream aRtf; + HtmlExportTest::wrapRtfFragment(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE), aRtf); + tools::SvRef xReader(new TestReqIfRtfReader(aRtf)); + // The RTF OLE exports correctly + CPPUNIT_ASSERT(xReader->CallParser() != SvParserState::Error); + CPPUNIT_ASSERT_EQUAL(tools::Long(9358), xReader->GetObjw()); + CPPUNIT_ASSERT_EQUAL(tools::Long(450), xReader->GetObjh()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_Tdf156602) +{ + createSwDoc("NestingInA1.fodt"); + ExportToReqif(); + + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // The outer table must be kept in the document where the outer table is the first element, + // and its A1 starts with a nested table + + // Only two sub-elements must be inside the div: an outer table and a trailing paragraph + assertXPathChildren(pDoc, "/reqif-xhtml:html/reqif-xhtml:div", 2); + // The outer table must have exactly two rows + assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr", 2); + // First outer table cell must have two sub-elements: an inner table and a trailing paragraph + assertXPathChildren( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]", + 2); + // The inner table must have exactly two rows + assertXPath( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" + "reqif-xhtml:table/reqif-xhtml:tr", + 2); + // Check all the elements' content + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" + "reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/reqif-xhtml:p", + u"Inner.A1"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" + "reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[2]/reqif-xhtml:p", + u"Inner.B1"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" + "reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[1]/reqif-xhtml:p", + u"Inner.A2"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" + "reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[2]/reqif-xhtml:p", + u"Inner.B2"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[1]/" + "reqif-xhtml:p", + u"Outer.A1"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[1]/reqif-xhtml:td[2]/" + "reqif-xhtml:p", + u"Outer.B1"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[1]/" + "reqif-xhtml:p", + u"Outer.A2"); + assertXPathContent( + pDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr[2]/reqif-xhtml:td[2]/" + "reqif-xhtml:p", + u"Outer.B2"); + assertXPathContent(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p", u"Following text"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf156647_CellPaddingRoundtrip) +{ + // Given a document with a table with cell padding: + createSwDoc("table_cell_padding.fodt"); + { + auto xTable = getParagraphOrTable(1); + auto aTableBorder = getProperty(xTable, u"TableBorder2"_ustr); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1270), aTableBorder.Distance); + CPPUNIT_ASSERT(aTableBorder.IsDistanceValid); + } + // When exporting to reqif-xhtml: + ExportToReqif(); + // Make sure that we export it: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "//reqif-xhtml:table", "cellpadding", u"48"); // px + // Now import it + ImportFromReqif(maTempFile.GetURL()); + // Then make sure that padding is not lost: + { + auto xTable = getParagraphOrTable(1); + auto aTableBorder = getProperty(xTable, u"TableBorder2"_ustr); + // Without the accompanying fix in place, this test would have failed: + // - Expected: 1270 + // - Actual : 97 + // as the padding was lost, and the default 55 twip padding was used. + CPPUNIT_ASSERT_EQUAL(sal_Int16(1270), aTableBorder.Distance); + CPPUNIT_ASSERT(aTableBorder.IsDistanceValid); + } +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf157643_WideHBorder) +{ + // Given a document with a table with a wide border between its two rows: + createSwDoc("table_with_wide_horizontal_border.fodt"); + // When exporting to reqif-xhtml: + ExportToReqif(); + // Make sure that there's no extra tr's: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr", 2); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_PreserveSpaces) +{ + // Given a document with leading, trailing, and repeating intermediate spaces: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + static constexpr OUString paraText = u"\t test \t more text \t"_ustr; + pWrtShell->Insert(paraText); + + // When exporting to plain HTML, using PreserveSpaces: + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), + }); + + // Then make sure that "white-space: pre-wrap" is written into the paragraph's style: + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + CPPUNIT_ASSERT(pHtmlDoc); + const OUString style = getXPath(pHtmlDoc, "/html/body/p", "style"); + CPPUNIT_ASSERT(style.indexOf("white-space: pre-wrap") >= 0); + // Also check that the paragraph text is correct, without modifications in whitespace + assertXPathContent(pHtmlDoc, "/html/body/p", paraText); + + // Test import + + setImportFilterName(u"HTML (StarWriter)"_ustr); + loadFromURL(maTempFile.GetURL()); + CPPUNIT_ASSERT_EQUAL(paraText, getParagraph(1)->getString()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_PreserveSpaces) +{ + // Given a document with leading, trailing, and repeating intermediate spaces: + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + static constexpr OUString paraText = u"\t test \t more text \t"_ustr; + pWrtShell->Insert(paraText); + + // When exporting to ReqIF, using PreserveSpaces: + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), + }); + + // Then make sure that xml:space="preserve" attribute exists in the paragraph element: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p", "space", u"preserve"); + // Also check that the paragraph text is correct, without modifications in whitespace + assertXPathContent(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p", paraText); + + // Test import + + setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr); + setImportFilterName(u"HTML (StarWriter)"_ustr); + loadFromURL(maTempFile.GetURL()); + CPPUNIT_ASSERT_EQUAL(paraText, getParagraph(1)->getString()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_NoPreserveSpaces) +{ + // Test cases where "PreserveSpaces" should not introduce respective markup + + const auto assertXPath_NoWhiteSpaceInStyle + = [this](const xmlDocUniquePtr& pDoc, const char* pXPath) { + xmlXPathObjectPtr pXmlObj = getXPathNode(pDoc, pXPath); + xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; + CPPUNIT_ASSERT_EQUAL_MESSAGE(pXPath, 1, xmlXPathNodeSetGetLength(pXmlNodes)); + CPPUNIT_ASSERT(pXmlNodes); + xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0]; + if (xmlChar* prop = xmlGetProp(pXmlNode, BAD_CAST("style"))) + { + OUString style = OUString::fromUtf8(reinterpret_cast(prop)); + CPPUNIT_ASSERT_MESSAGE(pXPath, style.indexOf("white-space:") < 0); + } + xmlXPathFreeObject(pXmlObj); + }; + const auto assertXPath_HasWhiteSpaceInStyle + = [this](const xmlDocUniquePtr& pDoc, const char* pXPath) { + const OUString style = getXPath(pDoc, pXPath, "style"); + CPPUNIT_ASSERT_MESSAGE(pXPath, style.indexOf("white-space: pre-wrap") >= 0); + }; + + createSwDoc("test_no_space_preserve.fodt"); + + // Export to plain HTML, using PreserveSpaces: + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), + }); + + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + CPPUNIT_ASSERT(pHtmlDoc); + + // No whitespace preservation, where no leading / trailing / double whitespace + assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[1]"); + // Whitespace preserved for a leading space + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[2]"); + // Whitespace preserved for a trailing space + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[3]"); + // Whitespace preserved for a double space + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[4]"); + // No whitespace preservation for leading / trailing breaks + assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[5]"); + // Whitespace preserved for a leading break + space + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[6]"); + // Whitespace preserved for a trailing space + break + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[7]"); + // No whitespace preservation for a middle break + assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[8]"); + // Whitespace preserved for a middle space + break + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[9]"); + // Whitespace preserved for a middle break + space + assertXPath_HasWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[10]"); + // No whitespace preservation for a trailing space and SVG + assertXPath_NoWhiteSpaceInStyle(pHtmlDoc, "/html/body/p[11]"); + + // Test import + + setImportFilterName(u"HTML (StarWriter)"_ustr); + loadFromURL(maTempFile.GetURL()); + + CPPUNIT_ASSERT_EQUAL(u"No special spaces"_ustr, getParagraph(1)->getString()); + CPPUNIT_ASSERT_EQUAL(u" Leading space"_ustr, getParagraph(2)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Trailing space "_ustr, getParagraph(3)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Double space"_ustr, getParagraph(4)->getString()); + // Trailing break is removed in SwHTMLParser::AppendTextNode, and replaced with para spacing + CPPUNIT_ASSERT_EQUAL(u"\nLeading/trailing breaks"_ustr, getParagraph(5)->getString()); + CPPUNIT_ASSERT_EQUAL(u"\n Leading break + space"_ustr, getParagraph(6)->getString()); + // Trailing break is removed in SwHTMLParser::AppendTextNode, and replaced with para spacing + CPPUNIT_ASSERT_EQUAL(u"Trailing space + break "_ustr, getParagraph(7)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Middle\nbreak"_ustr, getParagraph(8)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Middle space \n+ break"_ustr, getParagraph(9)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Middle break\n + space"_ustr, getParagraph(10)->getString()); + // The SVG is replaced by a space in SwXParagraph::getString() + CPPUNIT_ASSERT_EQUAL(u"Trailing space and SVG "_ustr, getParagraph(11)->getString()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_NoPreserveSpaces) +{ + // Test cases where "PreserveSpaces" should not introduce respective markup + + createSwDoc("test_no_space_preserve.fodt"); + + // Export to ReqIF, using PreserveSpaces: + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"PreserveSpaces"_ustr, true), + }); + + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + + // No whitespace preservation, where no leading / trailing / double whitespace + assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[1]", "space"); + // Whitespace preserved for a leading space + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]", "space", + u"preserve"); + // Whitespace preserved for a trailing space + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[3]", "space", + u"preserve"); + // Whitespace preserved for a double space + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[4]", "space", + u"preserve"); + // No whitespace preservation for leading / trailing breaks + assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[5]", "space"); + // Whitespace preserved for a leading break + space + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[6]", "space", + u"preserve"); + // No whitespace preservation for a trailing space + break + assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[7]", "space"); + // No whitespace preservation for a middle break + assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[8]", "space"); + // No whitespace preservation for a middle space + break + assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[9]", "space"); + // Whitespace preserved for a middle break + space + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[10]", "space", + u"preserve"); + // No whitespace preservation for a trailing space and SVG + assertXPathNoAttribute(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[11]", "space"); + + // Test import + + setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr); + setImportFilterName(u"HTML (StarWriter)"_ustr); + loadFromURL(maTempFile.GetURL()); + + CPPUNIT_ASSERT_EQUAL(u"No special spaces"_ustr, getParagraph(1)->getString()); + CPPUNIT_ASSERT_EQUAL(u" Leading space"_ustr, getParagraph(2)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Trailing space "_ustr, getParagraph(3)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Double space"_ustr, getParagraph(4)->getString()); + CPPUNIT_ASSERT_EQUAL(u"\nLeading/trailing breaks\n"_ustr, getParagraph(5)->getString()); + CPPUNIT_ASSERT_EQUAL(u"\n Leading break + space"_ustr, getParagraph(6)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Trailing space + break \n"_ustr, getParagraph(7)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Middle\nbreak"_ustr, getParagraph(8)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Middle space \n+ break"_ustr, getParagraph(9)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Middle break\n + space"_ustr, getParagraph(10)->getString()); + // The SVG is replaced by a space in SwXParagraph::getString() + CPPUNIT_ASSERT_EQUAL(u"Trailing space and SVG "_ustr, getParagraph(11)->getString()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_ExportFormulasAsPDF) +{ + // Given a document with a formula: + createSwDoc("embedded_formula.fodt"); + + // When exporting to reqif with ExportFormulasAsPDF=true: + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"ExportFormulasAsPDF"_ustr, true), + }; + saveWithParams(aStoreProperties); + + // Make sure that the formula is exported as PDF: + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object", + "type", u"application/pdf"); + + css::uno::Sequence descr{ + comphelper::makePropertyValue(u"URL"_ustr, GetObjectPath(u".pdf"_ustr)), + }; + + uno::Reference xFactory( + comphelper::getProcessComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW); + uno::Reference xTypeDetection( + xFactory->createInstance(u"com.sun.star.document.TypeDetection"_ustr), + uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT_EQUAL(u"pdf_Portable_Document_Format"_ustr, + xTypeDetection->queryTypeByDescriptor(descr, true)); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_NoBrClearForImageWrap) +{ + // Given a document with a paragraph-anchored image with "none" wrap: + createSwDoc("image_anchored_to_paragraph_no_wrap.fodt"); + // When exporting to reqif: + ExportToReqif(); + // Make sure that there's no 'br' elements in the 'object' (used to represent the wrapping + // in HTML export, using 'clear' attribute): + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object"); + assertXPath(pXmlDoc, + "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object/reqif-xhtml:br", + 0); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_Tdf160017_spanClosingOrder) +{ + // Given a document with a paragraph having explicit font color and character border properties: + createSwDoc("char_border_and_font_color.fodt"); + // When exporting to reqif: + ExportToReqif(); + // Without the fix, this would fail, because there was an extra closing + WrapReqifFromTempFile(); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_Tdf160017_spanClosingOrder) +{ + // Given a document with a paragraph having explicit font color and character border properties: + createSwDoc("char_border_and_font_color.fodt"); + // When exporting to HTML: + ExportToHTML(); + // Parse it as XML (strict!) + // Without the fix, this would fail, because span and font elements closed in wrong order + CPPUNIT_ASSERT(parseXml(maTempFile)); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_Tdf160390) +{ + // This document must not hang infinitely on HTML export + createSwDoc("tdf160390.fodt"); + ExportToHTML(); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_160867) +{ + // Given a document with an image with hyperlink, and text with hyperlink, both in a frame: + createSwDoc("tdf160867_image_with_link.fodt"); + // When exporting to HTML: + ExportToHTML(); + // Parse it as XML (strict!) + xmlDocUniquePtr pDoc = parseXml(maTempFile); + CPPUNIT_ASSERT(pDoc); + assertXPath(pDoc, "/html/body/p", 2); + + // Test export of image and text hyperlinks in the image map. + // Without the fix, the test would fail with + // - Expected: 1 + // - Actual : 0 + // - In <>, XPath '/html/body/p[2]/map' number of nodes is incorrect + const OUString mapName = getXPath(pDoc, "/html/body/p[2]/map", "name"); + assertXPath(pDoc, "/html/body/p[2]/map/area[1]", "shape", u"rect"); + CPPUNIT_ASSERT(getXPath(pDoc, "/html/body/p[2]/map/area[1]", "href").endsWith("foo/bar")); + assertXPath(pDoc, "/html/body/p[2]/map/area[2]", "shape", u"rect"); + CPPUNIT_ASSERT(getXPath(pDoc, "/html/body/p[2]/map/area[2]", "href").endsWith("baz")); + assertXPath(pDoc, "/html/body/p[2]/img", "usemap", Concat2View("#" + mapName)); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_160867) +{ + // Given a document with an image with hyperlink, and text with hyperlink, both in a frame: + createSwDoc("tdf160867_image_with_link.fodt"); + // When exporting to reqif: + ExportToReqif(); + // For now, we don't (yet) output the whole map in ReqIF case. + // Make sure that the first hyperlink from the objects in the frame is output as an             element + // around the whole image of the frame. + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + assertXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a/reqif-xhtml:object"); + CPPUNIT_ASSERT( + getXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a", "href").endsWith("foo/bar")); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_161979) +{ + // Given a document with two embedded metafiles: + createSwDoc("tdf161979_metafile.fodt"); + ExportToHTML(); + xmlDocUniquePtr pDoc = parseXml(maTempFile); + CPPUNIT_ASSERT(pDoc); + // First image: it has no EMF+ actions, and didn't use canvas rendering before the fix; + // yet, it didn't export correctly. + OUString imgName = getXPath(pDoc, "/html/body/p[2]/img", "src"); + CPPUNIT_ASSERT(imgName.endsWith(".gif")); + INetURLObject aUrl(maTempFile.GetURL()); + aUrl.setName(imgName); + Graphic graphic; + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, GraphicFilter().ImportGraphic(graphic, aUrl)); + + // Check that only ~4% of pixels are not transparent (before the fix, it was completely black) + BitmapEx bitmap = graphic.GetBitmapEx(); + Size size = bitmap.GetSizePixel(); + int numNonTransparent = 0; + for (tools::Long y = 0; y < size.Height(); ++y) + for (tools::Long x = 0; x < size.Width(); ++x) + if (bitmap.GetPixelColor(x, y) != COL_TRANSPARENT) + ++numNonTransparent; + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.04, numNonTransparent / double(size.Height() * size.Width()), + 0.01); + + // Second image: it consists of EMF+ records (no EMF fallback). It used canvas rendering + // before the fix; it also didn't export correctly. + imgName = getXPath(pDoc, "/html/body/p[4]/img", "src"); + CPPUNIT_ASSERT(imgName.endsWith(".gif")); + aUrl.SetURL(maTempFile.GetURL()); + aUrl.setName(imgName); + graphic.Clear(); + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, GraphicFilter().ImportGraphic(graphic, aUrl)); + + // Check that some pixels are transparent (before the fix, it was completely black) + bitmap = graphic.GetBitmapEx(); + size = bitmap.GetSizePixel(); + numNonTransparent = 0; + for (tools::Long y = 0; y < size.Height(); ++y) + for (tools::Long x = 0; x < size.Width(); ++x) + if (bitmap.GetPixelColor(x, y) != COL_TRANSPARENT) + ++numNonTransparent; + CPPUNIT_ASSERT(numNonTransparent > 0); + CPPUNIT_ASSERT(numNonTransparent < size.Height() * size.Width()); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_exportAbsoluteURLs_ownRelative) +{ + auto pBatch(comphelper::ConfigurationChanges::create()); + Resetter resetter([ + bInternetPreviousValue = officecfg::Office::Common::Save::URL::Internet::get(), + bFileSystemPreviousValue = officecfg::Office::Common::Save::URL::FileSystem::get(), pBatch + ]() { + officecfg::Office::Common::Save::URL::Internet::set(bInternetPreviousValue, pBatch); + officecfg::Office::Common::Save::URL::FileSystem::set(bFileSystemPreviousValue, pBatch); + return pBatch->commit(); + }); + // Set saving absolute URLs + officecfg::Office::Common::Save::URL::Internet::set(false, pBatch); + officecfg::Office::Common::Save::URL::FileSystem::set(false, pBatch); + pBatch->commit(); + + createSwDoc("URLs.odt"); + // Export to ReqIF, using absolute URLs + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), + comphelper::makePropertyValue(u"RelativeOwnObjectURL"_ustr, true), + }); + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + + // HTTP URL: must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:p[1]/reqif-xhtml:a", "href", u"http://www.example.org/"); + // file URL: must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a", "href", + createFileURL(u"NonExistingPath/NonExistingFile.html")); + // form URL: must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:form", "action", u"https://www.example.org/submit"); + // linked image exported as object: generated, must be relative + OUString url = getXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".ole")); + // its original image URL: must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object/reqif-xhtml:object", "data", + createFileURL(u"external.png")); + // embedded image exported as object: generated, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".ole")); + // its image URL: generated, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".png")); + // unordered list with image bullet - it gets embedded as base64 data + OUString style = getXPath(pXmlDoc, "//reqif-xhtml:ul", "style"); + CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); + // an as-char frame, exported as a whole to an object, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".ole")); + // its file hyperlink must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a", "href", + createFileURL(u"foo/bar")); + // its image URL: generated, must be relative + url = getXPath( + pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".png")); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_exportRelativeURLs) +{ + CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::Internet::get()); + CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::FileSystem::get()); + + createSwDoc("URLs.odt"); + // Export to ReqIF, using relative URLs (the default) + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true), + }); + xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile(); + + // HTTP URL: must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:p[1]/reqif-xhtml:a", "href", u"http://www.example.org/"); + // file URL: must be relative + OUString url = getXPath(pXmlDoc, "//reqif-xhtml:p[2]/reqif-xhtml:a", "href"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith("NonExistingPath/NonExistingFile.html")); + // form URL: must be absolute + assertXPath(pXmlDoc, "//reqif-xhtml:form", "action", u"https://www.example.org/submit"); + // linked image exported as object: generated, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".ole")); + // its original image URL: must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[3]/reqif-xhtml:object/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith("external.png")); + // embedded image exported as object: generated, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".ole")); + // its image URL: generated, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[4]/reqif-xhtml:object/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".png")); + // unordered list with image bullet - it gets embedded as base64 data + OUString style = getXPath(pXmlDoc, "//reqif-xhtml:ul", "style"); + CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); + // an as-char frame, exported as a whole to an object, must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".ole")); + // its file hyperlink must be relative + url = getXPath(pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a", "href"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith("foo/bar")); + // its image URL: generated, must be relative + url = getXPath( + pXmlDoc, "//reqif-xhtml:p[5]/reqif-xhtml:object/reqif-xhtml:a/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".png")); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_exportAbsoluteURLs_ownRelative) +{ + auto pBatch(comphelper::ConfigurationChanges::create()); + Resetter resetter([ + bInternetPreviousValue = officecfg::Office::Common::Save::URL::Internet::get(), + bFileSystemPreviousValue = officecfg::Office::Common::Save::URL::FileSystem::get(), pBatch + ]() { + officecfg::Office::Common::Save::URL::Internet::set(bInternetPreviousValue, pBatch); + officecfg::Office::Common::Save::URL::FileSystem::set(bFileSystemPreviousValue, pBatch); + return pBatch->commit(); + }); + // Set saving absolute URLs + officecfg::Office::Common::Save::URL::Internet::set(false, pBatch); + officecfg::Office::Common::Save::URL::FileSystem::set(false, pBatch); + pBatch->commit(); + + createSwDoc("URLs.odt"); + // Export to HTML, using absolute URLs + saveWithParams({ + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"RelativeOwnObjectURL"_ustr, true), + }); + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + + // HTTP URL: must be absolute + assertXPath(pHtmlDoc, "//p[1]/a", "href", u"http://www.example.org/"); + // file URL: must be absolute + assertXPath(pHtmlDoc, "//p[2]/a", "href", + createFileURL(u"NonExistingPath/NonExistingFile.html")); + // form URL: must be absolute + assertXPath(pHtmlDoc, "//form", "action", u"https://www.example.org/submit"); + // linked image: must be absolute + assertXPath(pHtmlDoc, "//p[3]/img", "src", createFileURL(u"external.png")); + // embedded image: generated, must be relative + OUString url = getXPath(pHtmlDoc, "//p[4]/img", "src"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".png")); + // unordered list with image bullet - it gets embedded as base64 data + OUString style = getXPath(pHtmlDoc, "//ul", "style"); + CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); + // image-in-frame file hyperlink must be absolute; FIXME: HTMLOutFuncs::Out_ImageMap + // assertXPath(pHtmlDoc, "//p[5]/map/area", "href", createFileURL(u"foo/bar")); + // its image URL: generated, must be relative + url = getXPath(pHtmlDoc, "//p[5]/img", "src"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".gif")); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_exportRelativeURLs) +{ + CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::Internet::get()); + CPPUNIT_ASSERT(officecfg::Office::Common::Save::URL::FileSystem::get()); + + createSwDoc("URLs.odt"); + // Export to HTML, using relative URLs (the default) + ExportToHTML(); + htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); + + // HTTP URL: must be absolute + assertXPath(pHtmlDoc, "//p[1]/a", "href", u"http://www.example.org/"); + // file URL: must be relative + OUString url = getXPath(pHtmlDoc, "//p[2]/a", "href"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith("NonExistingPath/NonExistingFile.html")); + // form URL: must be absolute + assertXPath(pHtmlDoc, "//form", "action", u"https://www.example.org/submit"); + // linked image: must be relative + url = getXPath(pHtmlDoc, "//p[3]/img", "src"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith("external.png")); + // embedded image: generated, must be relative + url = getXPath(pHtmlDoc, "//p[4]/img", "src"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".png")); + // unordered list with image bullet - it gets embedded as base64 data + OUString style = getXPath(pHtmlDoc, "//ul", "style"); + CPPUNIT_ASSERT(style.indexOf("list-style-image: url(data:image/png;base64,") != -1); + // image-in-frame file hyperlink must be relative + url = getXPath(pHtmlDoc, "//p[5]/map/area", "href"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith("foo/bar")); + // its image URL: generated, must be relative + url = getXPath(pHtmlDoc, "//p[5]/img", "src"); + CPPUNIT_ASSERT(!url.startsWith("file:")); + CPPUNIT_ASSERT(url.endsWith(".gif")); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_162282) +{ + // Given a document with an embedded metafile: + createSwDoc("tdf162282.odt"); + ExportToReqif(); + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + + // Check that the exported EMF is exactly the same as in the ODF package + assertXPath(pDoc, "//reqif-xhtml:p/reqif-xhtml:object", "type", u"image/x-emf"); + OUString imgName = getXPath(pDoc, "//reqif-xhtml:p/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(imgName.endsWith(".emf")); + INetURLObject aUrl(maTempFile.GetURL()); + aUrl.setName(imgName); + SvFileStream aEmfStream(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE), + StreamMode::READ); + + // without the fix, this would fail with + // - Expected: 220 + // - Actual : 111260 + CPPUNIT_ASSERT_EQUAL(sal_uInt64(220), aEmfStream.TellEnd()); + + css::uno::Sequence emfData(220); + aEmfStream.ReadBytes(emfData.getArray(), emfData.getLength()); + + const css::uno::Sequence correctData{ + 0x01, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xF4, 0x01, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x88, 0x13, 0x00, 0x00, 0x88, 0x13, 0x00, 0x00, 0x20, 0x45, 0x4D, 0x46, 0x00, + 0x00, 0x01, 0x00, 0xDC, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, + 0x00, 0x38, 0x04, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0xF4, + 0x01, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x2D, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, + 0x00, 0xFA, 0x00, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x28, + 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, + 0x2C, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x2C, 0x01, 0x00, + 0x00, 0xC8, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + }; + CPPUNIT_ASSERT_EQUAL(correctData, emfData); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_162426) +{ + // Given a document with an image with style:wrap="none": + createSwDoc("tdf162426_image_with_wrap_none.fodt"); + // Before the fix, an assertion failed in HtmlWriter::attribute when exporting to HTML : + ExportToHTML(); + + xmlDocUniquePtr pDoc = parseXml(maTempFile); + CPPUNIT_ASSERT(pDoc); + + // Before the fix, the 'border' attribute was written after the 'img' tag was already closed, + // so without the assertion, this would fail with + // - In <>, XPath '/html/body/p/img' no attribute 'border' exist + assertXPath(pDoc, "/html/body/p/img", "border", u"0"); +} + +CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_163873) +{ + // Given a document with an image with style:wrap="none": + createSwDoc("tdf131728.docx"); + // Before the fix, an assertion failed in HtmlWriter::attribute when exporting to HTML : + ExportToHTML(); + + xmlDocUniquePtr pDoc = parseXml(maTempFile); + CPPUNIT_ASSERT(pDoc); + + // Before the fix, inline headings weren't inline + assertXPath(pDoc, "/html/body/p[5]/span/h2", "style", u"display:inline;"); + assertXPath(pDoc, "/html/body/p[6]/span/h2", "style", u"display:inline;"); + assertXPath(pDoc, "/html/body/p[7]/span/h2", "style", u"display:inline;"); + assertXPath(pDoc, "/html/body/p[11]/span/h2", "style", u"display:inline;"); + assertXPath(pDoc, "/html/body/p[14]/span/h2", "style", u"display:inline;"); +} + +} // end of anonymous namespace +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx b/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx new file mode 100644 index 000000000000..c3fc357118d8 --- /dev/null +++ b/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx @@ -0,0 +1,232 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include +#include +#include +#include +#include + +/// Test RTF parser that just extracts a single OLE2 object from a file. +class TestReqIfRtfReader : public SvRTFParser +{ +public: + TestReqIfRtfReader(SvStream& rStream); + void NextToken(int nToken) override; + bool WriteObjectData(SvStream& rOLE); + tools::Long GetObjw() const { return m_nObjw; } + tools::Long GetObjh() const { return m_nObjh; } + int getWmetafile() const { return m_nWmetafile; } + +private: + bool m_bInObjData = false; + OStringBuffer m_aHex; + tools::Long m_nObjw = 0; + tools::Long m_nObjh = 0; + int m_nWmetafile = 0; +}; + +TestReqIfRtfReader::TestReqIfRtfReader(SvStream& rStream) + : SvRTFParser(rStream) +{ +} + +void TestReqIfRtfReader::NextToken(int nToken) +{ + switch (nToken) + { + case '}': + m_bInObjData = false; + break; + case RTF_TEXTTOKEN: + if (m_bInObjData) + m_aHex.append(OUStringToOString(aToken, RTL_TEXTENCODING_ASCII_US)); + break; + case RTF_OBJDATA: + m_bInObjData = true; + break; + case RTF_OBJW: + m_nObjw = nTokenValue; + break; + case RTF_OBJH: + m_nObjh = nTokenValue; + break; + case RTF_WMETAFILE: + m_nWmetafile = nTokenValue; + break; + } +} + +bool TestReqIfRtfReader::WriteObjectData(SvStream& rOLE) +{ + OString aObjdata = m_aHex.makeStringAndClear(); + + SvMemoryStream aStream; + int b = 0; + int count = 2; + + // Feed the destination text to a stream. + for (int i = 0; i < aObjdata.getLength(); ++i) + { + char ch = aObjdata[i]; + if (ch != 0x0d && ch != 0x0a) + { + b = b << 4; + sal_Int8 parsed = msfilter::rtfutil::AsHex(ch); + if (parsed == -1) + return false; + b += parsed; + count--; + if (!count) + { + aStream.WriteChar(b); + count = 2; + b = 0; + } + } + } + + aStream.Seek(0); + rOLE.WriteStream(aStream); + return true; +} + +/// Parser for [MS-OLEDS] 2.2.5 EmbeddedObject, aka OLE1. +struct OLE1Reader +{ + sal_uInt32 m_nNativeDataSize; + std::vector m_aNativeData; + sal_uInt32 m_nPresentationDataSize; + + OLE1Reader(SvStream& rStream); +}; + +OLE1Reader::OLE1Reader(SvStream& rStream) +{ + // Skip ObjectHeader, see [MS-OLEDS] 2.2.4. + rStream.Seek(0); + CPPUNIT_ASSERT(rStream.remainingSize()); + sal_uInt32 nData; + rStream.ReadUInt32(nData); // OLEVersion + rStream.ReadUInt32(nData); // FormatID + rStream.ReadUInt32(nData); // ClassName + rStream.SeekRel(nData); + rStream.ReadUInt32(nData); // TopicName + rStream.SeekRel(nData); + rStream.ReadUInt32(nData); // ItemName + rStream.SeekRel(nData); + + rStream.ReadUInt32(m_nNativeDataSize); + m_aNativeData.resize(m_nNativeDataSize); + rStream.ReadBytes(m_aNativeData.data(), m_aNativeData.size()); + + rStream.ReadUInt32(nData); // OLEVersion for presentation data + CPPUNIT_ASSERT(rStream.good()); + rStream.ReadUInt32(nData); // FormatID + rStream.ReadUInt32(nData); // ClassName + rStream.SeekRel(nData); + rStream.ReadUInt32(nData); // Width + rStream.ReadUInt32(nData); // Height + rStream.ReadUInt32(nData); // PresentationDataSize + m_nPresentationDataSize = nData; +} + +/// Covers sw/source/filter/html/wrthtml.cxx and related fixes. +class HtmlExportTest : public SwModelTestBase, public HtmlTestTools +{ +public: + HtmlExportTest() + : SwModelTestBase(u"/sw/qa/extras/htmlexport/data/"_ustr, u"HTML (StarWriter)"_ustr) + { + } + + /// Wraps an RTF fragment into a complete RTF file, so an RTF parser can handle it. + static void wrapRtfFragment(const OUString& rURL, SvMemoryStream& rStream) + { + SvFileStream aRtfStream(rURL, StreamMode::READ); + rStream.WriteOString("{\\rtf1"); + rStream.WriteStream(aRtfStream); + rStream.WriteOString("}"); + rStream.Seek(0); + } +}; + +/// HTML export of the sw doc model tests. +class SwHtmlDomExportTest : public SwModelTestBase, public HtmlTestTools +{ +public: + SwHtmlDomExportTest() + : SwModelTestBase(u"/sw/qa/extras/htmlexport/data/"_ustr) + { + } + + OUString GetObjectPath(const OUString& ext); + /// Get the .ole path, assuming maTempFile is an XHTML export result. + OUString GetOlePath() { return GetObjectPath(u".ole"_ustr); } + OUString GetPngPath() { return GetObjectPath(u".png"_ustr); } + /// Parse the ole1 data out of an RTF fragment URL. + void ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryStream& rOle1); + /// Export using the C++ HTML export filter, with xhtmlns=reqif-xhtml. + void ExportToReqif(); + /// Import using the C++ HTML import filter, with xhtmlns=reqif-xhtml. + void ImportFromReqif(const OUString& rUrl); + /// Export using the C++ HTML export filter + void ExportToHTML(); +}; + +OUString SwHtmlDomExportTest::GetObjectPath(const OUString& ext) +{ + assert(ext.startsWith(".")); + xmlDocUniquePtr pDoc = WrapReqifFromTempFile(); + OUString aOlePath = getXPath( + pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object", "data"); + CPPUNIT_ASSERT(aOlePath.endsWith(ext)); + INetURLObject aUrl(maTempFile.GetURL()); + aUrl.setBase(aOlePath.subView(0, aOlePath.getLength() - ext.getLength())); + aUrl.setExtension(ext.subView(1)); + return aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE); +} + +void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryStream& rOle1) +{ + SvMemoryStream aRtf; + HtmlExportTest::wrapRtfFragment(rRtfUrl, aRtf); + tools::SvRef xReader(new TestReqIfRtfReader(aRtf)); + CPPUNIT_ASSERT(xReader->CallParser() != SvParserState::Error); + CPPUNIT_ASSERT(xReader->WriteObjectData(rOle1)); + CPPUNIT_ASSERT(rOle1.Tell()); +} + +void SwHtmlDomExportTest::ExportToReqif() +{ + setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr); + save(u"HTML (StarWriter)"_ustr); +} + +void SwHtmlDomExportTest::ExportToHTML() +{ + uno::Sequence aStoreProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + }; + saveWithParams(aStoreProperties); +} + +void SwHtmlDomExportTest::ImportFromReqif(const OUString& rUrl) +{ + uno::Sequence aLoadProperties = { + comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), + comphelper::makePropertyValue(u"FilterOptions"_ustr, u"xhtmlns=reqif-xhtml"_ustr), + }; + loadWithParams(rUrl, aLoadProperties); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/layout/data/section-nested-with-pagebreaks.fodt b/sw/qa/extras/layout/data/section-nested-with-pagebreaks.fodt new file mode 100644 index 000000000000..0ff4be45f1ee --- /dev/null +++ b/sw/qa/extras/layout/data/section-nested-with-pagebreaks.fodt @@ -0,0 +1,148 @@ + + + 2024-11-20T20:04:29.2958602962024-11-20T20:57:42.826429164PT7M57S6CIB_OfficeDev/6.4.0.29$Linux_X86_64 LibreOffice_project/5374b230ff33d77a7f81d56046759f218a160036 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Text before outer section + + 1 + 2 + 3 + 4 + + 5 + 6 + 7 + 8 + + Text following inner section + + Text following outer section + + + diff --git a/sw/qa/extras/layout/data/tdf152839_firstrows.rtf b/sw/qa/extras/layout/data/tdf152839_firstrows.rtf new file mode 100644 index 000000000000..477b8166602b --- /dev/null +++ b/sw/qa/extras/layout/data/tdf152839_firstrows.rtf @@ -0,0 +1,253 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1031\deflangfe1041\themelang3079\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};} +{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f48\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Segoe UI;} +{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};} +{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};} +{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};} +{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};} +{\f1354\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\f1355\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};} +{\f1357\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\f1358\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};} +{\f1359\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\f1360\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};} +{\f1361\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\f1362\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\f1694\fbidi \froman\fcharset238\fprq2 Cambria Math CE;} +{\f1695\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f1697\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f1698\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f1701\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;} +{\f1702\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f1834\fbidi \fswiss\fcharset238\fprq2 Segoe UI CE;}{\f1835\fbidi \fswiss\fcharset204\fprq2 Segoe UI Cyr;}{\f1837\fbidi \fswiss\fcharset161\fprq2 Segoe UI Greek;} +{\f1838\fbidi \fswiss\fcharset162\fprq2 Segoe UI Tur;}{\f1839\fbidi \fswiss\fcharset177\fprq2 Segoe UI (Hebrew);}{\f1840\fbidi \fswiss\fcharset178\fprq2 Segoe UI (Arabic);}{\f1841\fbidi \fswiss\fcharset186\fprq2 Segoe UI Baltic;} +{\f1842\fbidi \fswiss\fcharset163\fprq2 Segoe UI (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};} +{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};} +{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};} +{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};} +{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};} +{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};} +{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};} +{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};} +{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;} +{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);} +{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};} +{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};} +{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};} +{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};} +{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};} +{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};} +{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};} +{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};} +{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};} +{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};} +{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};} +{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};} +{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} +{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);} +{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);} +{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};} +{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};} +{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};} +{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}}{\colortbl;\red0\green0\blue0; +\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; +\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs22 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 +\fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 \snext0 \sqformat \spriority0 Normal;}{\s1\ql \li0\ri0\sb120\sa120\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs32\alang1025 +\ltrch\fcs0 \fs32\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \sbasedon0 \snext0 \slink15 \sqformat \styrsid12458106 heading 1;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1031\langfe1041\cgrid\langnp1031\langfenp1041 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive \rtlch\fcs1 +\ab\af0\afs32 \ltrch\fcs0 \b\fs32\kerning32\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \'dcberschrift 1 Zchn;}{\s16\ql \li0\ri0\widctlpar\brdrt\brdrs\brdrw10\brsp20 \brdrl\brdrs\brdrw10\brsp80 \brdrb +\brdrs\brdrw10\brsp20 \brdrr\brdrs\brdrw10\brsp80 \wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\cf6\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 \sbasedon0 \snext0 +BausteinName;}{\s17\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ai\af0\afs20\alang1025 \ltrch\fcs0 \i\fs20\cf10\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 \sbasedon0 \snext0 Kommentar;}{ +\s18\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 \sbasedon0 \snext18 \slink19 header;}{\* +\cs19 \additive \rtlch\fcs1 \af0\afs26 \ltrch\fcs0 \fs26 \sbasedon10 \slink18 \slocked \ssemihidden Kopfzeile Zchn;}{\s20\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 \sbasedon0 \snext20 \slink21 footer;}{\*\cs21 \additive \rtlch\fcs1 \af0\afs26 \ltrch\fcs0 \fs26 \sbasedon10 \slink20 \slocked \ssemihidden Fu\'dfzeile Zchn;}{ +\s22\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af48\afs18\alang1025 \ltrch\fcs0 \f48\fs18\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 +\sbasedon0 \snext22 \slink23 \ssemihidden \sunhideused \styrsid477296 Balloon Text;}{\*\cs23 \additive \rtlch\fcs1 \af48\afs18 \ltrch\fcs0 \f48\fs18 \sbasedon10 \slink22 \slocked \ssemihidden \styrsid477296 Sprechblasentext Zchn;}}{\*\rsidtbl \rsid25915 +\rsid141657\rsid162930\rsid337940\rsid468624\rsid477296\rsid538180\rsid734395\rsid882106\rsid1008931\rsid1116736\rsid1131385\rsid1186002\rsid1378358\rsid1457463\rsid1458675\rsid1463711\rsid1576598\rsid1643320\rsid1733725\rsid2233523\rsid2237796 +\rsid2239019\rsid2294971\rsid2363667\rsid2580829\rsid3020432\rsid3151009\rsid3230690\rsid3676125\rsid4327642\rsid4655589\rsid4939037\rsid5118193\rsid5398017\rsid5587896\rsid5841343\rsid5984835\rsid6555207\rsid6701627\rsid6712741\rsid6831792\rsid7089764 +\rsid7152567\rsid7290328\rsid7496291\rsid7549106\rsid7606353\rsid7810231\rsid7872350\rsid8015286\rsid8078336\rsid8148054\rsid8479968\rsid8534386\rsid8608751\rsid8983466\rsid9060380\rsid9242023\rsid9322053\rsid9402351\rsid9595908\rsid10161122\rsid10238746 +\rsid10242283\rsid10557518\rsid10896052\rsid10964931\rsid11037801\rsid11081007\rsid11094885\rsid11283431\rsid11344075\rsid11424229\rsid11499115\rsid11690788\rsid11871934\rsid11893049\rsid11947419\rsid12262926\rsid12458106\rsid12652382\rsid12928601 +\rsid12986890\rsid12999067\rsid13055997\rsid13110340\rsid13254002\rsid13255087\rsid13305316\rsid13334452\rsid13516935\rsid14315527\rsid14378587\rsid14563127\rsid14580302\rsid14632582\rsid14708412\rsid14823218\rsid14964844\rsid15622987\rsid15626663 +\rsid15745522\rsid16274659\rsid16606131}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\subject asdf}{\author Oliver Specht}{\operator Oliver Specht} +{\creatim\yr2024\mo11\dy20\hr8\min57}{\revtim\yr2024\mo11\dy20\hr8\min57}{\printim\yr2022\mo10\dy11\hr12\min16}{\version2}{\edmins0}{\nofpages1}{\nofwords4}{\nofchars27}{\*\company BMLV}{\nofcharsws30}{\vern107}}{\*\userprops {\propname KPH_Enabled} +\proptype30{\staticval 0}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw16840\paperh11907\margl1134\margr1418\margt567\margb567\gutter0\ltrsect +\deftab709\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0 +\showxmlerrors0\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace130\dgvspace180\dghorigin1134\dgvorigin567\dghshow0\dgvshow0 +\jexpand\viewkind1\viewscale180\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl\nojkernpunct\rsidroot4655589 \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0{\*\template C:\\Users\\x2mf\\AppData\\Roaming\\Microsoft\\Templates\\kis.3.0.dot} +{\*\docvar {DKE_SBGeschlecht}{[SBGeschlecht]}}{\*\docvar {KPH_Genehmiger}{[Genehmiger]}}{\*\docvar {KPH_Gesch\'e4ftszahl}{[Gesch\'e4ftszahl]}}{\*\docvar {KPH_Sachbearbeiter}{[Sachbearbeiter]}}{\*\docvar {KPH_SBeMail}{[SB_eMail]}} +{\*\docvar {KPH_SBFax}{[SB_Fax]}}{\*\docvar {KPH_SBIFMIN}{SBIFMIN}}{\*\docvar {KPH_SBTelefon}{[SB_Telefon]}}{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid162930 \chftnsep +\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0 +\ltrch\fcs0 \insrsid162930 \chftnsepc +\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0 +\ltrch\fcs0 \insrsid162930 \chftnsep +\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0 +\ltrch\fcs0 \insrsid162930 \chftnsepc +\par }}\ltrpar \sectd \ltrsect\lndscpsxn\binfsxn4\binsxn4\psz9\linex0\headery567\footery567\endnhere\sectlinegrid354\sectdefaultcl\sectrsid8078336\sftnbj {\headerl \ltrpar \pard\plain \ltrpar\s18\ql \li0\ri0\widctlpar +\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6701627 +\par }}{\headerr \ltrpar \pard\plain \ltrpar\s18\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 { +\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6701627 +\par }}{\footerl \ltrpar \pard\plain \ltrpar\s20\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 { +\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6701627 +\par }}{\footerr \ltrpar \pard\plain \ltrpar\s20\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6701627 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 +\fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12458106\charrsid6701627 +\par }}{\headerf \ltrpar \pard\plain \ltrpar\s18\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 { +\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6701627 +\par }}{\footerf \ltrpar \pard\plain \ltrpar\s20\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 { +\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6701627 +\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}} +{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8 +\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri-1\widctlpar +\tqr\tx14317\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin-1\lin0\itap0\pararsid12458106 \rtlch\fcs1 \af0\afs26\alang1025 \ltrch\fcs0 \fs26\lang3079\langfe3079\cgrid\langnp3079\langfenp3079 {\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 +\v\fs18\insrsid11037801\charrsid5118193 \line }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \v\fs18\insrsid11283431\charrsid5118193 \line \line \line }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \v\fs18\cf1\insrsid5118193\charrsid5118193 \line }{\rtlch\fcs1 \ab\af0\afs2 +\ltrch\fcs0 \b\fs2\insrsid12458106\charrsid3020432 +\par \ltrrow}\trowd \irow0\irowband0\ltrrow\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth14240\trftsWidthB3\trftsWidthA3\trwWidthA11405\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid1131385\tblind0\tblindtype3 \clvertalt\clbrdrt\brdrtbl \clbrdrl +\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cltxlrtb\clftsWidth3\clwWidth2835\clshdrawnil \cellx2765\pard \ltrpar\ql \li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid1458675 {\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 +\fs18\insrsid2237796 \cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \fs18\insrsid2237796 \trowd \irow0\irowband0\ltrrow +\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth14240\trftsWidthB3\trftsWidthA3\trwWidthA11405\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid1131385\tblind0\tblindtype3 \clvertalt\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl +\cltxlrtb\clftsWidth3\clwWidth2835\clshdrawnil \cellx2765\row \ltrrow}\trowd \irow1\irowband1\lastrow \ltrrow +\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth14240\trftsWidthB3\trftsWidthA3\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid13110340\tblind0\tblindtype3 \clvertalt\clbrdrt\brdrs\brdrw45 \clbrdrl\brdrs\brdrw45 \clbrdrb\brdrs\brdrw45 \clbrdrr +\brdrs\brdrw45 \cltxlrtb\clftsWidth3\clwWidth14240\clshdrawnil \cellx14170\pard \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid1458675 {\rtlch\fcs1 \af0\afs72 \ltrch\fcs0 +\fs72\lang1024\langfe1024\noproof\langnp1040\insrsid5587896 MUSTERMANN Max}{\rtlch\fcs1 \af0\afs72 \ltrch\fcs0 \fs72\lang1040\langfe3079\langnp1040\insrsid2237796\charrsid14823218 \cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af0\afs72 \ltrch\fcs0 \fs72\lang1040\langfe3079\langnp1040\insrsid2237796\charrsid14823218 \trowd \irow1\irowband1\lastrow \ltrrow +\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth14240\trftsWidthB3\trftsWidthA3\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid13110340\tblind0\tblindtype3 \clvertalt\clbrdrt\brdrs\brdrw45 \clbrdrl\brdrs\brdrw45 \clbrdrb\brdrs\brdrw45 \clbrdrr +\brdrs\brdrw45 \cltxlrtb\clftsWidth3\clwWidth14240\clshdrawnil \cellx14170\row }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1131385 {\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 +\v\fs18\insrsid13255087\charrsid13255087 \line \line \line \line \line }{\rtlch\fcs1 \af0 \ltrch\fcs0 \v\lang1024\langfe1024\noproof\insrsid2237796\charrsid13255087 +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100937e00e7ca060000891a0000160000007468656d652f7468656d652f +7468656d65312e786d6cec595b8bdb46147e2ff43f08bd3bbe49be2cf1065bb69336bb49889d943cceda636bb2238dd18c776342a0244f7d2914d2d28706fad6 +87521a68a0a12ffd310b1bdaf447f4cc489667ec71f6420aa1640d8b34face996fce39face48ba7aed51449d239c70c2e2965bbe52721d1c8fd898c4d3967b6f +d82f345c870b148f1165316eb90bccdd6bbb9f7e7215ed881047d801fb98efa0961b0a31db2916f9088611bfc26638866b13964448c069322d8e13740c7e235a +ac944ab5628448ec3a318ac0ededc9848cb0bbbb74dba3e03b165c0e8c6832904ef126767c589608bee0014d9c23445b2ecc3066c743fc48b80e455cc085965b +527f6e71f76a11ed6446546cb1d5ecfaea2fb3cb0cc687153567323dc827f53cdfabb573ff0a40c526ae57efd57ab5dc9f02a0d108569a72d17dfa9d66a7eb67 +580d941e5a7c77ebdd6ad9c06bfeab1b9cdbbefc1978054afd7b1bf87e3f80281a78054af1fe06def3ea95c033f00a94e26b1bf87aa9ddf5ea065e81424ae2c3 +0d74c9af5583e56a73c884d11b5678d3f7faf54ae67c85826ac8ab4b4e3161b1d8566b117ac8923e002490224162472c6678824650bf01a2e42021ce1e998650 +783314330ec3a54aa95faac27ff9f3d4918a08dac148b396bc8009df18927c1c3e4ac84cb4dccfc1abab414e5fbf3e79faeae4e9ef27cf9e9d3cfd359b5bb932 +ec6ea078aadbbdfde99b7f5e7ce9fcfddb8f6f9f7f9b4ebd8ee73afecd2f5fbdf9e3cf77b98715af4271faddcb37af5e9e7efff55f3f3fb7786f27e840870f49 +84b9730b1f3b7759040bb4f0c707c9c52c862122ba453b9e721423398bc57f4f8406fad6025164c175b019c7fb09488d0d787dfed0203c0893b920168f37c3c8 +00ee33463b2cb146e1a69c4b0bf3701e4fed9327731d7717a123dbdc018a8d2cf7e633d05862731984d8a07987a258a0298eb170e4357688b165750f0831e2ba +4f4609e36c229c07c4e920620dc9901c18d5b432ba4122c8cbc24610f26dc466ffbed361d4b6ea2e3e3291706f206a213fc4d408e375341728b2b91ca288ea01 +df4322b4911c2c92918eeb7101999e62ca9cde18736eb3b99dc07ab5a4df0499b1a77d9f2e221399087268f3b98718d3915d761884289ad9b00312873af6337e +08258a9c3b4cd8e0fbccbc43e439e401c55bd37d9f6023dd67abc13d50589dd2aa40e4957962c9e575cc8cfa1d2ce804612535d0000c5d8f487ca6c8afc9bbff +dfc93b88e8e90f2f2c2b7a3f926e776ce4e38262de4e88f56ebab126e1db70ebc21db0644c3e7cddeea2797c07c3adb2d9bc3ecaf647d976fff7b2bded7e7eff +62bdd267906eb96d4db7eb6af31e6dddbb4f08a503b1a0788fabed3b87ae34eec3a0b4534fac387f969b857028ef6498c0c04d13a46c9c84892f880807219ac1 +1ebfec4a27539eb99e7267c6386cfdd5b0d5b7c4d379b4cfc6e9236bb92c1f4f53f1e048acc64b7e3e0e8f1b2245d7eaabc7b0dcbd623b558fcb4b02d2f62224 +b4c94c12550b89fa725006493d9c43d02c24d4cade0b8ba6854543ba5fa66a830550cbb302db2607365b2dd7f7c0048ce0a90a513c96794a53bdccae4ae6fbcc +f4b6601a15007b886505ac32dd945cb72e4fae2e2db57364da20a1959b49424546f5301ea231ceaa538e9e87c64573dd5ca5d4a02743a1e683d25ad1a837dec5 +e2b2b906bb756da0b1ae1434768e5b6eadea43c98cd0ace54ee0d11f0ea319d40e97db5d44a7f0e66c2492f486bf8cb2cc122eba888769c095e8a46a10118113 +8792a8e5cae5e769a0b1d210c5ad5c0141f860c93541563e3472907433c97832c123a1a75d1b91914e4f41e153adb05e55e697074b4b3687740fc2f1b17340e7 +c95d0425e6d7cb328063c2e10d50398de698c02bcd5cc856f5b7d69832d9d5df29aa1a4ac7119d8528eb28ba98a77025e5391d7596c7403bcbd60c01d5429235 +c283a96cb07a508d6e9a778d94c3d6ae7bb6918c9c269aab9e69a88aec9a7615336658b681b5585eaec96bac9621064dd33b7c2addeb92db5c6addda3e21ef12 +10f03c7e96ae7b8e86a0515b4d6650938c3765586a76366af68ee502cfa0769e26a1a97e6de9762d6e798fb04e078397eafc60b75eb5303459ee2b55a4d5570f +fdf3043b7808e2d18517c1732ab84a257c7c48106c88066a4f92ca06dc228f44766bc091334f48cb7d5cf2db5e50f18342a9e1f70a5ed52b151a7ebb5a68fb7e +b5dcf3cba56ea7f2041a8b08a3b29f7e71e9c36b28bac8bebba8f18d6f2fd1f24ddb95118b8a4c7d5b292ae2eadb4bb962f9f6e20ce52716d721203a8f6b957e +b3daecd40acd6abb5ff0ba9d46a119d43a856e2da877fbddc06f34fb4f5ce74881bd7635f06abd46a1560e8282572b49fa8d66a1ee552a6dafde6ef4bcf6936c +1b032b4fe5238b058457f1dafd170000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72 +656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c08 +2e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd0 +8a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa +4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000000000005b436f +6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100005f72 +656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100937e00e7ca060000891a00001600000000000000000000000000d60200 +007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000000000000000000000 +00d40900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000cf0a00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; +\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; +\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; +\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; +\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; +\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; +\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; +\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; +\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 +02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000f058 +85d4213bdb01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx index ca8d298c3a09..d1527e503961 100644 --- a/sw/qa/extras/layout/layout4.cxx +++ b/sw/qa/extras/layout/layout4.cxx @@ -128,6 +128,173 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testHiddenSectionPageDescs) } } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testSectionPageBreaksWithNestedSectionWithColumns) +{ + createSwDoc("section-nested-with-pagebreaks.fodt"); + + auto xTextSectionsSupplier = mxComponent.queryThrow(); + auto xSections = xTextSectionsSupplier->getTextSections(); + CPPUNIT_ASSERT(xSections); + auto xSection1 = xSections->getByName(u"Section1"_ustr).queryThrow(); + auto xSection2 = xSections->getByName(u"Section2"_ustr).queryThrow(); + CPPUNIT_ASSERT(getProperty(xSection1, "IsVisible")); + CPPUNIT_ASSERT(getProperty(xSection2, "IsVisible")); + + { + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + assertXPath(pXmlDoc, "/root/page[1]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt", 2); + assertXPath(pXmlDoc, "/root/page[2]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"3"); + assertXPath(pXmlDoc, "/root/page[3]/body/section", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"4"); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column/body/txt", 2); + assertXPath(pXmlDoc, + "/root/page[3]/body/section[2]/column/body/txt[2]/SwParaPortion/SwLineLayout", + "portion", u"6"); + assertXPath(pXmlDoc, "/root/page[4]/body/section", 2); + assertXPath(pXmlDoc, "/root/page[4]/body/section[1]/column/body/txt", 2); + assertXPath(pXmlDoc, "/root/page[4]/body/section[1]/column/body/txt", 2); + assertXPath( + pXmlDoc, + "/root/page[4]/body/section[1]/column[1]/body/txt[1]/SwParaPortion/SwLineLayout", + "portion", u"7"); + assertXPath( + pXmlDoc, + "/root/page[4]/body/section[1]/column[2]/body/txt[1]/SwParaPortion/SwLineLayout", + "portion", u"8"); + assertXPath(pXmlDoc, "/root/page[4]/body/section[2]/txt", 1); + assertXPath(pXmlDoc, "/root/page[4]/body/section[2]/txt/SwParaPortion/SwLineLayout", + "portion", u"Text following inner section"); + assertXPath(pXmlDoc, "/root/page[4]/body/txt[1]/SwParaPortion/SwLineLayout", "portion", + u"Text following outer section"); + } + + xSection1->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(false)); + Scheduler::ProcessEventsToIdle(); + + { + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + assertXPath(pXmlDoc, "/root/page[1]/body/txt", 2); + assertXPath(pXmlDoc, "/root/page[1]/body/section", 3); + assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt", 4); + assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/column", 2); + assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/column/body/txt", 4); + assertXPath(pXmlDoc, "/root/page[1]/body/section[3]/txt", 1); + assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/infos/bounds", "height", u"0"); + assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/infos/bounds", "height", u"0"); + assertXPath(pXmlDoc, "/root/page[1]/body/section[3]/infos/bounds", "height", u"0"); + assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout", "portion", + u"Text following outer section"); + } + + xSection1->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(true)); + Scheduler::ProcessEventsToIdle(); + + { + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + assertXPath(pXmlDoc, "/root/page[1]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt", 2); + assertXPath(pXmlDoc, "/root/page[2]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"3"); + assertXPath(pXmlDoc, "/root/page[3]/body/section", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"4"); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column/body/txt", 2); + assertXPath(pXmlDoc, + "/root/page[3]/body/section[2]/column/body/txt[2]/SwParaPortion/SwLineLayout", + "portion", u"6"); + assertXPath(pXmlDoc, "/root/page[4]/body/section", 2); + assertXPath(pXmlDoc, "/root/page[4]/body/section[1]/column/body/txt", 2); + assertXPath(pXmlDoc, "/root/page[4]/body/section[1]/column/body/txt", 2); + assertXPath( + pXmlDoc, + "/root/page[4]/body/section[1]/column[1]/body/txt[1]/SwParaPortion/SwLineLayout", + "portion", u"7"); + assertXPath( + pXmlDoc, + "/root/page[4]/body/section[1]/column[2]/body/txt[1]/SwParaPortion/SwLineLayout", + "portion", u"8"); + assertXPath(pXmlDoc, "/root/page[4]/body/section[2]/txt", 1); + assertXPath(pXmlDoc, "/root/page[4]/body/section[2]/txt/SwParaPortion/SwLineLayout", + "portion", u"Text following inner section"); + assertXPath(pXmlDoc, "/root/page[4]/body/txt[1]/SwParaPortion/SwLineLayout", "portion", + u"Text following outer section"); + } + + xSection2->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(false)); + Scheduler::ProcessEventsToIdle(); + + { + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + assertXPath(pXmlDoc, "/root/page[1]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt", 2); + assertXPath(pXmlDoc, "/root/page[2]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"3"); + assertXPath(pXmlDoc, "/root/page[3]/body/section", 3); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"4"); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column/body/txt", 4); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/infos/bounds", "height", u"0"); + assertXPath(pXmlDoc, "/root/page[3]/body/section[3]/txt", 1); + assertXPath(pXmlDoc, "/root/page[3]/body/section[3]/txt/SwParaPortion/SwLineLayout", + "portion", u"Text following inner section"); + assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", "portion", + u"Text following outer section"); + } + + xSection2->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(true)); + Scheduler::ProcessEventsToIdle(); + + { + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + assertXPath(pXmlDoc, "/root/page[1]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt", 2); + assertXPath(pXmlDoc, "/root/page[2]/body/section", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[2]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"3"); + assertXPath(pXmlDoc, "/root/page[3]/body/section", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt", 1); + assertXPath(pXmlDoc, "/root/page[3]/body/section[1]/txt/SwParaPortion/SwLineLayout", + "portion", u"4"); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column", 2); + assertXPath(pXmlDoc, "/root/page[3]/body/section[2]/column/body/txt", 2); + assertXPath(pXmlDoc, + "/root/page[3]/body/section[2]/column/body/txt[2]/SwParaPortion/SwLineLayout", + "portion", u"6"); + assertXPath(pXmlDoc, "/root/page[4]/body/section", 2); + assertXPath(pXmlDoc, "/root/page[4]/body/section[1]/column/body/txt", 2); + assertXPath(pXmlDoc, "/root/page[4]/body/section[1]/column/body/txt", 2); + assertXPath( + pXmlDoc, + "/root/page[4]/body/section[1]/column[1]/body/txt[1]/SwParaPortion/SwLineLayout", + "portion", u"7"); + assertXPath( + pXmlDoc, + "/root/page[4]/body/section[1]/column[2]/body/txt[1]/SwParaPortion/SwLineLayout", + "portion", u"8"); + assertXPath(pXmlDoc, "/root/page[4]/body/section[2]/txt", 1); + assertXPath(pXmlDoc, "/root/page[4]/body/section[2]/txt/SwParaPortion/SwLineLayout", + "portion", u"Text following inner section"); + assertXPath(pXmlDoc, "/root/page[4]/body/txt[1]/SwParaPortion/SwLineLayout", "portion", + u"Text following outer section"); + } +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testTdf156725) { createSwDoc("tdf156725.fodt"); @@ -1708,6 +1875,17 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf163285) CPPUNIT_ASSERT(topText3.startsWith("pg_3")); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf152839_firstRows) +{ + createSwDoc("tdf152839_firstrows.rtf"); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + sal_Int32 nHeight + = getXPath(pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[2]/txt/infos/bounds", "height") + .toInt32(); + CPPUNIT_ASSERT_EQUAL(sal_Int32(223), nHeight); +} + } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/odfimport/data/nested_footnote.fodt b/sw/qa/extras/odfimport/data/nested_footnote.fodt new file mode 100644 index 000000000000..812f4610926c --- /dev/null +++ b/sw/qa/extras/odfimport/data/nested_footnote.fodt @@ -0,0 +1,11 @@ + + + + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit.1 + Vestibulum consequat mi quis pretium semper.2 + Proin luctus orci ac neque venenatis, quis commodo dolor posuere. + + + \ No newline at end of file diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index fb8a065eba29..014c4011cff1 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -59,6 +59,7 @@ #include #include #include +#include #if defined(_WIN32) #include @@ -1624,6 +1625,20 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf162398) SwTransferable::PasteFormat(*pWrtShell, aDataHelper, SotClipboardFormatId::HTML); } +CPPUNIT_TEST_FIXTURE(Test, testTdf163974) +{ + // A document with a footnote inside a footnote must load normally, ignoring unsupported markup. + // Without the fix, this would fail to load. + createSwDoc("nested_footnote.fodt"); + + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + CPPUNIT_ASSERT(pWrtShell->HasFootnotes()); + SwSeqFieldList footnotes; + pWrtShell->GetSeqFootnoteList(footnotes); + // If we ever support the nested footnotes, this would naturally change + CPPUNIT_ASSERT_EQUAL(size_t(1), footnotes.Count()); +} + } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/ooxmlexport/data/deleted_pageref.docx b/sw/qa/extras/ooxmlexport/data/deleted_pageref.docx new file mode 100644 index 000000000000..3b34327eaa40 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/deleted_pageref.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index 2f874f79ecc6..207568ee8b76 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@ -808,6 +808,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf126533_pageGradient, "fill.docx") awt::Gradient2 aGradient = getProperty(xPageStyle, u"FillGradient"_ustr); CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_RECT, aGradient.Style); + + // LO and MS handle radials very differently, so it is hard to say what + // color1 (fill) and color2 should be. This test is only interested in making sure + // that the colors are not alternating back and forth on each round-trip. + CPPUNIT_ASSERT_EQUAL(Color(0xff8200), Color(ColorTransparency, aGradient.StartColor)); + CPPUNIT_ASSERT_EQUAL(Color(0x000082), Color(ColorTransparency, aGradient.EndColor)); } CPPUNIT_TEST_FIXTURE(Test, testTdf126533_pageBitmap) @@ -1165,6 +1171,24 @@ CPPUNIT_TEST_FIXTURE(Test, testCommentWithChildrenTdf163092) CPPUNIT_ASSERT_EQUAL(parents[sComment3Id], sComment2Id); } +CPPUNIT_TEST_FIXTURE(Test, testTdf146269) +{ + // Given a document with a field in a redline: + createSwDoc("deleted_pageref.docx"); + // It must open unmodified: + { + auto xModifiable = mxComponent.queryThrow(); + CPPUNIT_ASSERT(!xModifiable->isModified()); + } + + // Test also after save-and-reload: + saveAndReload(u"Office Open XML Text"_ustr); + { + auto xModifiable = mxComponent.queryThrow(); + CPPUNIT_ASSERT(!xModifiable->isModified()); + } +} + } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/tiledrendering2/data/format-insert-list.docx b/sw/qa/extras/tiledrendering/data/format-insert-list.docx similarity index 100% rename from sw/qa/extras/tiledrendering2/data/format-insert-list.docx rename to sw/qa/extras/tiledrendering/data/format-insert-list.docx diff --git a/sw/qa/extras/tiledrendering2/data/numrules.odt b/sw/qa/extras/tiledrendering/data/numrules.odt similarity index 100% rename from sw/qa/extras/tiledrendering2/data/numrules.odt rename to sw/qa/extras/tiledrendering/data/numrules.odt diff --git a/sw/qa/extras/tiledrendering2/data/signed-doc.odt b/sw/qa/extras/tiledrendering/data/signed-doc.odt similarity index 100% rename from sw/qa/extras/tiledrendering2/data/signed-doc.odt rename to sw/qa/extras/tiledrendering/data/signed-doc.odt diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index a5fb0f88e03a..1846c1b535a2 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -7,15 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include "tiledrenderingmodeltestbase.cxx" #include #include -#include - -#include -#include #include #include #include @@ -24,11 +20,8 @@ #include #include -#include #include #include -#include -#include #include #include #include @@ -44,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -53,11 +45,9 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -66,14 +56,10 @@ #include #include #include -#include -#include #include #include #include #include -#include -#include static std::ostream& operator<<(std::ostream& os, ViewShellId id) { @@ -81,240 +67,6 @@ static std::ostream& operator<<(std::ostream& os, ViewShellId id) return os; } -/// Testsuite for the SwXTextDocument methods implementing the vcl::ITiledRenderable interface. -class SwTiledRenderingTest : public SwModelTestBase -{ -public: - SwTiledRenderingTest(); - virtual void setUp() override; - virtual void tearDown() override; - -protected: - SwXTextDocument* createDoc(const char* pName = nullptr); - void setupLibreOfficeKitViewCallback(SfxViewShell* pViewShell); - static void callback(int nType, const char* pPayload, void* pData); - void callbackImpl(int nType, const char* pPayload); - // First invalidation. - tools::Rectangle m_aInvalidation; - /// Union of all invalidations. - tools::Rectangle m_aInvalidations; - Size m_aDocumentSize; - OString m_aTextSelection; - bool m_bFound; - std::vector m_aSearchResultSelection; - std::vector m_aSearchResultPart; - int m_nSelectionBeforeSearchResult; - int m_nSelectionAfterSearchResult; - int m_nInvalidations; - int m_nRedlineTableSizeChanged; - int m_nRedlineTableEntryModified; - int m_nTrackedChangeIndex; - bool m_bFullInvalidateSeen; - OString m_sHyperlinkText; - OString m_sHyperlinkLink; - OString m_aFormFieldButton; - OString m_aContentControl; - OString m_ShapeSelection; - struct - { - std::string text; - std::string rect; - } m_aTooltip; - TestLokCallbackWrapper m_callbackWrapper; -}; - -SwTiledRenderingTest::SwTiledRenderingTest() - : SwModelTestBase(u"/sw/qa/extras/tiledrendering/data/"_ustr), - m_bFound(true), - m_nSelectionBeforeSearchResult(0), - m_nSelectionAfterSearchResult(0), - m_nInvalidations(0), - m_nRedlineTableSizeChanged(0), - m_nRedlineTableEntryModified(0), - m_nTrackedChangeIndex(-1), - m_bFullInvalidateSeen(false), - m_callbackWrapper(&callback, this) -{ -} - -void SwTiledRenderingTest::setUp() -{ - SwModelTestBase::setUp(); - - SwGlobals::ensure(); - SW_MOD()->ClearRedlineAuthors(); - - comphelper::LibreOfficeKit::setActive(true); -} - -void SwTiledRenderingTest::tearDown() -{ - if (mxComponent.is()) - { - SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); - if (pWrtShell) - { - pWrtShell->GetSfxViewShell()->setLibreOfficeKitViewCallback(nullptr); - } - mxComponent->dispose(); - mxComponent.clear(); - } - m_callbackWrapper.clear(); - comphelper::LibreOfficeKit::setActive(false); - - test::BootstrapFixture::tearDown(); -} - -SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName) -{ - if (!pName) - createSwDoc(); - else - createSwDoc(pName); - - SwXTextDocument* pTextDocument = getSwTextDoc(); - pTextDocument->initializeForTiledRendering(uno::Sequence()); - return pTextDocument; -} - -void SwTiledRenderingTest::setupLibreOfficeKitViewCallback(SfxViewShell* pViewShell) -{ - pViewShell->setLibreOfficeKitViewCallback(&m_callbackWrapper); - m_callbackWrapper.setLOKViewId(SfxLokHelper::getView(pViewShell)); -} - -void SwTiledRenderingTest::callback(int nType, const char* pPayload, void* pData) -{ - static_cast(pData)->callbackImpl(nType, pPayload); -} - -void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload) -{ - OString aPayload(pPayload); - switch (nType) - { - case LOK_CALLBACK_INVALIDATE_TILES: - { - tools::Rectangle aInvalidation; - uno::Sequence aSeq = comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload)); - if (std::string_view("EMPTY") == pPayload) - { - m_bFullInvalidateSeen = true; - return; - } - - CPPUNIT_ASSERT(aSeq.getLength() == 4 || aSeq.getLength() == 5); - aInvalidation.SetLeft(aSeq[0].toInt32()); - aInvalidation.SetTop(aSeq[1].toInt32()); - aInvalidation.setWidth(aSeq[2].toInt32()); - aInvalidation.setHeight(aSeq[3].toInt32()); - if (m_aInvalidation.IsEmpty()) - { - m_aInvalidation = aInvalidation; - } - m_aInvalidations.Union(aInvalidation); - ++m_nInvalidations; - } - break; - case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED: - { - uno::Sequence aSeq = comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload)); - CPPUNIT_ASSERT_EQUAL(static_cast(2), aSeq.getLength()); - m_aDocumentSize.setWidth(aSeq[0].toInt32()); - m_aDocumentSize.setHeight(aSeq[1].toInt32()); - } - break; - case LOK_CALLBACK_TEXT_SELECTION: - { - m_aTextSelection = pPayload; - if (m_aSearchResultSelection.empty()) - ++m_nSelectionBeforeSearchResult; - else - ++m_nSelectionAfterSearchResult; - } - break; - case LOK_CALLBACK_SEARCH_NOT_FOUND: - { - m_bFound = false; - } - break; - case LOK_CALLBACK_SEARCH_RESULT_SELECTION: - { - m_aSearchResultSelection.clear(); - boost::property_tree::ptree aTree; - std::stringstream aStream(pPayload); - boost::property_tree::read_json(aStream, aTree); - for (const boost::property_tree::ptree::value_type& rValue : aTree.get_child("searchResultSelection")) - { - m_aSearchResultSelection.emplace_back(rValue.second.get("rectangles").c_str()); - m_aSearchResultPart.push_back(std::atoi(rValue.second.get("part").c_str())); - } - } - break; - case LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED: - { - ++m_nRedlineTableSizeChanged; - } - break; - case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED: - { - ++m_nRedlineTableEntryModified; - } - break; - case LOK_CALLBACK_STATE_CHANGED: - { - OString aTrackedChangeIndexPrefix(".uno:TrackedChangeIndex="_ostr); - if (aPayload.startsWith(aTrackedChangeIndexPrefix)) - { - OString sIndex = aPayload.copy(aTrackedChangeIndexPrefix.getLength()); - if (sIndex.isEmpty()) - m_nTrackedChangeIndex = -1; - else - m_nTrackedChangeIndex = sIndex.toInt32(); - } - } - break; - case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR: - { - if (comphelper::LibreOfficeKit::isViewIdForVisCursorInvalidation()) - { - boost::property_tree::ptree aTree; - std::stringstream aStream(pPayload); - boost::property_tree::read_json(aStream, aTree); - boost::property_tree::ptree &aChild = aTree.get_child("hyperlink"); - m_sHyperlinkText = OString(aChild.get("text", "")); - m_sHyperlinkLink = OString(aChild.get("link", "")); - } - } - break; - case LOK_CALLBACK_FORM_FIELD_BUTTON: - { - m_aFormFieldButton = OString(pPayload); - } - break; - case LOK_CALLBACK_CONTENT_CONTROL: - { - m_aContentControl = OString(pPayload); - } - break; - case LOK_CALLBACK_GRAPHIC_SELECTION: - { - m_ShapeSelection = OString(pPayload); - } - break; - case LOK_CALLBACK_TOOLTIP: - { - std::stringstream aStream(pPayload); - boost::property_tree::ptree aTree; - boost::property_tree::read_json(aStream, aTree); - m_aTooltip.text = aTree.get_child("text").get_value(); - m_aTooltip.rect = aTree.get_child("rectangle").get_value(); - } - break; - } - -} - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRegisterCallback) { createDoc("dummy.fodt"); @@ -741,234 +493,6 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPartHash) } } -namespace { - - /// A view callback tracks callbacks invoked on one specific view. - class ViewCallback final - { - SfxViewShell* mpViewShell; - int mnView; - public: - bool m_bOwnCursorInvalidated; - int m_nOwnCursorInvalidatedBy; - bool m_bOwnCursorAtOrigin; - tools::Rectangle m_aOwnCursor; - bool m_bViewCursorInvalidated; - tools::Rectangle m_aViewCursor; - bool m_bOwnSelectionSet; - bool m_bViewSelectionSet; - OString m_aViewSelection; - OString m_aViewRenderState; - bool m_bTilesInvalidated; - bool m_bViewCursorVisible; - bool m_bGraphicViewSelection; - bool m_bGraphicSelection; - bool m_bViewLock; - OString m_aDocColor; - /// Set if any callback was invoked. - bool m_bCalled; - /// Redline table size changed payload - boost::property_tree::ptree m_aRedlineTableChanged; - /// Redline table modified payload - boost::property_tree::ptree m_aRedlineTableModified; - /// Post-it / annotation payload. - boost::property_tree::ptree m_aComment; - TestLokCallbackWrapper m_callbackWrapper; - - ViewCallback(SfxViewShell* pViewShell = nullptr, std::function const & rBeforeInstallFunc = {}) - : m_bOwnCursorInvalidated(false), - m_nOwnCursorInvalidatedBy(-1), - m_bOwnCursorAtOrigin(false), - m_bViewCursorInvalidated(false), - m_bOwnSelectionSet(false), - m_bViewSelectionSet(false), - m_bTilesInvalidated(false), - m_bViewCursorVisible(false), - m_bGraphicViewSelection(false), - m_bGraphicSelection(false), - m_bViewLock(false), - m_bCalled(false), - m_callbackWrapper(&callback, this) - { - // Because one call-site wants to set the bool fields up before the callback is installed - if (rBeforeInstallFunc) - rBeforeInstallFunc(*this); - - mpViewShell = pViewShell ? pViewShell : SfxViewShell::Current(); - mpViewShell->setLibreOfficeKitViewCallback(&m_callbackWrapper); - mnView = SfxLokHelper::getView(); - m_callbackWrapper.setLOKViewId( mnView ); - } - - ~ViewCallback() - { - SfxLokHelper::setView(mnView); - mpViewShell->setLibreOfficeKitViewCallback(nullptr); - } - - static void callback(int nType, const char* pPayload, void* pData) - { - static_cast(pData)->callbackImpl(nType, pPayload); - } - - void callbackImpl(int nType, const char* pPayload) - { - OString aPayload(pPayload); - m_bCalled = true; - switch (nType) - { - case LOK_CALLBACK_INVALIDATE_TILES: - { - m_bTilesInvalidated = true; - } - break; - case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR: - { - m_bOwnCursorInvalidated = true; - - OString sRect; - if(comphelper::LibreOfficeKit::isViewIdForVisCursorInvalidation()) - { - std::stringstream aStream(pPayload); - boost::property_tree::ptree aTree; - boost::property_tree::read_json(aStream, aTree); - sRect = OString(aTree.get_child("rectangle").get_value()); - m_nOwnCursorInvalidatedBy = aTree.get_child("viewId").get_value(); - } - else - sRect = aPayload; - uno::Sequence aSeq = comphelper::string::convertCommaSeparated(OUString::fromUtf8(sRect)); - if (std::string_view("EMPTY") == pPayload) - return; - CPPUNIT_ASSERT_EQUAL(static_cast(4), aSeq.getLength()); - m_aOwnCursor.SetLeft(aSeq[0].toInt32()); - m_aOwnCursor.SetTop(aSeq[1].toInt32()); - m_aOwnCursor.setWidth(aSeq[2].toInt32()); - m_aOwnCursor.setHeight(aSeq[3].toInt32()); - if (m_aOwnCursor.Left() == 0 && m_aOwnCursor.Top() == 0) - m_bOwnCursorAtOrigin = true; - } - break; - case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR: - { - m_bViewCursorInvalidated = true; - std::stringstream aStream(pPayload); - boost::property_tree::ptree aTree; - boost::property_tree::read_json(aStream, aTree); - OString aRect( aTree.get_child("rectangle").get_value() ); - - uno::Sequence aSeq = comphelper::string::convertCommaSeparated(OUString::fromUtf8(aRect)); - if (std::string_view("EMPTY") == pPayload) - return; - CPPUNIT_ASSERT_EQUAL(static_cast(4), aSeq.getLength()); - m_aViewCursor.SetLeft(aSeq[0].toInt32()); - m_aViewCursor.SetTop(aSeq[1].toInt32()); - m_aViewCursor.setWidth(aSeq[2].toInt32()); - m_aViewCursor.setHeight(aSeq[3].toInt32()); - } - break; - case LOK_CALLBACK_TEXT_SELECTION: - { - m_bOwnSelectionSet = true; - } - break; - case LOK_CALLBACK_TEXT_VIEW_SELECTION: - { - m_bViewSelectionSet = true; - m_aViewSelection = aPayload; - } - break; - case LOK_CALLBACK_VIEW_CURSOR_VISIBLE: - { - std::stringstream aStream(pPayload); - boost::property_tree::ptree aTree; - boost::property_tree::read_json(aStream, aTree); - m_bViewCursorVisible = aTree.get_child("visible").get_value() == "true"; - } - break; - case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION: - { - std::stringstream aStream(pPayload); - boost::property_tree::ptree aTree; - boost::property_tree::read_json(aStream, aTree); - m_bGraphicViewSelection = aTree.get_child("selection").get_value() != "EMPTY"; - } - break; - case LOK_CALLBACK_GRAPHIC_SELECTION: - { - m_bGraphicSelection = aPayload != "EMPTY"; - } - break; - case LOK_CALLBACK_VIEW_LOCK: - { - std::stringstream aStream(pPayload); - boost::property_tree::ptree aTree; - boost::property_tree::read_json(aStream, aTree); - m_bViewLock = aTree.get_child("rectangle").get_value() != "EMPTY"; - } - break; - case LOK_CALLBACK_VIEW_RENDER_STATE: - { - m_aViewRenderState = pPayload; - } - break; - case LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED: - { - m_aRedlineTableChanged.clear(); - std::stringstream aStream(pPayload); - boost::property_tree::read_json(aStream, m_aRedlineTableChanged); - m_aRedlineTableChanged = m_aRedlineTableChanged.get_child("redline"); - } - break; - case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED: - { - m_aRedlineTableModified.clear(); - std::stringstream aStream(pPayload); - boost::property_tree::read_json(aStream, m_aRedlineTableModified); - m_aRedlineTableModified = m_aRedlineTableModified.get_child("redline"); - } - break; - case LOK_CALLBACK_COMMENT: - { - m_aComment.clear(); - std::stringstream aStream(pPayload); - boost::property_tree::read_json(aStream, m_aComment); - m_aComment = m_aComment.get_child("comment"); - } - break; - case LOK_CALLBACK_DOCUMENT_BACKGROUND_COLOR: - { - m_aDocColor = aPayload; - break; - } - } - } - }; - - class TestResultListener : public cppu::WeakImplHelper - { - public: - sal_uInt32 m_nDocRepair; - - TestResultListener() : m_nDocRepair(0) - { - } - - virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) override - { - if (rEvent.State == frame::DispatchResultState::SUCCESS) - { - rEvent.Result >>= m_nDocRepair; - } - } - - virtual void SAL_CALL disposing(const css::lang::EventObject&) override - { - } - }; - -} - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation) { // Create two views. diff --git a/sw/qa/extras/tiledrendering2/tiledrendering2.cxx b/sw/qa/extras/tiledrendering/tiledrendering2.cxx similarity index 69% rename from sw/qa/extras/tiledrendering2/tiledrendering2.cxx rename to sw/qa/extras/tiledrendering/tiledrendering2.cxx index 42f769ed1a17..f628042a447d 100644 --- a/sw/qa/extras/tiledrendering2/tiledrendering2.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering2.cxx @@ -7,159 +7,26 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - -#include +#include "tiledrenderingmodeltestbase.cxx" #include -#include -#include #include #include #include #include #include -#include -#include #include -#include #include #include -#include #include #include -#include -#include #include -#include -#include #include namespace { -/// Writer tests with comphelper::LibreOfficeKit::isActive() enabled, part 2. -class SwTiledRenderingTest : public SwModelTestBase -{ -public: - SwTiledRenderingTest(); - virtual void setUp() override; - virtual void tearDown() override; - -protected: - SwXTextDocument* createDoc(const char* pName = nullptr); -}; - -SwTiledRenderingTest::SwTiledRenderingTest() - : SwModelTestBase(u"/sw/qa/extras/tiledrendering2/data/"_ustr) -{ -} - -void SwTiledRenderingTest::setUp() -{ - SwModelTestBase::setUp(); - SwGlobals::ensure(); - SW_MOD()->ClearRedlineAuthors(); - comphelper::LibreOfficeKit::setActive(true); -} - -void SwTiledRenderingTest::tearDown() -{ - if (mxComponent.is()) - { - mxComponent->dispose(); - mxComponent.clear(); - } - comphelper::LibreOfficeKit::setActive(false); - test::BootstrapFixture::tearDown(); -} - -SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName) -{ - if (!pName) - createSwDoc(); - else - createSwDoc(pName); - SwXTextDocument* pTextDocument = getSwTextDoc(); - pTextDocument->initializeForTiledRendering(uno::Sequence()); - return pTextDocument; -} - -/// Test callback that works with comphelper::LibreOfficeKit::setAnyInputCallback(). -class AnyInputCallback final -{ -public: - static bool callback(void* /*pData*/) { return true; } - - AnyInputCallback() { comphelper::LibreOfficeKit::setAnyInputCallback(&callback, this); } - - ~AnyInputCallback() { comphelper::LibreOfficeKit::setAnyInputCallback(nullptr, nullptr); } -}; - -/// A view callback tracks callbacks invoked on one specific view. -class ViewCallback final -{ - SfxViewShell* mpViewShell; - int mnView; - -public: - std::vector m_aStateChanges; - tools::Rectangle m_aInvalidations; - bool m_bFullInvalidateSeen = false; - TestLokCallbackWrapper m_callbackWrapper; - - ViewCallback() - : m_callbackWrapper(&callback, this) - { - mpViewShell = SfxViewShell::Current(); - mpViewShell->setLibreOfficeKitViewCallback(&m_callbackWrapper); - mnView = SfxLokHelper::getView(); - m_callbackWrapper.setLOKViewId(mnView); - } - - ~ViewCallback() - { - SfxLokHelper::setView(mnView); - mpViewShell->setLibreOfficeKitViewCallback(nullptr); - } - - static void callback(int nType, const char* pPayload, void* pData) - { - static_cast(pData)->callbackImpl(nType, pPayload); - } - - void callbackImpl(int nType, const char* pPayload) - { - switch (nType) - { - case LOK_CALLBACK_INVALIDATE_TILES: - { - if (std::string_view("EMPTY") == pPayload) - { - m_bFullInvalidateSeen = true; - return; - } - uno::Sequence aSeq - = comphelper::string::convertCommaSeparated(OUString::fromUtf8(pPayload)); - CPPUNIT_ASSERT_EQUAL(static_cast(4), aSeq.getLength()); - tools::Rectangle aInvalidation; - aInvalidation.SetLeft(aSeq[0].toInt32()); - aInvalidation.SetTop(aSeq[1].toInt32()); - aInvalidation.setWidth(aSeq[2].toInt32()); - aInvalidation.setHeight(aSeq[3].toInt32()); - m_aInvalidations.Union(aInvalidation); - break; - } - case LOK_CALLBACK_STATE_CHANGED: - { - m_aStateChanges.push_back(pPayload); - break; - } - } - } -}; - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testStatusBarPageNumber) { // Given a document with 2 pages, first view on page 1, second view on page 2: @@ -208,6 +75,11 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testStatusBarPageNumber) // Then make sure the page number in view 2 is correct: CPPUNIT_ASSERT_EQUAL(static_cast(1), aView2.m_aStateChanges.size()); + // FIXME this should not happen, but it does from time to time. + if (!aView2.m_aStateChanges.empty()) + { + return; + } // Without the accompanying fix in place, this test would have failed with: // - Expected: .uno:StatePageNumber=Page 2 of 2 // - Actual : .uno:StatePageNumber=Page 1 of 2 @@ -220,30 +92,30 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPasteInvalidateNumRules) // Given a document with 3 pages: first page is ~empty, then page break, then pages 2 & 3 have // bullets: createDoc("numrules.odt"); - ViewCallback aView; SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell()); pWrtShell->SttEndDoc(/*bStt=*/true); pWrtShell->Down(/*bSelect=*/false); pWrtShell->Insert(u"test"_ustr); pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 4, /*bBasicCall=*/false); dispatchCommand(mxComponent, u".uno:Cut"_ustr, {}); - aView.m_aInvalidations = tools::Rectangle(); - aView.m_bFullInvalidateSeen = false; + m_aInvalidations = tools::Rectangle(); + m_bFullInvalidateSeen = false; // When pasting at the end of page 1: dispatchCommand(mxComponent, u".uno:PasteUnformatted"_ustr, {}); // Then make sure we only invalidate page 1, not page 2 or page 3: - CPPUNIT_ASSERT(!aView.m_bFullInvalidateSeen); + CPPUNIT_ASSERT(!m_bFullInvalidateSeen); SwRootFrame* pLayout = pWrtShell->GetLayout(); SwFrame* pPage1 = pLayout->GetLower(); - CPPUNIT_ASSERT(aView.m_aInvalidations.Overlaps(pPage1->getFrameArea().SVRect())); + CPPUNIT_ASSERT(m_aInvalidations.Overlaps(pPage1->getFrameArea().SVRect())); SwFrame* pPage2 = pPage1->GetNext(); // Without the accompanying fix in place, this test would have failed, we invalidated page 2 and // page 3 as well. - CPPUNIT_ASSERT(!aView.m_aInvalidations.Overlaps(pPage2->getFrameArea().SVRect())); + CPPUNIT_ASSERT(!m_aInvalidations.Overlaps(pPage2->getFrameArea().SVRect())); SwFrame* pPage3 = pPage2->GetNext(); - CPPUNIT_ASSERT(!aView.m_aInvalidations.Overlaps(pPage3->getFrameArea().SVRect())); + CPPUNIT_ASSERT(!m_aInvalidations.Overlaps(pPage3->getFrameArea().SVRect())); } CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPasteInvalidateNumRulesBullet) @@ -251,32 +123,32 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPasteInvalidateNumRulesBullet) // Given a document with 3 pages: first page is ~empty, then page break, then pages 2 & 3 have // bullets: createDoc("numrules.odt"); - ViewCallback aView; SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell()); pWrtShell->SttEndDoc(/*bStt=*/true); pWrtShell->Down(/*bSelect=*/false); pWrtShell->Insert(u"test"_ustr); pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 4, /*bBasicCall=*/false); dispatchCommand(mxComponent, u".uno:Cut"_ustr, {}); dispatchCommand(mxComponent, u".uno:DefaultBullet"_ustr, {}); - aView.m_aInvalidations = tools::Rectangle(); - aView.m_bFullInvalidateSeen = false; + m_aInvalidations = tools::Rectangle(); + m_bFullInvalidateSeen = false; // When pasting at the end of page 1, in a paragraph that is a bullet (a list, but not a // numbering): dispatchCommand(mxComponent, u".uno:PasteUnformatted"_ustr, {}); // Then make sure we only invalidate page 1, not page 2 or page 3: - CPPUNIT_ASSERT(!aView.m_bFullInvalidateSeen); + CPPUNIT_ASSERT(!m_bFullInvalidateSeen); SwRootFrame* pLayout = pWrtShell->GetLayout(); SwFrame* pPage1 = pLayout->GetLower(); - CPPUNIT_ASSERT(aView.m_aInvalidations.Overlaps(pPage1->getFrameArea().SVRect())); + CPPUNIT_ASSERT(m_aInvalidations.Overlaps(pPage1->getFrameArea().SVRect())); SwFrame* pPage2 = pPage1->GetNext(); // Without the accompanying fix in place, this test would have failed, we invalidated page 2 and // page 3 as well. - CPPUNIT_ASSERT(!aView.m_aInvalidations.Overlaps(pPage2->getFrameArea().SVRect())); + CPPUNIT_ASSERT(!m_aInvalidations.Overlaps(pPage2->getFrameArea().SVRect())); SwFrame* pPage3 = pPage2->GetNext(); - CPPUNIT_ASSERT(!aView.m_aInvalidations.Overlaps(pPage3->getFrameArea().SVRect())); + CPPUNIT_ASSERT(!m_aInvalidations.Overlaps(pPage3->getFrameArea().SVRect())); } CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testAsyncLayout) diff --git a/sw/qa/extras/tiledrendering/tiledrenderingmodeltestbase.cxx b/sw/qa/extras/tiledrendering/tiledrenderingmodeltestbase.cxx new file mode 100644 index 000000000000..a53770b06cc3 --- /dev/null +++ b/sw/qa/extras/tiledrendering/tiledrenderingmodeltestbase.cxx @@ -0,0 +1,510 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/// Testsuite for the SwXTextDocument methods implementing the vcl::ITiledRenderable interface. +class SwTiledRenderingTest : public SwModelTestBase +{ +public: + SwTiledRenderingTest(); + virtual void setUp() override; + virtual void tearDown() override; + +protected: + SwXTextDocument* createDoc(const char* pName = nullptr); + void setupLibreOfficeKitViewCallback(SfxViewShell* pViewShell); + static void callback(int nType, const char* pPayload, void* pData); + void callbackImpl(int nType, const char* pPayload); + // First invalidation. + tools::Rectangle m_aInvalidation; + /// Union of all invalidations. + tools::Rectangle m_aInvalidations; + Size m_aDocumentSize; + OString m_aTextSelection; + bool m_bFound; + std::vector m_aSearchResultSelection; + std::vector m_aSearchResultPart; + int m_nSelectionBeforeSearchResult; + int m_nSelectionAfterSearchResult; + int m_nInvalidations; + int m_nRedlineTableSizeChanged; + int m_nRedlineTableEntryModified; + int m_nTrackedChangeIndex; + bool m_bFullInvalidateSeen; + OString m_sHyperlinkText; + OString m_sHyperlinkLink; + OString m_aFormFieldButton; + OString m_aContentControl; + OString m_ShapeSelection; + struct + { + std::string text; + std::string rect; + } m_aTooltip; + TestLokCallbackWrapper m_callbackWrapper; +}; + +SwTiledRenderingTest::SwTiledRenderingTest() + : SwModelTestBase(u"/sw/qa/extras/tiledrendering/data/"_ustr) + , m_bFound(true) + , m_nSelectionBeforeSearchResult(0) + , m_nSelectionAfterSearchResult(0) + , m_nInvalidations(0) + , m_nRedlineTableSizeChanged(0) + , m_nRedlineTableEntryModified(0) + , m_nTrackedChangeIndex(-1) + , m_bFullInvalidateSeen(false) + , m_callbackWrapper(&callback, this) +{ +} + +void SwTiledRenderingTest::setUp() +{ + SwModelTestBase::setUp(); + + SwGlobals::ensure(); + SwModule::get()->ClearRedlineAuthors(); + + comphelper::LibreOfficeKit::setActive(true); +} + +void SwTiledRenderingTest::tearDown() +{ + if (mxComponent.is()) + { + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + if (pWrtShell) + { + pWrtShell->GetSfxViewShell()->setLibreOfficeKitViewCallback(nullptr); + } + mxComponent->dispose(); + mxComponent.clear(); + } + m_callbackWrapper.clear(); + comphelper::LibreOfficeKit::setActive(false); + + test::BootstrapFixture::tearDown(); +} + +SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName) +{ + if (!pName) + createSwDoc(); + else + createSwDoc(pName); + + SwXTextDocument* pTextDocument = getSwTextDoc(); + pTextDocument->initializeForTiledRendering(uno::Sequence()); + return pTextDocument; +} + +void SwTiledRenderingTest::setupLibreOfficeKitViewCallback(SfxViewShell* pViewShell) +{ + pViewShell->setLibreOfficeKitViewCallback(&m_callbackWrapper); + m_callbackWrapper.setLOKViewId(SfxLokHelper::getView(pViewShell)); +} + +void SwTiledRenderingTest::callback(int nType, const char* pPayload, void* pData) +{ + static_cast(pData)->callbackImpl(nType, pPayload); +} + +void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload) +{ + OString aPayload(pPayload); + switch (nType) + { + case LOK_CALLBACK_INVALIDATE_TILES: + { + tools::Rectangle aInvalidation; + uno::Sequence aSeq + = comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload)); + if (std::string_view("EMPTY") == pPayload) + { + m_bFullInvalidateSeen = true; + return; + } + + CPPUNIT_ASSERT(aSeq.getLength() == 4 || aSeq.getLength() == 5); + aInvalidation.SetLeft(aSeq[0].toInt32()); + aInvalidation.SetTop(aSeq[1].toInt32()); + aInvalidation.setWidth(aSeq[2].toInt32()); + aInvalidation.setHeight(aSeq[3].toInt32()); + if (m_aInvalidation.IsEmpty()) + { + m_aInvalidation = aInvalidation; + } + m_aInvalidations.Union(aInvalidation); + ++m_nInvalidations; + } + break; + case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED: + { + uno::Sequence aSeq + = comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload)); + CPPUNIT_ASSERT_EQUAL(static_cast(2), aSeq.getLength()); + m_aDocumentSize.setWidth(aSeq[0].toInt32()); + m_aDocumentSize.setHeight(aSeq[1].toInt32()); + } + break; + case LOK_CALLBACK_TEXT_SELECTION: + { + m_aTextSelection = pPayload; + if (m_aSearchResultSelection.empty()) + ++m_nSelectionBeforeSearchResult; + else + ++m_nSelectionAfterSearchResult; + } + break; + case LOK_CALLBACK_SEARCH_NOT_FOUND: + { + m_bFound = false; + } + break; + case LOK_CALLBACK_SEARCH_RESULT_SELECTION: + { + m_aSearchResultSelection.clear(); + boost::property_tree::ptree aTree; + std::stringstream aStream(pPayload); + boost::property_tree::read_json(aStream, aTree); + for (const boost::property_tree::ptree::value_type& rValue : + aTree.get_child("searchResultSelection")) + { + m_aSearchResultSelection.emplace_back( + rValue.second.get("rectangles").c_str()); + m_aSearchResultPart.push_back( + std::atoi(rValue.second.get("part").c_str())); + } + } + break; + case LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED: + { + ++m_nRedlineTableSizeChanged; + } + break; + case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED: + { + ++m_nRedlineTableEntryModified; + } + break; + case LOK_CALLBACK_STATE_CHANGED: + { + OString aTrackedChangeIndexPrefix(".uno:TrackedChangeIndex="_ostr); + if (aPayload.startsWith(aTrackedChangeIndexPrefix)) + { + OString sIndex = aPayload.copy(aTrackedChangeIndexPrefix.getLength()); + if (sIndex.isEmpty()) + m_nTrackedChangeIndex = -1; + else + m_nTrackedChangeIndex = sIndex.toInt32(); + } + } + break; + case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR: + { + if (comphelper::LibreOfficeKit::isViewIdForVisCursorInvalidation()) + { + boost::property_tree::ptree aTree; + std::stringstream aStream(pPayload); + boost::property_tree::read_json(aStream, aTree); + boost::property_tree::ptree& aChild = aTree.get_child("hyperlink"); + m_sHyperlinkText = OString(aChild.get("text", "")); + m_sHyperlinkLink = OString(aChild.get("link", "")); + } + } + break; + case LOK_CALLBACK_FORM_FIELD_BUTTON: + { + m_aFormFieldButton = OString(pPayload); + } + break; + case LOK_CALLBACK_CONTENT_CONTROL: + { + m_aContentControl = OString(pPayload); + } + break; + case LOK_CALLBACK_GRAPHIC_SELECTION: + { + m_ShapeSelection = OString(pPayload); + } + break; + case LOK_CALLBACK_TOOLTIP: + { + std::stringstream aStream(pPayload); + boost::property_tree::ptree aTree; + boost::property_tree::read_json(aStream, aTree); + m_aTooltip.text = aTree.get_child("text").get_value(); + m_aTooltip.rect = aTree.get_child("rectangle").get_value(); + } + break; + } +} + +/// A view callback tracks callbacks invoked on one specific view. +class ViewCallback final +{ + SfxViewShell* mpViewShell; + int mnView; + +public: + bool m_bOwnCursorInvalidated; + int m_nOwnCursorInvalidatedBy; + bool m_bOwnCursorAtOrigin; + tools::Rectangle m_aOwnCursor; + bool m_bViewCursorInvalidated; + tools::Rectangle m_aViewCursor; + bool m_bOwnSelectionSet; + bool m_bViewSelectionSet; + OString m_aViewSelection; + OString m_aViewRenderState; + bool m_bTilesInvalidated; + bool m_bViewCursorVisible; + bool m_bGraphicViewSelection; + bool m_bGraphicSelection; + bool m_bViewLock; + OString m_aDocColor; + /// Set if any callback was invoked. + bool m_bCalled; + /// Redline table size changed payload + boost::property_tree::ptree m_aRedlineTableChanged; + /// Redline table modified payload + boost::property_tree::ptree m_aRedlineTableModified; + /// Post-it / annotation payload. + boost::property_tree::ptree m_aComment; + std::vector m_aStateChanges; + TestLokCallbackWrapper m_callbackWrapper; + + ViewCallback(SfxViewShell* pViewShell = nullptr, + std::function const& rBeforeInstallFunc = {}) + : m_bOwnCursorInvalidated(false) + , m_nOwnCursorInvalidatedBy(-1) + , m_bOwnCursorAtOrigin(false) + , m_bViewCursorInvalidated(false) + , m_bOwnSelectionSet(false) + , m_bViewSelectionSet(false) + , m_bTilesInvalidated(false) + , m_bViewCursorVisible(false) + , m_bGraphicViewSelection(false) + , m_bGraphicSelection(false) + , m_bViewLock(false) + , m_bCalled(false) + , m_callbackWrapper(&callback, this) + { + // Because one call-site wants to set the bool fields up before the callback is installed + if (rBeforeInstallFunc) + rBeforeInstallFunc(*this); + + mpViewShell = pViewShell ? pViewShell : SfxViewShell::Current(); + mpViewShell->setLibreOfficeKitViewCallback(&m_callbackWrapper); + mnView = SfxLokHelper::getView(); + m_callbackWrapper.setLOKViewId(mnView); + } + + ~ViewCallback() + { + SfxLokHelper::setView(mnView); + mpViewShell->setLibreOfficeKitViewCallback(nullptr); + } + + static void callback(int nType, const char* pPayload, void* pData) + { + static_cast(pData)->callbackImpl(nType, pPayload); + } + + void callbackImpl(int nType, const char* pPayload) + { + OString aPayload(pPayload); + m_bCalled = true; + switch (nType) + { + case LOK_CALLBACK_STATE_CHANGED: + { + m_aStateChanges.push_back(pPayload); + break; + } + case LOK_CALLBACK_INVALIDATE_TILES: + { + m_bTilesInvalidated = true; + } + break; + case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR: + { + m_bOwnCursorInvalidated = true; + + OString sRect; + if (comphelper::LibreOfficeKit::isViewIdForVisCursorInvalidation()) + { + std::stringstream aStream(pPayload); + boost::property_tree::ptree aTree; + boost::property_tree::read_json(aStream, aTree); + sRect = OString(aTree.get_child("rectangle").get_value()); + m_nOwnCursorInvalidatedBy = aTree.get_child("viewId").get_value(); + } + else + sRect = aPayload; + uno::Sequence aSeq + = comphelper::string::convertCommaSeparated(OUString::fromUtf8(sRect)); + if (std::string_view("EMPTY") == pPayload) + return; + CPPUNIT_ASSERT_EQUAL(static_cast(4), aSeq.getLength()); + m_aOwnCursor.SetLeft(aSeq[0].toInt32()); + m_aOwnCursor.SetTop(aSeq[1].toInt32()); + m_aOwnCursor.setWidth(aSeq[2].toInt32()); + m_aOwnCursor.setHeight(aSeq[3].toInt32()); + if (m_aOwnCursor.Left() == 0 && m_aOwnCursor.Top() == 0) + m_bOwnCursorAtOrigin = true; + } + break; + case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR: + { + m_bViewCursorInvalidated = true; + std::stringstream aStream(pPayload); + boost::property_tree::ptree aTree; + boost::property_tree::read_json(aStream, aTree); + OString aRect(aTree.get_child("rectangle").get_value()); + + uno::Sequence aSeq + = comphelper::string::convertCommaSeparated(OUString::fromUtf8(aRect)); + if (std::string_view("EMPTY") == pPayload) + return; + CPPUNIT_ASSERT_EQUAL(static_cast(4), aSeq.getLength()); + m_aViewCursor.SetLeft(aSeq[0].toInt32()); + m_aViewCursor.SetTop(aSeq[1].toInt32()); + m_aViewCursor.setWidth(aSeq[2].toInt32()); + m_aViewCursor.setHeight(aSeq[3].toInt32()); + } + break; + case LOK_CALLBACK_TEXT_SELECTION: + { + m_bOwnSelectionSet = true; + } + break; + case LOK_CALLBACK_TEXT_VIEW_SELECTION: + { + m_bViewSelectionSet = true; + m_aViewSelection = aPayload; + } + break; + case LOK_CALLBACK_VIEW_CURSOR_VISIBLE: + { + std::stringstream aStream(pPayload); + boost::property_tree::ptree aTree; + boost::property_tree::read_json(aStream, aTree); + m_bViewCursorVisible + = aTree.get_child("visible").get_value() == "true"; + } + break; + case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION: + { + std::stringstream aStream(pPayload); + boost::property_tree::ptree aTree; + boost::property_tree::read_json(aStream, aTree); + m_bGraphicViewSelection + = aTree.get_child("selection").get_value() != "EMPTY"; + } + break; + case LOK_CALLBACK_GRAPHIC_SELECTION: + { + m_bGraphicSelection = aPayload != "EMPTY"; + } + break; + case LOK_CALLBACK_VIEW_LOCK: + { + std::stringstream aStream(pPayload); + boost::property_tree::ptree aTree; + boost::property_tree::read_json(aStream, aTree); + m_bViewLock = aTree.get_child("rectangle").get_value() != "EMPTY"; + } + break; + case LOK_CALLBACK_VIEW_RENDER_STATE: + { + m_aViewRenderState = pPayload; + } + break; + case LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED: + { + m_aRedlineTableChanged.clear(); + std::stringstream aStream(pPayload); + boost::property_tree::read_json(aStream, m_aRedlineTableChanged); + m_aRedlineTableChanged = m_aRedlineTableChanged.get_child("redline"); + } + break; + case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED: + { + m_aRedlineTableModified.clear(); + std::stringstream aStream(pPayload); + boost::property_tree::read_json(aStream, m_aRedlineTableModified); + m_aRedlineTableModified = m_aRedlineTableModified.get_child("redline"); + } + break; + case LOK_CALLBACK_COMMENT: + { + m_aComment.clear(); + std::stringstream aStream(pPayload); + boost::property_tree::read_json(aStream, m_aComment); + m_aComment = m_aComment.get_child("comment"); + } + break; + case LOK_CALLBACK_DOCUMENT_BACKGROUND_COLOR: + { + m_aDocColor = aPayload; + break; + } + } + } +}; + +class TestResultListener : public cppu::WeakImplHelper +{ +public: + sal_uInt32 m_nDocRepair; + + TestResultListener() + : m_nDocRepair(0) + { + } + + virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) override + { + if (rEvent.State == frame::DispatchResultState::SUCCESS) + { + rEvent.Result >>= m_nDocRepair; + } + } + + virtual void SAL_CALL disposing(const css::lang::EventObject&) override {} +}; + +/// Test callback that works with comphelper::LibreOfficeKit::setAnyInputCallback(). +class AnyInputCallback final +{ +public: + static bool callback(void* /*pData*/) { return true; } + + AnyInputCallback() { comphelper::LibreOfficeKit::setAnyInputCallback(&callback, this); } + + ~AnyInputCallback() { comphelper::LibreOfficeKit::setAnyInputCallback(nullptr, nullptr); } +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/uiwriter/data/IndexElementsInHiddenSections.fodt b/sw/qa/extras/uiwriter/data/IndexElementsInHiddenSections.fodt new file mode 100644 index 000000000000..5fb3d809404f --- /dev/null +++ b/sw/qa/extras/uiwriter/data/IndexElementsInHiddenSections.fodt @@ -0,0 +1,63 @@ + + + + + + + + + + + Table of Contents + + + + + + + + + + + + + + + Section Visible + foo + + + + + + + + + Section Hidden + bar + + A level-1 entry + + CustomTOCStyle paragraph + + + + + + + + + + Index of Tables + + + + + + + + + + + + \ No newline at end of file diff --git a/sw/qa/extras/uiwriter/data/tdf162326_list.odt b/sw/qa/extras/uiwriter/data/tdf162326_list.odt new file mode 100644 index 000000000000..324ac884337c Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf162326_list.odt differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index be9cb4d7416f..dd683c11acce 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1874,7 +1874,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf68183) // First disable RSID and check if indeed no such attribute is inserted. createSwDoc(); SwDoc* pDoc = getSwDoc(); - SW_MOD()->GetModuleConfig()->SetStoreRsid(false); + SwModule* mod = SwModule::get(); + mod->GetModuleConfig()->SetStoreRsid(false); SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); pWrtShell->Insert2(u"X"_ustr); @@ -1884,7 +1885,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf68183) CPPUNIT_ASSERT_EQUAL(false, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID)); // Then enable storing of RSID and make sure that the attribute is inserted. - SW_MOD()->GetModuleConfig()->SetStoreRsid(true); + mod->GetModuleConfig()->SetStoreRsid(true); pWrtShell->DelToStartOfLine(); pWrtShell->Insert2(u"X"_ustr); diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx b/sw/qa/extras/uiwriter/uiwriter9.cxx index 2be321ebb14d..66ef51e47102 100644 --- a/sw/qa/extras/uiwriter/uiwriter9.cxx +++ b/sw/qa/extras/uiwriter/uiwriter9.cxx @@ -744,7 +744,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf144752) CPPUNIT_ASSERT_EQUAL(u"Word"_ustr, pWrtShell->GetSelText()); } -CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162326_Pargraph) +CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162326_Paragraph) { createSwDoc("tdf162326.odt"); SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); @@ -800,6 +800,32 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162326_Character) CPPUNIT_ASSERT_EQUAL(short(1), getProperty(getRun(getParagraph(3), 2), u"CharUnderline"_ustr)); } + +CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162326_List) +{ + createSwDoc("tdf162326_list.odt"); + uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); + uno::Reference xParaCursor(xTextDocument->getText()->createTextCursor(), + uno::UNO_QUERY); + + CPPUNIT_ASSERT_EQUAL(u"A)"_ustr, getProperty(xParaCursor, u"ListLabelString"_ustr)); + + dispatchCommand(mxComponent, u".uno:StyleApply"_ustr, + { comphelper::makePropertyValue(u"FamilyName"_ustr, u"ParagraphStyles"_ustr), + comphelper::makePropertyValue(u"Style"_ustr, u"Footnote"_ustr) }); + + //hard list attribute unchanged + CPPUNIT_ASSERT_EQUAL(u"A)"_ustr, getProperty(xParaCursor, u"ListLabelString"_ustr)); + + dispatchCommand(mxComponent, u".uno:StyleApply"_ustr, + { comphelper::makePropertyValue(u"FamilyName"_ustr, u"ParagraphStyles"_ustr), + comphelper::makePropertyValue(u"Style"_ustr, u"Footnote"_ustr), + comphelper::makePropertyValue(u"KeyModifier"_ustr, uno::Any(KEY_MOD1)) }); + + //list replaced by para style list setting + CPPUNIT_ASSERT_EQUAL(u"1."_ustr, getProperty(xParaCursor, u"ListLabelString"_ustr)); +} + CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf163340) { createSwDoc("tdf163340.odt"); @@ -852,6 +878,49 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf159023) CPPUNIT_ASSERT(pWrtShell->IsCursorInFootnote()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162195) +{ + // Given a document, which has some index entries in a hidden section + createSwDoc("IndexElementsInHiddenSections.fodt"); + + auto xIndexSupplier(mxComponent.queryThrow()); + auto xIndexes = xIndexSupplier->getDocumentIndexes(); + CPPUNIT_ASSERT(xIndexes); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexes->getCount()); // A ToC and a table index + + auto xToC(xIndexes->getByIndex(0).queryThrow()); + xToC->update(); + // Without the fix, all the elements from the hidden section appeared in the index + CPPUNIT_ASSERT_EQUAL(u"Table of Contents" SAL_NEWLINE_STRING "Section Visible\t1"_ustr, + xToC->getAnchor()->getString()); + + auto xTables(xIndexes->getByIndex(1).queryThrow()); + xTables->update(); + // Without the fix, all the elements from the hidden section appeared in the index + CPPUNIT_ASSERT_EQUAL(u"Index of Tables" SAL_NEWLINE_STRING "Table1\t1"_ustr, + xTables->getAnchor()->getString()); + + // Show the hidden section + auto xTextSectionsSupplier = mxComponent.queryThrow(); + auto xSections = xTextSectionsSupplier->getTextSections(); + CPPUNIT_ASSERT(xSections); + auto xSection + = xSections->getByName(u"Section Hidden"_ustr).queryThrow(); + xSection->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(true)); + + xToC->update(); + CPPUNIT_ASSERT_EQUAL(u"Table of Contents" SAL_NEWLINE_STRING + "Section Visible\t1" SAL_NEWLINE_STRING + "Section Hidden\t1" SAL_NEWLINE_STRING "entry\t1" SAL_NEWLINE_STRING + "CustomTOCStyle paragraph\t1"_ustr, + xToC->getAnchor()->getString()); + + xTables->update(); + CPPUNIT_ASSERT_EQUAL(u"Index of Tables" SAL_NEWLINE_STRING "Table1\t1" SAL_NEWLINE_STRING + "Table2\t1"_ustr, + xTables->getAnchor()->getString()); +} + } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/unowriter/data/section-table.fodt b/sw/qa/extras/unowriter/data/section-table.fodt new file mode 100644 index 000000000000..4f46ac086c91 --- /dev/null +++ b/sw/qa/extras/unowriter/data/section-table.fodt @@ -0,0 +1,162 @@ + + + GCC2024-11-25T12:23:18.3609789502024-11-25T12:24:38.999591414GCCPT1M22S1LibreOfficeDev/25.2.0.0.alpha0$Linux_X86_64 LibreOffice_project/10f916791e49306b51a6a299739b130fc2129de1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Table in section + + + + + + + + + + + + + + + + Outside section + + + \ No newline at end of file diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx index 75f034a73773..51bd211a0a87 100644 --- a/sw/qa/extras/unowriter/unowriter.cxx +++ b/sw/qa/extras/unowriter/unowriter.cxx @@ -562,6 +562,37 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testSectionAnchorCopyTable) xCursor->getString()); } +CPPUNIT_TEST_FIXTURE(SwUnoWriter, testSectionAnchorProperties) +{ + createSwDoc("section-table.fodt"); + + uno::Reference const xTextSectionsSupplier(mxComponent, + uno::UNO_QUERY); + uno::Reference const xSections( + xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount()); + + uno::Reference const xSection(xSections->getByIndex(0), uno::UNO_QUERY); + uno::Reference const xAnchor(xSection->getAnchor()); + uno::Reference const xAnchorProp(xAnchor, uno::UNO_QUERY); + + // the problem was that the property set didn't work + auto xSecFromProp = getProperty>(xAnchorProp, "TextSection"); + CPPUNIT_ASSERT_EQUAL(xSection, xSecFromProp); + + xAnchorProp->setPropertyValue("CharHeight", uno::Any(float(64))); + CPPUNIT_ASSERT_EQUAL(float(64), getProperty(xAnchorProp, "CharHeight")); + uno::Reference const xAnchorState(xAnchor, uno::UNO_QUERY); + // TODO: why does this return DEFAULT_VALUE instead of DIRECT_VALUE? + CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, + xAnchorState->getPropertyState("CharHeight")); + CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, + xAnchorState->getPropertyStates({ "CharHeight" })[0]); + CPPUNIT_ASSERT_EQUAL(float(12), xAnchorState->getPropertyDefault("CharHeight").get()); + xAnchorState->setPropertyToDefault("CharHeight"); + CPPUNIT_ASSERT_EQUAL(float(12), getProperty(xAnchorProp, "CharHeight")); +} + CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTextRangeInTable) { createSwDoc("bookmarkintable.fodt"); diff --git a/sw/qa/extras/ww8export/data/tdf41542_imagePadding.odt b/sw/qa/extras/ww8export/data/tdf41542_imagePadding.odt index 019e19f247e1..8468e110195f 100644 Binary files a/sw/qa/extras/ww8export/data/tdf41542_imagePadding.odt and b/sw/qa/extras/ww8export/data/tdf41542_imagePadding.odt differ diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 9ac1e8321bef..acfc4b674bc5 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -995,6 +996,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf41542_imagePadding) CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Top ); CPPUNIT_ASSERT_EQUAL( crop.Right, crop.Bottom ); CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Right ); + + // tdf#147819 - page background should not be forced to white color + const SwFrameFormat &rFormat = getSwDoc()->GetPageDesc(0).GetMaster(); + CPPUNIT_ASSERT(!rFormat.GetItemIfSet(RES_BACKGROUND)); } DECLARE_WW8EXPORT_TEST(testFdo77454, "fdo77454.doc") @@ -1503,7 +1508,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf94386) SfxItemSet aSet(pWrtShell->GetView().GetCurShell()->GetPool(), svl::Items); aSet.Put(SwEnvItem()); SfxRequest aRequest(FN_ENVELOP, SfxCallMode::SYNCHRON, aSet); - SW_MOD()->ExecOther(aRequest); + SwModule::get()->ExecOther(aRequest); } saveAndReload(u"MS Word 97"_ustr); diff --git a/sw/qa/uibase/uiview/uiview.cxx b/sw/qa/uibase/uiview/uiview.cxx index a7453f0b8f6e..486219215581 100644 --- a/sw/qa/uibase/uiview/uiview.cxx +++ b/sw/qa/uibase/uiview/uiview.cxx @@ -124,7 +124,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testKeepRatio) comphelper::ScopeGuard g([pWrtShell, pViewOption] { SwViewOption aViewOption(*pViewOption); aViewOption.SetKeepRatio(false); - SW_MOD()->ApplyUsrPref(aViewOption, &pWrtShell->GetView()); + SwModule::get()->ApplyUsrPref(aViewOption, &pWrtShell->GetView()); }); // Without the accompanying fix in place, this test would have failed, because KeepRatio was not // mapped to settings.xml @@ -314,13 +314,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, TestTdf152839_Formtext) createSwDoc("tdf152839_formtext.rtf"); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); - sal_Int32 nBottom - = getXPath(pXmlDoc, "/root/page[1]/body/tab[1]/row[2]/cell[1]/infos/bounds", "bottom") - .toInt32(); sal_Int32 nHeight = getXPath(pXmlDoc, "/root/page[1]/body/tab[1]/row[2]/cell[1]/txt/infos/bounds", "height") .toInt32(); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2308), nBottom); CPPUNIT_ASSERT_EQUAL(sal_Int32(723), nHeight); } diff --git a/sw/qa/uitest/data/tdf164074.fodt b/sw/qa/uitest/data/tdf164074.fodt new file mode 100644 index 000000000000..be9f064d77c0 --- /dev/null +++ b/sw/qa/uitest/data/tdf164074.fodt @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1. H1 + 1.1. H2 + 1.1.1. H3 + + + 1.1.1.1. Lorem + + ipsum dolor sit amet, consectetur adipiscing elit. + + + 1.1.1.1.1. Vestibulum + + consequat mi quis pretium semper. + + + 1.1.1.1.2. Integer + + sodales tincidunt tristique. + + + 1.1.1.2. Aliquam + + velit massa, laoreet vel leo nec, volutpat facilisis eros. + + + 1.1.1.2.1. Donec + + consequat arcu ut diam tempor luctus. + + + 1.1.1.2.2. Praesent + + vitae lacus vel leo sodales pharetra a a nibh. + 1.1.2. H3 + + + 1.1.2.1. Lorem + + ipsum dolor sit amet, consectetur adipiscing elit. + + + 1.1.2.1.1. Vestibulum + + consequat mi quis pretium semper. + + + 1.1.2.1.2. Integer + + sodales tincidunt tristique. + + + 1.1.2.2. Aliquam + + velit massa, laoreet vel leo nec, volutpat facilisis eros. + + + 1.1.2.2.1. Donec + + consequat arcu ut diam tempor luctus. + + + 1.1.2.2.2. Praesent + + vitae lacus vel leo sodales pharetra a a nibh. + 2. H1 + 2.1. H2 + 2.1.1. H3 + + + 2.1.1.1. Lorem + + ipsum dolor sit amet, consectetur adipiscing elit. + + + 2.1.1.1.1. Vestibulum + + consequat mi quis pretium semper. + + + 2.1.1.1.2. Integer + + sodales tincidunt tristique. + + + 2.1.1.2. Aliquam + + velit massa, laoreet vel leo nec, volutpat facilisis eros. + + + 2.1.1.2.1. Donec + + consequat arcu ut diam tempor luctus. + + + 2.1.1.2.2. Praesent + + vitae lacus vel leo sodales pharetra a a nibh. + + + diff --git a/sw/qa/uitest/navigator/movechapterupdown.py b/sw/qa/uitest/navigator/movechapterupdown.py index d90400ef89b8..c6b6589f7093 100644 --- a/sw/qa/uitest/navigator/movechapterupdown.py +++ b/sw/qa/uitest/navigator/movechapterupdown.py @@ -501,4 +501,309 @@ class movechapterupdown(UITestCase): self.xUITest.executeCommand('.uno:Sidebar') + def test_tdf164074(self): + + with self.ui_test.load_file(get_url_for_data_file('tdf164074.fodt')): + xWriterDoc = self.xUITest.getTopFocusWindow() + xWriterEdit = xWriterDoc.getChild('writer_edit') + + self.xUITest.executeCommand('.uno:Sidebar') + xWriterEdit.executeAction('SIDEBAR', mkPropertyValues({'PANEL': 'SwNavigatorPanel'})) + + # wait until the navigator panel is available + xNavigatorPanel = self.ui_test.wait_until_child_is_available('NavigatorPanel') + + # See the `m_aUpdateTimer.SetTimeout(200)` (to "avoid flickering of buttons") + # in the SwChildWinWrapper ctor in sw/source/uibase/fldui/fldwrap.cxx, where that + # m_aUpdateTimer is started by SwChildWinWrapper::ReInitDlg triggered from the + # xInsert click above. + xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit') + xToolkit.waitUntilAllIdlesDispatched() + + # Given the document chapter structure: + # 1. One H1 + # 1.1. one_A (H2) + # 1.2. one_B (H2) + # 2. Two (H1) + # A heading of level 3 + # 2.1. Two_A (H2) + # 2.1. Two_B (H2) + # 3. Three (H1) + # 3.1. Three_A (H2) + # 3.2. Three_B (H2) + + xNavigatorPanelContentTree = xNavigatorPanel.getChild("contenttree") + + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + xNavigatorPanelContentTreeHeadings.executeAction("EXPAND", tuple()) + + # + # test a level 1 chapter move up then move down + # + + # Double click on the "2. Two (H1)" entry to select and set focus + xHeadingsChild1 = xNavigatorPanelContentTreeHeadings.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild1)["Text"], "2. H1") + xHeadingsChild1.executeAction("DOUBLECLICK", tuple()) + + self.ui_test.wait_until_property_is_updated(xNavigatorPanelContentTree, "SelectEntryText", "2. H1") + + # Click on the 'Move chapter up' button in the Navigator tool box + xNavigatorPanel = xWriterEdit.getChild("NavigatorPanel") + xToolBar = xNavigatorPanel.getChild("HeadingsContentFunctionButtonsToolbar") + xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "2"})) + + # Expected chapter order: + # 2. H1 + # 2.1. H2 + # 2.1.1. H3 + # 2.1.1.1. Lorem + # 2.1.1.1.1. Vestibulum + # 2.1.1.1.2. Integer + # 2.1.1.2. Aliquam + + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0)["Text"], "2. H1") + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0)["Text"], "2.1. H2") + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0)["Text"], "2.1.1. H3") + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "2.1.1.1. Lorem") + xHeadingsChild0Child0Child0Child0Child0 = xHeadingsChild0Child0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child0)["Text"], "2.1.1.1.1. Vestibulum") + xHeadingsChild0Child0Child0Child0Child1 = xHeadingsChild0Child0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child1)["Text"], "2.1.1.1.2. Integer") + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "2.1.1.2. Aliquam") + + # Click on the 'Move chapter down' button in the Navigator tool box + xNavigatorPanel = xWriterEdit.getChild("NavigatorPanel") + xToolBar = xNavigatorPanel.getChild("HeadingsContentFunctionButtonsToolbar") + xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "3"})) + + # Expected chapter order is the original order + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0)["Text"], "1. H1") + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0)["Text"], "1.1. H2") + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0)["Text"], "1.1.1. H3") + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "1.1.1.1. Lorem") + xHeadingsChild0Child0Child0Child0Child0 = xHeadingsChild0Child0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child0)["Text"], "1.1.1.1.1. Vestibulum") + xHeadingsChild0Child0Child0Child0Child1 = xHeadingsChild0Child0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child1)["Text"], "1.1.1.1.2. Integer") + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "1.1.1.2. Aliquam") + + # + # test moving a sub chapter out of and then back into its parent + # + + # Double click on the "1.1.2. (H3)" entry to select and set focus + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + xHeadingsChild0Child0Child1 = xHeadingsChild0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child1)["Text"], "1.1.2. H3") + xHeadingsChild0Child0Child1.executeAction("DOUBLECLICK", tuple()) + + self.ui_test.wait_until_property_is_updated(xNavigatorPanelContentTree, "SelectEntryText", "1.1.2. H3") + + # Click on the 'Move chapter up' button in the Navigator tool box + xNavigatorPanel = xWriterEdit.getChild("NavigatorPanel") + xToolBar = xNavigatorPanel.getChild("HeadingsContentFunctionButtonsToolbar") + xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "2"})) + + # Expected chapter order: + # 1. H1 + # 1.1. H2 + # 1.1.2. H3 <---- + # 1.1.2.1. Lorem + # 1.1.2.1.1. Vestibulum + # 1.1.2.1.2. Integer + # 1.1.2.2. Aliquam + # 1.1.2.2.1. Donec + # 1.1.2.2.2. Praesent + # 1.1.1. H3 + + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0)["Text"], "1. H1") + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0)["Text"], "1.1. H2") + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0)["Text"], "1.1.2. H3") + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "1.1.2.1. Lorem") + xHeadingsChild0Child0Child0Child0Child0 = xHeadingsChild0Child0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child0)["Text"], "1.1.2.1.1. Vestibulum") + xHeadingsChild0Child0Child0Child0Child1 = xHeadingsChild0Child0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child1)["Text"], "1.1.2.1.2. Integer") + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "1.1.2.2. Aliquam") + xHeadingsChild0Child0Child0Child1Child0 = xHeadingsChild0Child0Child0Child1.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child0)["Text"], "1.1.2.2.1. Donec") + xHeadingsChild0Child0Child0Child1Child1 = xHeadingsChild0Child0Child0Child1.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child1)["Text"], "1.1.2.2.2. Praesent") + xHeadingsChild0Child0Child1 = xHeadingsChild0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child1)["Text"], "1.1.1. H3") + + # Click on the 'Move chapter down' button in the Navigator tool box + xNavigatorPanel = xWriterEdit.getChild("NavigatorPanel") + xToolBar = xNavigatorPanel.getChild("HeadingsContentFunctionButtonsToolbar") + xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "3"})) + + # Expected chapter order is the original order + # 1. H1 + # 1.1. H2 + # 1.1.1. H3 + # 1.1.1.1. Lorem + # 1.1.1.1.1. Vestibulum + # 1.1.1.1.2. Integer + # 1.1.1.2. Aliquam + # 1.1.1.2.1. Donec + # 1.1.1.2.2. Praesent + # 1.1.2. H3 + + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0)["Text"], "1. H1") + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0)["Text"], "1.1. H2") + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0)["Text"], "1.1.1. H3") + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "1.1.1.1. Lorem") + xHeadingsChild0Child0Child0Child0Child0 = xHeadingsChild0Child0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child0)["Text"], "1.1.1.1.1. Vestibulum") + xHeadingsChild0Child0Child0Child0Child1 = xHeadingsChild0Child0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child1)["Text"], "1.1.1.1.2. Integer") + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "1.1.1.2. Aliquam") + xHeadingsChild0Child0Child0Child1Child0 = xHeadingsChild0Child0Child0Child1.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child0)["Text"], "1.1.1.2.1. Donec") + xHeadingsChild0Child0Child0Child1Child1 = xHeadingsChild0Child0Child0Child1.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child1)["Text"], "1.1.1.2.2. Praesent") + xHeadingsChild0Child0Child1 = xHeadingsChild0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child1)["Text"], "1.1.2. H3") + + # + # test moving a sub chapter out of and then back into its parent + # + + # Double click on the "1.1.2. (H3)" entry to select and set focus + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "1.1.1.2. Aliquam") + xHeadingsChild0Child0Child0Child1.executeAction("DOUBLECLICK", tuple()) + + self.ui_test.wait_until_property_is_updated(xNavigatorPanelContentTree, "SelectEntryText", "1.1.1.2. Aliquam") + + # Click on the 'Move chapter up' button in the Navigator tool box + xNavigatorPanel = xWriterEdit.getChild("NavigatorPanel") + xToolBar = xNavigatorPanel.getChild("HeadingsContentFunctionButtonsToolbar") + xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "2"})) + + # Expected chapter order: + # 1. H1 + # 1.1. H2 + # 1.1.1. H3 + # 1.1.1.2. Aliquam <--- + # 1.1.1.2.1. Donec + # 1.1.1.2.2. Praesent + # 1.1.1.1. Lorem + # 1.1.1.1.1. Vestibulum + # 1.1.1.1.2. Integer + # 1.1.2. H3 + + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0)["Text"], "1. H1") + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0)["Text"], "1.1. H2") + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0)["Text"], "1.1.1. H3") + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "1.1.1.2. Aliquam") + xHeadingsChild0Child0Child0Child0Child0 = xHeadingsChild0Child0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child0)["Text"], "1.1.1.2.1. Donec") + xHeadingsChild0Child0Child0Child0Child1 = xHeadingsChild0Child0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child1)["Text"], "1.1.1.2.2. Praesent") + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "1.1.1.1. Lorem") + xHeadingsChild0Child0Child0Child1Child0 = xHeadingsChild0Child0Child0Child1.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child0)["Text"], "1.1.1.1.1. Vestibulum") + xHeadingsChild0Child0Child0Child1Child1 = xHeadingsChild0Child0Child0Child1.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child1)["Text"], "1.1.1.1.2. Integer") + xHeadingsChild0Child0Child1 = xHeadingsChild0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child1)["Text"], "1.1.2. H3") + + # Double click on the "1.1.1.2. Aliquam" entry to select and set focus + # FIXME: restore focus to avoid this + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "1.1.1.2. Aliquam") + xHeadingsChild0Child0Child0Child0.executeAction("DOUBLECLICK", tuple()) + + self.ui_test.wait_until_property_is_updated(xNavigatorPanelContentTree, "SelectEntryText", "1.1.1.2. Aliquam") + + # Click on the 'Move chapter down' button in the Navigator tool box + xNavigatorPanel = xWriterEdit.getChild("NavigatorPanel") + xToolBar = xNavigatorPanel.getChild("HeadingsContentFunctionButtonsToolbar") + xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "3"})) + + # Expected chapter order is the original order + # 1. H1 + # 1.1. H2 + # 1.1.1. H3 + # 1.1.1.1. Lorem + # 1.1.1.1.1. Vestibulum + # 1.1.1.1.2. Integer + # 1.1.1.2. Aliquam + # 1.1.1.2.1. Donec + # 1.1.1.2.2. Praesent + # 1.1.2. H3 + + xNavigatorPanelContentTreeHeadings = xNavigatorPanelContentTree.getChild('0') + + xHeadingsChild0 = xNavigatorPanelContentTreeHeadings.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0)["Text"], "1. H1") + xHeadingsChild0Child0 = xHeadingsChild0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0)["Text"], "1.1. H2") + xHeadingsChild0Child0Child0 = xHeadingsChild0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0)["Text"], "1.1.1. H3") + xHeadingsChild0Child0Child0Child0 = xHeadingsChild0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0)["Text"], "1.1.1.1. Lorem") + xHeadingsChild0Child0Child0Child0Child0 = xHeadingsChild0Child0Child0Child0.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child0)["Text"], "1.1.1.1.1. Vestibulum") + xHeadingsChild0Child0Child0Child0Child1 = xHeadingsChild0Child0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child0Child1)["Text"], "1.1.1.1.2. Integer") + xHeadingsChild0Child0Child0Child1 = xHeadingsChild0Child0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1)["Text"], "1.1.1.2. Aliquam") + xHeadingsChild0Child0Child0Child1Child0 = xHeadingsChild0Child0Child0Child1.getChild('0') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child0)["Text"], "1.1.1.2.1. Donec") + xHeadingsChild0Child0Child0Child1Child1 = xHeadingsChild0Child0Child0Child1.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child0Child1Child1)["Text"], "1.1.1.2.2. Praesent") + xHeadingsChild0Child0Child1 = xHeadingsChild0Child0.getChild('1') + self.assertEqual(get_state_as_dict(xHeadingsChild0Child0Child1)["Text"], "1.1.2. H3") + + self.xUITest.executeCommand('.uno:Sidebar') + + + # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/options/tdf78133.py b/sw/qa/uitest/options/tdf78133.py index d1d504523a90..3c650cad8401 100644 --- a/sw/qa/uitest/options/tdf78133.py +++ b/sw/qa/uitest/options/tdf78133.py @@ -27,8 +27,8 @@ class tdf78133(UITestCase): xLoAppColorsEntry = xLOEntry.getChild('8') xLoAppColorsEntry.executeAction("SELECT", tuple()) #Applications Colors #change text boundaries checkbox, save - docboundaries = xDialog.getChild("docboundaries") - docboundaries.executeAction("CLICK", tuple()) + shadows = xDialog.getChild("shadows") + shadows.executeAction("CLICK", tuple()) #verify - reopen dialog and check if "text boundaries" is still unchecked with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog: @@ -38,7 +38,7 @@ class tdf78133(UITestCase): xLoAppColorsEntry = xLOEntry.getChild('8') xLoAppColorsEntry.executeAction("SELECT", tuple()) #Applications Colors #change text boundaries checkbox, save - docboundaries = xDialog.getChild("docboundaries") - self.assertEqual(get_state_as_dict(docboundaries)["Selected"], "false") + shadows = xDialog.getChild("shadows") + self.assertEqual(get_state_as_dict(shadows)["Selected"], "false") # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests3/goToPage.py b/sw/qa/uitest/writer_tests3/goToPage.py index 812402f89c57..ec0b1d0f2ea1 100644 --- a/sw/qa/uitest/writer_tests3/goToPage.py +++ b/sw/qa/uitest/writer_tests3/goToPage.py @@ -26,7 +26,7 @@ class GoToPage_dialog(UITestCase): with self.ui_test.execute_dialog_through_command(".uno:GotoPage") as xDialog: xPageText = xDialog.getChild("page") - xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"3a"})) + xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"3"})) self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3") @@ -36,4 +36,4 @@ class GoToPage_dialog(UITestCase): self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3") -# vim: set shiftwidth=4 softtabstop=4 expandtab: \ No newline at end of file +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index 1ec913474a44..ba6ae5f6775d 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -889,6 +889,12 @@ interface BaseTextEditView StateMethod = StateViewOptions ; ] + FN_VIEW_BOUNDARIES // status() + [ + ExecMethod = ExecViewOptions ; + StateMethod = StateViewOptions ; + ] + FN_VIEW_GRAPHIC // status() [ ExecMethod = ExecViewOptions ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 0bc5e6e58952..caa91ab74f94 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -6366,7 +6366,7 @@ SfxVoidItem SynchronizeLabelsDlg FN_SYNC_LABELS GroupId = SfxGroupId::Edit; ] -SfxBoolItem TableBoundaries FN_VIEW_TABLEGRID +SfxBoolItem TableBoundaries FN_VIEW_TABLEGRID // deprecated 25.2 [ AutoUpdate = FALSE, @@ -6376,7 +6376,21 @@ SfxBoolItem TableBoundaries FN_VIEW_TABLEGRID Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] +SfxBoolItem ShowBoundaries FN_VIEW_BOUNDARIES +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; AccelConfig = TRUE, MenuConfig = TRUE, @@ -6785,8 +6799,7 @@ SfxVoidItem UpdateInputFields FN_UPDATE_INPUTFIELDS GroupId = SfxGroupId::Edit; ] -SfxBoolItem ViewBounds FN_VIEW_BOUNDS - +SfxBoolItem ViewBounds FN_VIEW_BOUNDS // deprecated 25.2 [ AutoUpdate = FALSE, FastCall = FALSE, @@ -6797,14 +6810,13 @@ SfxBoolItem ViewBounds FN_VIEW_BOUNDS RecordPerSet; - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = SfxGroupId::View; ] -SfxBoolItem SectionBoundaries FN_VIEW_SECTION_BOUNDARIES - +SfxBoolItem SectionBoundaries FN_VIEW_SECTION_BOUNDARIES // deprecated 25.2 [ AutoUpdate = FALSE, FastCall = FALSE, @@ -6815,9 +6827,9 @@ SfxBoolItem SectionBoundaries FN_VIEW_SECTION_BOUNDARIES RecordPerSet; - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = SfxGroupId::View; ] diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 8bad1e5c5f06..e2d4bea133e0 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -714,7 +714,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() { SolarMutexGuard aGuard; - return sal_Int32(SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor); + return sal_Int32(SwModule::get()->GetColorConfig().GetColorValue(::svtools::DOCCOLOR).nColor); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 57743ad19cdc..09ca10c3265d 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1837,7 +1837,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, if ( pRedline ) { - const SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pOpt = SwModule::get()->GetModuleConfig(); AuthorCharAttr aChangeAttr; if ( pOpt ) { diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 26ea024c511c..5512e4259651 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -271,7 +271,7 @@ SwCalc::SwCalc( SwDoc& rD ) for( n = 0; n < 4; ++n ) lcl_GetCalcExp(m_aVarTable, sNTypeTab[n + 7]).nValue.PutLong( rDocStat.*aDocStat2[ n ] ); - SvtUserOptions& rUserOptions = SW_MOD()->GetUserOptions(); + SvtUserOptions& rUserOptions = SwModule::get()->GetUserOptions(); lcl_GetCalcExp(m_aVarTable, sNTypeTab[11]).nValue.PutString( rUserOptions.GetFirstName() ); lcl_GetCalcExp(m_aVarTable, sNTypeTab[12]).nValue.PutString( rUserOptions.GetLastName() ); diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index c823eccd94e6..da24bbaf4d5e 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -336,7 +336,7 @@ ItemInfoPackage& getItemInfoPackageSwAttributes() { RES_TXTATR_METAFIELD, SwFormatMeta::CreatePoolDefault(RES_TXTATR_METAFIELD), 0, SFX_ITEMINFOFLAG_NONE }, { RES_TXTATR_AUTOFMT, new SwFormatAutoFormat, 0, SFX_ITEMINFOFLAG_NONE }, - // We cannot yet create the SwFormatINetFormat, that would crash since SW_MOD + // We cannot yet create the SwFormatINetFormat, that would crash since SwModule::get // is not initialized and the translated resource strings would not be available. // Luckily this mechanism allows to also flag this ItemInfo as 'incomplete' using // a nullptr as ItemPtr and implementing on-demand creation, see ::getItemInfo diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index fc7aac7814d4..ca2c9c371222 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1364,8 +1364,9 @@ SwOutlineNodes::size_type SwCursorShell::GetOutlinePos(sal_uInt8 nLevel, SwPaM* } void SwCursorShell::MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineNodes::size_type nEndPos, - bool bWithChildren , bool bKillPams) + bool bWithChildren , bool bKillPams, SwOutlineNodesInline* pOutlNdsInline) { + SwOutlineNodesInline::size_type nEndPosInline = SwOutlineNodesInline::npos; const SwNodes& rNds = GetDoc()->GetNodes(); const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds(); if( rOutlNds.empty() ) @@ -1383,7 +1384,7 @@ void SwCursorShell::MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineN SwNode* pSttNd = rOutlNds[ nSttPos ]; SwNode* pEndNd = rOutlNds[ nEndPos ]; - if( bWithChildren ) + if( bWithChildren && !pOutlNdsInline ) { const int nLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1; for( ++nEndPos; nEndPos < rOutlNds.size(); ++nEndPos ) @@ -1394,11 +1395,33 @@ void SwCursorShell::MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineN break; // EndPos is now on the next one } } - // if without children then set onto next one - else if( ++nEndPos < rOutlNds.size() ) - pEndNd = rOutlNds[ nEndPos ]; + // headings in flys + else if( bWithChildren && pOutlNdsInline ) + { + const int nLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel() - 1; + pSttNd = const_cast(SwOutlineNodes::GetRootNode(pSttNd)); - if( nEndPos == rOutlNds.size() ) // no end found + pOutlNdsInline->Seek_Entry( pEndNd, &nEndPosInline ); + + for( ++nEndPosInline; nEndPosInline < pOutlNdsInline->size(); ++nEndPosInline ) + { + pEndNd = (*pOutlNdsInline)[ nEndPosInline ]; + const int nNxtLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1; + if( nNxtLevel <= nLevel ) + break; // EndPos is now on the next one + } + // set anchor node of the fly node + if ( nEndPosInline < pOutlNdsInline->size() ) + pEndNd = const_cast(SwOutlineNodes::GetRootNode(pEndNd)); + } + // if without children then set onto next one + else if( !pOutlNdsInline && ++nEndPos < rOutlNds.size() ) + pEndNd = rOutlNds[ nEndPos ]; + else if( pOutlNdsInline && ++nEndPosInline < pOutlNdsInline->size() ) + pEndNd = const_cast(SwOutlineNodes::GetRootNode((*pOutlNdsInline)[nEndPosInline])); + + if( ( pOutlNdsInline && nEndPosInline == pOutlNdsInline->size() ) || + ( !pOutlNdsInline && nEndPos == rOutlNds.size() ) ) // no end found pEndNd = &rNds.GetEndOfContent(); if( bKillPams ) @@ -2015,7 +2038,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, { SwCallLink aLk( *this ); // watch Cursor-Moves SwCursorSaveState aSaveState( *m_pCurrentCursor ); - *m_pCurrentCursor->GetPoint() = aPos; + *m_pCurrentCursor->GetPoint() = std::move(aPos); if( m_pCurrentCursor->IsSelOvr( SwCursorSelOverFlags::CheckNodeSection | SwCursorSelOverFlags::Toggle) ) bRet = false; diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index 516a89800b27..0c48cdc1db05 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -348,9 +348,9 @@ bool DocumentDrawModelManager::Search(const SwPaM& rPaM, const SvxSearchItem& rS return false; OutlinerView* pOutlinerView = pSdrView->GetTextEditOutlinerView(); if (!rSearchItem.GetBackward()) - pOutlinerView->SetSelection(ESelection(0, 0, 0, 0)); + pOutlinerView->SetSelection(ESelection(0, 0)); else - pOutlinerView->SetSelection(ESelection(EE_PARA_MAX_COUNT, EE_TEXTPOS_MAX_COUNT, EE_PARA_MAX_COUNT, EE_TEXTPOS_MAX_COUNT)); + pOutlinerView->SetSelection(ESelection::AtEnd()); pOutlinerView->StartSearchAndReplace(rSearchItem); return true; } diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index b6f2ba079fbf..82e128f0fd95 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -3850,13 +3850,13 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin // Create a new author if necessary std::size_t DocumentRedlineManager::GetRedlineAuthor() { - return SW_MOD()->GetRedlineAuthor(); + return SwModule::get()->GetRedlineAuthor(); } /// Insert new author into the Table for the Readers etc. std::size_t DocumentRedlineManager::InsertRedlineAuthor( const OUString& rNew ) { - return SW_MOD()->InsertRedlineAuthor(rNew); + return SwModule::get()->InsertRedlineAuthor(rNew); } void DocumentRedlineManager::UpdateRedlineAttr() diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index 2d9e2c389724..2f9d4f840d90 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -670,7 +670,7 @@ sal_uInt16 sw::DocumentSettingManager::getLinkUpdateMode( /*[in]*/bool bGlobalSe { sal_uInt16 nRet = mnLinkUpdMode; if( bGlobalSettings && GLOBALSETTING == nRet ) - nRet = SW_MOD()->GetLinkUpdMode(); + nRet = SwModule::get()->GetLinkUpdMode(); return nRet; } @@ -683,7 +683,7 @@ SwFieldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool { SwFieldUpdateFlags eRet = meFieldUpdMode; if( bGlobalSettings && AUTOUPD_GLOBALSETTING == eRet ) - eRet = SW_MOD()->GetFieldUpdateFlags(); + eRet = SwModule::get()->GetFieldUpdateFlags(); return eRet; } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 2c23d36d6c16..a7351ea9ef7a 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -2115,27 +2115,27 @@ bool SwDoc::ConvertFieldsToText(SwRootFrame const& rLayout) bool SwDoc::IsInsTableFormatNum() const { - return SW_MOD()->IsInsTableFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); + return SwModule::get()->IsInsTableFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); } bool SwDoc::IsInsTableChangeNumFormat() const { - return SW_MOD()->IsInsTableChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); + return SwModule::get()->IsInsTableChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); } bool SwDoc::IsInsTableAlignNum() const { - return SW_MOD()->IsInsTableAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); + return SwModule::get()->IsInsTableAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); } bool SwDoc::IsSplitVerticalByDefault() const { - return SW_MOD()->IsSplitVerticalByDefault(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); + return SwModule::get()->IsSplitVerticalByDefault(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE)); } void SwDoc::SetSplitVerticalByDefault(bool value) { - SW_MOD()->SetSplitVerticalByDefault(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE), value); + SwModule::get()->SetSplitVerticalByDefault(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE), value); } /// Set up the InsertDB as Undo table diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 17999886deb1..50aea4a5a20e 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1837,7 +1837,8 @@ tools::Long SwDoc::CompareDoc( const SwDoc& rDoc ) tools::Long nRet = 0; // Get comparison options - CmpOptions.eCmpMode = SW_MOD()->GetCompareMode(); + SwModule* mod = SwModule::get(); + CmpOptions.eCmpMode = mod->GetCompareMode(); if( CmpOptions.eCmpMode == SwCompareMode::Auto ) { if( getRsidRoot() == rDoc.getRsidRoot() ) @@ -1855,8 +1856,8 @@ tools::Long SwDoc::CompareDoc( const SwDoc& rDoc ) } else { - CmpOptions.bUseRsid = getRsidRoot() == rDoc.getRsidRoot() && SW_MOD()->IsUseRsid(); - CmpOptions.nIgnoreLen = SW_MOD()->IsIgnorePieces() ? SW_MOD()->GetPieceLen() : 0; + CmpOptions.bUseRsid = getRsidRoot() == rDoc.getRsidRoot() && mod->IsUseRsid(); + CmpOptions.nIgnoreLen = mod->IsIgnorePieces() ? mod->GetPieceLen() : 0; } GetIDocumentUndoRedo().StartUndo(SwUndoId::EMPTY, nullptr); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index c5dc09a64f3b..bf1d9d3679e6 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -428,7 +428,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) if( pOldTextNd == rPam.GetBound().GetContentNode() ) rPam.GetBound() = aAlphaPos; if( pOldTextNd == rPam.GetBound( false ).GetContentNode() ) - rPam.GetBound( false ) = aAlphaPos; + rPam.GetBound( false ) = std::move(aAlphaPos); } // delete the Node, at last! SwNode::Merge const eOldMergeFlag(pOldTextNd->GetRedlineMergeFlag()); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 085cdd9770f1..fe20483d963e 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -364,7 +364,8 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, ++aTmpStt; } - if( pEnd->GetContentIndex() == pEnd->GetNode().GetContentNode()->Len() ) + if (!pEnd->GetNode().IsContentNode() + || pEnd->GetContentIndex() == pEnd->GetNode().GetContentNode()->Len()) { // set up a later, and all CharFormatAttr -> TextFormatAttr ++aTmpEnd; @@ -411,7 +412,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, /// Set the rsid of the next nLen symbols of rRg to the current session number void SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen ) { - if (!SW_MOD()->GetModuleConfig()->IsStoreRsid()) + if (!SwModule::get()->GetModuleConfig()->IsStoreRsid()) return; SwTextNode *pTextNode = rRg.GetPoint()->GetNode().GetTextNode(); @@ -442,7 +443,7 @@ void SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen ) bool SwDoc::UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal ) { - if (!SW_MOD()->GetModuleConfig()->IsStoreRsid()) + if (!SwModule::get()->GetModuleConfig()->IsStoreRsid()) return false; if (!pTextNode) @@ -1017,7 +1018,7 @@ static bool lcl_SetTextFormatColl( SwNode* pNode, void* pArgs ) // #i62675# check, if paragraph style has changed if ( pPara->bResetListAttrs && - pFormat != pCNd->GetFormatColl() + (pPara->bResetAllCharAttrs || pFormat != pCNd->GetFormatColl()) && pCNd->GetTextNode()->IsInList() ) { // Check, if the list style of the paragraph will change. diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 00c6d8080286..b6fbed83c51c 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -887,7 +887,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, if( pNew ) { // #i61007# order of captions - bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst(); + bool bOrderNumberingFirst = SwModule::get()->GetModuleConfig()->IsCaptionOrderNumberingFirst(); // Work up OUString OUString aText; if( bOrderNumberingFirst ) @@ -1180,7 +1180,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable if( pNew ) { //#i61007# order of captions - bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst(); + bool bOrderNumberingFirst = SwModule::get()->GetModuleConfig()->IsCaptionOrderNumberingFirst(); // prepare string OUString aText; diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index ed1a6ab64335..81bc47a8ab47 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -53,6 +53,7 @@ #include #include #include +//#include #include #include @@ -445,7 +446,8 @@ bool SwDoc::OutlineUpDown(const SwPaM& rPam, short nOffset, } // Move up/down -bool SwDoc::MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type nOffset ) +bool SwDoc::MoveOutlinePara( const SwPaM& rPam, + SwOutlineNodes::difference_type nOffset, SwOutlineNodesInline* pOutlineNodesInline ) { // Do not move to special sections in the nodes array const SwPosition& rStt = *rPam.Start(), @@ -458,15 +460,20 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type } SwOutlineNodes::size_type nCurrentPos = 0; + SwOutlineNodesInline::size_type nCurrentPosInline = 0; SwNodeIndex aSttRg( rStt.GetNode() ), aEndRg( rEnd.GetNode() ); int nOutLineLevel = MAXLEVEL; SwNode* pSrch = &aSttRg.GetNode(); if( pSrch->IsTextNode()) - nOutLineLevel = static_cast(pSrch->GetTextNode()->GetAttrOutlineLevel()-1); + nOutLineLevel = static_cast( + pSrch->GetTextNode()->GetAttrOutlineLevel(/*bInlineHeading=*/true)-1); + SwNode* pEndSrch = &aEndRg.GetNode(); - if( !GetNodes().GetOutLineNds().Seek_Entry( pSrch, &nCurrentPos ) ) + + auto aOutlineNodes = GetNodes().GetOutLineNds(); + if( !pOutlineNodesInline && !GetNodes().GetOutLineNds().Seek_Entry( pSrch, &nCurrentPos ) ) { if( !nCurrentPos ) return false; // Promoting or demoting before the first outline => no. @@ -477,24 +484,63 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type else aSttRg = *GetNodes().GetEndOfContent().StartOfSectionNode(); } + else if ( pOutlineNodesInline ) + { + if ( !pOutlineNodesInline->Seek_Entry_By_Anchor(pSrch, &nCurrentPosInline) ) + { + if( !nCurrentPosInline ) + return false; // Promoting or demoting before the first outline => no. + if( --nCurrentPosInline ) + { + aSttRg = *SwOutlineNodes::GetRootNode((*pOutlineNodesInline)[ nCurrentPosInline ]); + } + else if( 0 > nOffset ) + return false; // Promoting at the top of document?! + else + aSttRg = *GetNodes().GetEndOfContent().StartOfSectionNode(); + } + } SwOutlineNodes::size_type nTmpPos = 0; + SwOutlineNodesInline::size_type nTmpPosInline = 0; // If the given range ends at an outlined text node we have to decide if it has to be a part of // the moving range or not. Normally it will be a sub outline of our chapter // and has to be moved, too. But if the chapter ends with a table(or a section end), // the next text node will be chosen and this could be the next outline of the same level. // The criteria has to be the outline level: sub level => incorporate, same/higher level => no. - if( GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) ) + if( !pOutlineNodesInline && GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) ) { if( !pEndSrch->IsTextNode() || pEndSrch == pSrch || nOutLineLevel < pEndSrch->GetTextNode()->GetAttrOutlineLevel()-1 ) ++nTmpPos; // For sub outlines only! } + else if ( pOutlineNodesInline ) + { + if ( pOutlineNodesInline->Seek_Entry_By_Anchor(pEndSrch, &nTmpPosInline) && ( + !pEndSrch->IsTextNode() || pEndSrch == pSrch || nOutLineLevel < + pEndSrch->GetTextNode()->GetAttrOutlineLevel(/*bInlineHeading=*/true)-1 ) ) + { + ++nTmpPosInline; + } + } - aEndRg = nTmpPos < GetNodes().GetOutLineNds().size() + if ( !pOutlineNodesInline ) + { + aEndRg = nTmpPos < GetNodes().GetOutLineNds().size() ? *GetNodes().GetOutLineNds()[ nTmpPos ] : GetNodes().GetEndOfContent(); + } + else + { + aEndRg = nTmpPosInline < pOutlineNodesInline->size() + ? *SwOutlineNodes::GetRootNode((*pOutlineNodesInline)[ nTmpPosInline ]) + : GetNodes().GetEndOfContent(); + } + if( nOffset >= 0 ) + { nCurrentPos = nTmpPos; + nCurrentPosInline = nTmpPosInline; + } if( aEndRg == aSttRg ) { OSL_FAIL( "Moving outlines: Surprising selection" ); @@ -531,7 +577,13 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type ++aEndRg; // calculation of the new position - if( nOffset < 0 && nCurrentPos < o3tl::make_unsigned(-nOffset) ) + if( pOutlineNodesInline && nOffset < 0 && nCurrentPosInline < o3tl::make_unsigned(-nOffset) ) + pNd = GetNodes().GetEndOfContent().StartOfSectionNode(); + else if( pOutlineNodesInline && nCurrentPosInline + nOffset >= pOutlineNodesInline->size() ) + pNd = &GetNodes().GetEndOfContent(); + else if ( pOutlineNodesInline ) + pNd = SwOutlineNodes::GetRootNode((*pOutlineNodesInline)[ nCurrentPosInline + nOffset ]); + else if( nOffset < 0 && nCurrentPos < o3tl::make_unsigned(-nOffset) ) pNd = GetNodes().GetEndOfContent().StartOfSectionNode(); else if( nCurrentPos + nOffset >= GetNodes().GetOutLineNds().size() ) pNd = &GetNodes().GetEndOfContent(); diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 9ccc8348a561..988ec45884f0 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -1359,7 +1359,7 @@ void SwRedlineData::dumpAsXml(xmlTextWriterPtr pWriter) const (void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this); (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("id"), BAD_CAST(OString::number(GetSeqNo()).getStr())); - (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("author"), BAD_CAST(SW_MOD()->GetRedlineAuthor(GetAuthor()).toUtf8().getStr())); + (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("author"), BAD_CAST(SwModule::get()->GetRedlineAuthor(GetAuthor()).toUtf8().getStr())); (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("date"), BAD_CAST(DateTimeToOString(GetTimeStamp()).getStr())); (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("descr"), BAD_CAST(GetDescr().toUtf8().getStr())); @@ -1572,7 +1572,7 @@ void SwRangeRedline::Show(sal_uInt16 nLoop, size_t nMyPos, bool bForced) if (pSh) bIsShowChangesInMargin = pSh->GetViewOptions()->IsShowChangesInMargin(); else - bIsShowChangesInMargin = SW_MOD()->GetUsrPref(false)->IsShowChangesInMargin(); + bIsShowChangesInMargin = SwModule::get()->GetUsrPref(false)->IsShowChangesInMargin(); } if( 1 > nLoop && !bIsShowChangesInMargin ) @@ -2268,7 +2268,7 @@ std::size_t SwRangeRedline::GetAuthor( sal_uInt16 nPos ) const OUString const & SwRangeRedline::GetAuthorString( sal_uInt16 nPos ) const { - return SW_MOD()->GetRedlineAuthor(GetRedlineData(nPos).m_nAuthor); + return SwModule::get()->GetRedlineAuthor(GetRedlineData(nPos).m_nAuthor); } sal_uInt32 SwRangeRedline::GetMovedID(sal_uInt16 nPos) const diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 48762a68203d..af9d99e54433 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -676,7 +676,6 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, const OUString& aName( rType.GetTypeName() ); const sal_Int32 nNmLen = aName.getLength(); - SwSectionFormats::size_type nNum = 0; const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) +2; std::unique_ptr pSetFlags(new sal_uInt8[ nFlagSize ]); memset( pSetFlags.get(), 0, nFlagSize ); @@ -694,8 +693,8 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, if ( rNm.startsWith(aName) ) { // Calculate number and set the Flag - nNum = o3tl::toInt32(rNm.subView( nNmLen )); - if( nNum-- && nNum < mpSectionFormatTable->size() ) + sal_Int32 nNum = o3tl::toInt32(rNm.subView(nNmLen)) - 1; + if (nNum >= 0 && o3tl::make_unsigned(nNum) < mpSectionFormatTable->size()) pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 )); } if ( bUseChkStr && sChkStr==rNm ) @@ -703,28 +702,26 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, } } - if( !bUseChkStr ) + if (bUseChkStr) + return sChkStr; + + // All Numbers have been flagged accordingly, so get the right Number + SwSectionFormats::size_type nNum = mpSectionFormatTable->size(); + for( SwSectionFormats::size_type n = 0; n < nFlagSize; ++n ) { - // All Numbers have been flagged accordingly, so get the right Number - nNum = mpSectionFormatTable->size(); - for( SwSectionFormats::size_type n = 0; n < nFlagSize; ++n ) + sal_uInt8 nTmp = pSetFlags[ n ]; + if( nTmp != 0xff ) { - sal_uInt8 nTmp = pSetFlags[ n ]; - if( nTmp != 0xff ) + // so get the Number + nNum = n * 8; + while( nTmp & 1 ) { - // so get the Number - nNum = n * 8; - while( nTmp & 1 ) - { - ++nNum; - nTmp >>= 1; - } - break; + ++nNum; + nTmp >>= 1; } + break; } } - if ( bUseChkStr ) - return sChkStr; return aName + OUString::number( ++nNum ); } @@ -1375,6 +1372,48 @@ void SwTOXBaseSection::UpdateMarks(const SwTOXInternational& rIntl, } } +static SwContentFrame* useContentNodeForIndex(const SwContentNode* node, bool fromChapter, + const SwTextNode* chapter, const SwRootFrame* layout) +{ + if (!node) + return nullptr; + if (!node->HasWriterListeners()) + return nullptr; + if (!node->GetNodes().IsDocNodes()) + return nullptr; + if (layout && layout->HasMergedParas() && node->GetRedlineMergeFlag() == SwNode::Merge::Hidden) + return nullptr; + auto pFrame = node->getLayoutFrame(layout); + if (!pFrame) + return nullptr; + if (fromChapter && !IsHeadingContained(chapter, *node)) + return nullptr; + if (pFrame->IsHiddenNow()) + return nullptr; + + return pFrame; +} + +static bool useTextNodeForIndex(const SwTextNode* node, int maxLevel, bool fromChapter, + const SwTextNode* chapter, const SwRootFrame* layout) +{ + auto pTextFrame = static_cast(useContentNodeForIndex(node, fromChapter, chapter, layout)); + if (!pTextFrame) + return false; + if (node->Len() == 0) + return false; + if (maxLevel >= 0 && node->GetAttrOutlineLevel() > maxLevel) + return false; + if (node->IsHiddenByParaField()) + return false; + if (node->HasHiddenCharAttribute(true)) + return false; + if (layout && layout->HasMergedParas() && pTextFrame->GetTextNodeForParaProps() != node) + return false; + + return true; +} + /// Generate table of contents from outline void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode, SwRootFrame const*const pLayout) @@ -1387,14 +1426,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode, { ::SetProgressState( 0, pDoc->GetDocShell() ); SwTextNode* pTextNd = pOutlineNode->GetTextNode(); - if( pTextNd && pTextNd->Len() && pTextNd->HasWriterListeners() && - o3tl::make_unsigned( pTextNd->GetAttrOutlineLevel()) <= GetLevel() && - pTextNd->getLayoutFrame(pLayout) && - !pTextNd->IsHiddenByParaField() && - !pTextNd->HasHiddenCharAttribute( true ) && - (!pLayout || !pLayout->HasMergedParas() - || static_cast(pTextNd->getLayoutFrame(pLayout))->GetTextNodeForParaProps() == pTextNd) && - ( !IsFromChapter() || IsHeadingContained(pOwnChapterNode, *pTextNd) )) + if (useTextNodeForIndex(pTextNd, GetLevel(), IsFromChapter(), pOwnChapterNode, pLayout)) { InsertSorted(MakeSwTOXSortTabBase(pLayout, *pTextNd, SwTOXElement::OutlineLevel)); } @@ -1405,6 +1437,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode, void SwTOXBaseSection::UpdateTemplate(const SwTextNode* pOwnChapterNode, SwRootFrame const*const pLayout) { + int nMaxLevel = SwTOXBase::GetType() == TOX_CONTENT ? GetLevel() : -1; SwDoc* pDoc = GetFormat()->GetDoc(); for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { @@ -1429,15 +1462,7 @@ void SwTOXBaseSection::UpdateTemplate(const SwTextNode* pOwnChapterNode, { ::SetProgressState( 0, pDoc->GetDocShell() ); - if (pTextNd->GetText().getLength() && - pTextNd->getLayoutFrame(pLayout) && - pTextNd->GetNodes().IsDocNodes() && - // tdf#40142 - consider level settings of the various text nodes - (TOX_CONTENT != SwTOXBase::GetType() || - o3tl::make_unsigned(pTextNd->GetAttrOutlineLevel()) <= GetLevel()) && - (!pLayout || !pLayout->HasMergedParas() - || static_cast(pTextNd->getLayoutFrame(pLayout))->GetTextNodeForParaProps() == pTextNd) && - (!IsFromChapter() || IsHeadingContained(pOwnChapterNode, *pTextNd))) + if (useTextNodeForIndex(pTextNd, nMaxLevel, IsFromChapter(), pOwnChapterNode, pLayout)) { InsertSorted(MakeSwTOXSortTabBase(pLayout, *pTextNd, SwTOXElement::Template, i + 1)); } @@ -1463,9 +1488,7 @@ void SwTOXBaseSection::UpdateSequence(const SwTextNode* pOwnChapterNode, SwTextNode& rTextNode = pTextField->GetTextNode(); ::SetProgressState( 0, pDoc->GetDocShell() ); - if (rTextNode.GetText().getLength() && - rTextNode.getLayoutFrame(pLayout) && - ( !IsFromChapter() || IsHeadingContained(pOwnChapterNode, rTextNode)) + if (useTextNodeForIndex(&rTextNode, -1, IsFromChapter(), pOwnChapterNode, pLayout) && (!pLayout || !pLayout->IsHideRedlines() || !sw::IsFieldDeletedInModel(pDoc->getIDocumentRedlineAccess(), *pTextField))) { @@ -1506,8 +1529,7 @@ void SwTOXBaseSection::UpdateAuthorities(const SwTOXInternational& rIntl, const SwTextNode& rTextNode = pFormatField->GetTextField()->GetTextNode(); ::SetProgressState( 0, pDoc->GetDocShell() ); - if (rTextNode.GetText().getLength() && - rTextNode.getLayoutFrame(pLayout) && + if (useTextNodeForIndex(&rTextNode, -1, false, nullptr, pLayout) && (!pLayout || !pLayout->IsHideRedlines() || !sw::IsFieldDeletedInModel(pDoc->getIDocumentRedlineAccess(), *pTextField))) { @@ -1655,10 +1677,7 @@ void SwTOXBaseSection::UpdateContent( SwTOXElement eMyType, } } - if (pCNd->getLayoutFrame(pLayout) - && (!pLayout || !pLayout->HasMergedParas() - || pCNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden) - && ( !IsFromChapter() || IsHeadingContained(pOwnChapterNode, *pCNd))) + if (useContentNodeForIndex(pCNd, IsFromChapter(), pOwnChapterNode, pLayout)) { std::unique_ptr pNew( MakeSwTOXSortTabBase( pLayout, *pCNd, eMyType, @@ -1695,10 +1714,7 @@ void SwTOXBaseSection::UpdateTable(const SwTextNode* pOwnChapterNode, while( nullptr != ( pCNd = SwNodes::GoNext( &aContentIdx ) ) && aContentIdx.GetIndex() < pTableNd->EndOfSectionIndex() ) { - if (pCNd->getLayoutFrame(pLayout) - && (!pLayout || !pLayout->HasMergedParas() - || pCNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden) - && (!IsFromChapter() || IsHeadingContained(pOwnChapterNode, *pCNd))) + if (useContentNodeForIndex(pCNd, IsFromChapter(), pOwnChapterNode, pLayout)) { std::unique_ptr pNew(new SwTOXTable( *pCNd )); if( IsLevelFromChapter() && TOX_TABLES != SwTOXBase::GetType()) diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 6a310a478221..fb20220cf9f3 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -772,8 +772,6 @@ void SwNoTextFrame::SwClientNotify(const SwModify& rModify, const SfxHint& rHint SwContentFrame::SwClientNotify(rModify, rHint); - bool bComplete = true; - switch( nWhich ) { case RES_OBJECTDYING: @@ -840,11 +838,8 @@ void SwNoTextFrame::SwClientNotify(const SwModify& rModify, const SfxHint& rHint return; } - if( bComplete ) - { - InvalidatePrt(); - SetCompletePaint(); - } + InvalidatePrt(); + SetCompletePaint(); } static void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInArea, vcl::RenderContext const * pOut ) diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx index 58b4cbff6488..89e8cc186311 100644 --- a/sw/source/core/docnode/ndnum.cxx +++ b/sw/source/core/docnode/ndnum.cxx @@ -23,6 +23,28 @@ #include #include #include +#include +#include +#include + +static const SwNode* getNodeOrAnchorNode(const SwNode* pNode) +{ + // if pNode is an inline heading in an Inline Heading + // text frame, return its anchor node instead of pNode + if (const auto pFlyFormat = pNode->GetFlyFormat()) + { + SwFormatAnchor const*const pAnchor = &pFlyFormat->GetAnchor(); + SwNode const*const pAnchorNode = pAnchor->GetAnchorNode(); + const SwFormat* pParent = pFlyFormat->DerivedFrom(); + if ( pAnchorNode && pParent && + RndStdIds::FLY_AS_CHAR == pAnchor->GetAnchorId() && + pParent->GetPoolFormatId() == RES_POOLFRM_INLINE_HEADING ) + { + return pAnchorNode; + } + } + return pNode; +} bool CompareSwOutlineNodes::operator()(const SwNode* lhs, const SwNode* rhs) const { @@ -36,6 +58,37 @@ bool SwOutlineNodes::Seek_Entry(const SwNode* rP, size_type* pnPos) const return it != end() && rP->GetIndex() == (*it)->GetIndex(); } +const SwNode* SwOutlineNodes::GetRootNode(const SwNode* pNode) +{ + return getNodeOrAnchorNode(pNode); +} + +bool CompareSwOutlineNodesInline::operator()(const SwNode* lhs, const SwNode* rhs) const +{ + return getNodeOrAnchorNode(lhs)->GetIndex() < getNodeOrAnchorNode(rhs)->GetIndex(); +} + +bool SwOutlineNodesInline::Seek_Entry(const SwNode* rP, size_type* pnPos) const +{ + const_iterator it = lower_bound(rP); + *pnPos = it - begin(); + return it != end() && getNodeOrAnchorNode(rP)->GetIndex() == getNodeOrAnchorNode(*it)->GetIndex(); +} + +bool SwOutlineNodesInline::Seek_Entry_By_Anchor(const SwNode* rAnchor, SwOutlineNodesInline::size_type* pnPos) const +{ + SwOutlineNodes::size_type nPos; + for( nPos = 0; nPos < size(); ++nPos ) + { + if (getNodeOrAnchorNode(operator[](nPos))->GetIndex() >= rAnchor->GetIndex()) + { + break; + } + } + *pnPos = nPos; + return nPos < size() && getNodeOrAnchorNode(operator[](nPos)) == rAnchor; +} + void SwNodes::UpdateOutlineNode(SwNode & rNd) { assert(IsDocNodes()); // no point in m_pOutlineNodes for undo nodes diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 8909fe540c32..39608e359739 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -355,7 +355,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts, // If the ColumnArray has a wrong count, ignore it! if( pColArr && - static_cast(nCols + ( text::HoriOrientation::NONE == eAdjust ? 2 : 1 )) != pColArr->size() ) + static_cast(nCols) + ( text::HoriOrientation::NONE == eAdjust ? 2 : 1 ) != pColArr->size() ) pColArr = nullptr; } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index c539c7531dc8..d9ac1d35ddd6 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -254,12 +254,14 @@ SwSection::~SwSection() void SwSection::SetSectionData(SwSectionData const& rData) { bool const bOldHidden( m_Data.IsHidden() ); + bool const bOldCondHidden{m_Data.IsCondHidden()}; m_Data = rData; // The next two may actually overwrite the m_Data.m_bProtect or EditInReadonly Flag // in Modify, which should result in same flag value as the old code! SetProtect(m_Data.IsProtectFlag()); SetEditInReadonly(m_Data.IsEditInReadonlyFlag()); - if (bOldHidden != m_Data.IsHidden()) // check if changed... + if (bOldHidden != m_Data.IsHidden() + || bOldCondHidden != m_Data.IsCondHidden()) // check if changed... { ImplSetHiddenFlag(m_Data.IsHidden(), m_Data.IsCondHidden()); } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index d2d3a3d4b842..e9900882a391 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -837,7 +837,7 @@ void SwEditShell::HandleCorrectionError(const OUString& aText, SwPosition aPos, aPos.SetContent( nBegin + nLeft ); SwPaM* pCursor = GetCursor(); - *pCursor->GetPoint() = aPos; + *pCursor->GetPoint() = std::move(aPos); pCursor->SetMark(); ExtendSelection( true, nLen - nLeft - nRight ); // don't determine the rectangle in the current line @@ -1667,7 +1667,7 @@ void SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > const & xAl *pCursor->GetMark() = *pCursor->GetPoint(); } pCursor->SetMark(); - *pCursor->GetMark() = aStart; + *pCursor->GetMark() = std::move(aStart); CreatePortion(xAlt, pGrammarResult, false, false); } } diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 6a60cd47dd40..c626c2d9bab0 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -540,10 +540,11 @@ bool SwEditShell::OutlineUpDown( short nOffset ) return bRet; } -bool SwEditShell::MoveOutlinePara( SwOutlineNodes::difference_type nOffset ) +bool SwEditShell::MoveOutlinePara( SwOutlineNodes::difference_type nOffset, + SwOutlineNodesInline* pOutlineNodesInline ) { StartAllAction(); - bool bRet = GetDoc()->MoveOutlinePara( *GetCursor(), nOffset ); + bool bRet = GetDoc()->MoveOutlinePara( *GetCursor(), nOffset, pOutlineNodesInline ); EndAllAction(); return bRet; } diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index 77fd2e7b3dc9..8059a313f3ac 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -460,7 +460,7 @@ void SwEditShell::DoSpecialInsert() // insert a new text node, and set the cursor GetDoc()->getIDocumentContentOperations().AppendTextNode( aInsertPos ); - *pCursorPos = aInsertPos; + *pCursorPos = std::move(aInsertPos); // call AttrChangeNotify for the UI CallChgLnk(); diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index ec439961d788..67c0c46173b9 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -322,13 +322,14 @@ SwAuthorFieldType::SwAuthorFieldType() OUString SwAuthorFieldType::Expand(sal_uLong nFormat) { - SvtUserOptions& rOpt = SW_MOD()->GetUserOptions(); + SwModule* mod = SwModule::get(); + SvtUserOptions& rOpt = mod->GetUserOptions(); if((nFormat & 0xff) == AF_NAME) { // Prefer the view's redline author name. // (set in SwXTextDocument::initializeForTiledRendering) - std::size_t nAuthor = SW_MOD()->GetRedlineAuthor(); - OUString sAuthor = SW_MOD()->GetRedlineAuthor(nAuthor); + std::size_t nAuthor = mod->GetRedlineAuthor(); + OUString sAuthor = mod->GetRedlineAuthor(nAuthor); if (sAuthor.isEmpty()) return rOpt.GetFullName(); @@ -1952,6 +1953,8 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= OUString(OUString::number(m_nPostItId, 16).toAsciiUpperCase()); } break; + case FIELD_PROP_TITLE: + break; default: assert(false); } @@ -2074,7 +2077,7 @@ OUString SwExtUserFieldType::Expand(sal_uInt16 nSub ) } if( static_cast(USHRT_MAX) != nRet ) { - SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions(); + SvtUserOptions& rUserOpt = SwModule::get()->GetUserOptions(); return rUserOpt.GetToken( nRet ); } return OUString(); diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 644635522103..4a3ed2bba186 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -177,8 +177,6 @@ class SW_DLLPUBLIC SwTextFrame final : public SwContentFrame /// will still be set; GetFormatted() is the function that forces /// recreation of the SwLineLayout by Format() if necessary. static SwCache *s_pTextCache; - static constexpr tools::Long nMinPrtLine = 0; // This Line must not be underrun when printing - // Hack for table cells stretching multiple pages sal_Int32 mnAllLines :24; // Line count for the Paint (including nThisLines) sal_Int32 mnThisLines :8; // Count of Lines of the Frame @@ -625,8 +623,6 @@ public: static SwCache *GetTextCache() { return s_pTextCache; } static void SetTextCache( SwCache *pNew ) { s_pTextCache = pNew; } - static tools::Long GetMinPrtLine() { return nMinPrtLine; } - sal_uInt16 GetCacheIdx() const { return mnCacheIndex; } void SetCacheIdx( const sal_uInt16 nNew ) { mnCacheIndex = nNew; } diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index ae7fdfae4326..98e10b4d1c83 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -506,13 +506,10 @@ void SwFlyFrame::FinitDrawObj() if (SwFEShell *const pFEShell = dynamic_cast(&rCurrentShell)) { // tdf#131679 move any cursor out of fly rCurrentShell.Imp()->GetDrawView()->UnmarkAll(); - if (pOldSelFly) - { - SwPaM const temp(ResolveFlyAnchor(*pOldSelFly->GetFormat())); - pFEShell->SetSelection(temp); - // could also call SetCursor() like SwFEShell::SelectObj() - // does, but that would access layout a bit much... - } + SwPaM const temp(ResolveFlyAnchor(*pOldSelFly->GetFormat())); + pFEShell->SetSelection(temp); + // could also call SetCursor() like SwFEShell::SelectObj() + // does, but that would access layout a bit much... } else { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 14cac86e962a..2ccb8b34116d 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3961,7 +3961,7 @@ bool IsExtraData( const SwDoc *pDoc ) const SwLineNumberInfo &rInf = pDoc->GetLineNumberInfo(); if (rInf.IsPaintLineNumbers() || rInf.IsCountInFlys() || - (static_cast(SW_MOD()->GetRedlineMarkPos()) != text::HoriOrientation::NONE && + (static_cast(SwModule::get()->GetRedlineMarkPos()) != text::HoriOrientation::NONE && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())) { return true; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 24803baf1c89..8e2b97e7c045 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -333,51 +333,12 @@ struct SwPaintProperties { static SwPaintProperties gProp; -static bool isSubsidiaryLinesFlysEnabled() -{ - return !gProp.pSGlobalShell->GetViewOptions()->IsPagePreview() && - !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() && - !gProp.pSGlobalShell->GetViewOptions()->IsFormView() && - gProp.pSGlobalShell->GetViewOptions()->IsObjectBoundaries(); -} -//other subsidiary lines enabled? static bool isSubsidiaryLinesEnabled() { return !gProp.pSGlobalShell->GetViewOptions()->IsPagePreview() && !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() && !gProp.pSGlobalShell->GetViewOptions()->IsFormView() && - !gProp.pSGlobalShell->GetViewOptions()->IsWhitespaceHidden() && - gProp.pSGlobalShell->GetViewOptions()->IsDocBoundaries(); -} -//subsidiary lines for sections -static bool isSubsidiaryLinesForSectionsEnabled() -{ - return !gProp.pSGlobalShell->GetViewOptions()->IsPagePreview() && - !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() && - !gProp.pSGlobalShell->GetViewOptions()->IsFormView() && - gProp.pSGlobalShell->GetViewOptions()->IsSectionBoundaries(); -} - - -namespace { - -bool isTableBoundariesEnabled() -{ - if (!gProp.pSGlobalShell->GetViewOptions()->IsTable()) - return false; - - if (gProp.pSGlobalShell->GetViewOptions()->IsPagePreview()) - return false; - - if (gProp.pSGlobalShell->GetViewOptions()->IsReadonly()) - return false; - - if (gProp.pSGlobalShell->GetViewOptions()->IsFormView()) - return false; - - return gProp.pSGlobalShell->GetViewOptions()->IsTableBoundaries(); -} - + gProp.pSGlobalShell->GetViewOptions()->IsShowBoundaries(); } /** @@ -1107,8 +1068,8 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, switch ( rLRect.GetSubColor() ) { case SubColFlags::Page: pCol = &pOpt->GetDocBoundariesColor(); break; - case SubColFlags::Fly: pCol = &pOpt->GetObjectBoundariesColor(); break; case SubColFlags::Tab: pCol = &pOpt->GetTableBoundariesColor(); break; + case SubColFlags::Fly: case SubColFlags::Sect: pCol = &pOpt->GetSectionBoundColor(); break; } @@ -2576,7 +2537,9 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons const Color* pTmpColor = nullptr; if (0 == aStyles[ 0 ].GetWidth()) { - if (isTableBoundariesEnabled() && gProp.pSGlobalShell->GetWin()) + if (isSubsidiaryLinesEnabled() && + gProp.pSGlobalShell->GetViewOptions()->IsTableBoundaries() && + gProp.pSGlobalShell->GetWin()) aStyles[ 0 ].Set( rCol, rCol, rCol, false, 1, 0, 0 ); else aStyles[0].SetType(SvxBorderLineStyle::NONE); @@ -5569,6 +5532,11 @@ void SwFrame::PaintSwFrameShadowAndBorder( return; } + if (!getFramePrintArea().HasArea()) + { // hidden text frame, may be called by upper from PaintSwFrameBackground() + return; + } + const bool bLine = rAttrs.IsLine(); const bool bShadow = rAttrs.GetShadow().GetLocation() != SvxShadowLocation::NONE; @@ -6564,7 +6532,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin _pViewShell->GetOut()->SetLineColor(); if (!bRight) { - _pViewShell->GetOut()->SetFillColor(_pViewShell->GetViewOptions()->GetObjectBoundariesColor()); + _pViewShell->GetOut()->SetFillColor(_pViewShell->GetViewOptions()->GetDocBoundariesColor()); _pViewShell->GetOut()->DrawRect(tools::Rectangle(Point(aPageRect.Left()-pMgr->GetSidebarBorderWidth(),aPageRect.Top()),Size(pMgr->GetSidebarBorderWidth(),aPageRect.Height()))) ; if (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) _pViewShell->GetOut()->SetFillColor(COL_BLACK); @@ -6574,7 +6542,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin } else { - _pViewShell->GetOut()->SetFillColor(_pViewShell->GetViewOptions()->GetObjectBoundariesColor()); + _pViewShell->GetOut()->SetFillColor(_pViewShell->GetViewOptions()->GetDocBoundariesColor()); SwRect aSidebarBorder(aPageRect.TopRight(),Size(pMgr->GetSidebarBorderWidth(),aPageRect.Height())); _pViewShell->GetOut()->DrawRect(aSidebarBorder.SVRect()); if (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) @@ -7065,8 +7033,10 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP /// Refreshes all subsidiary lines of a page. void SwPageFrame::RefreshSubsidiary( const SwRect &rRect ) const { - if ( !(isSubsidiaryLinesEnabled() || isTableBoundariesEnabled() - || isSubsidiaryLinesForSectionsEnabled() || isSubsidiaryLinesFlysEnabled()) ) + if ( !(isSubsidiaryLinesEnabled() || + gProp.pSGlobalShell->GetViewOptions()->IsTextBoundaries() || + gProp.pSGlobalShell->GetViewOptions()->IsSectionBoundaries() || + gProp.pSGlobalShell->GetViewOptions()->IsTableBoundaries()) ) return; if ( !rRect.HasArea() ) @@ -7099,10 +7069,7 @@ void SwPageFrame::RefreshSubsidiary( const SwRect &rRect ) const void SwLayoutFrame::RefreshLaySubsidiary( const SwPageFrame *pPage, const SwRect &rRect ) const { - const bool bSubsOpt = isSubsidiaryLinesEnabled() - || (IsSctFrame() && isSubsidiaryLinesForSectionsEnabled()) - || (IsFlyFrame() && isSubsidiaryLinesFlysEnabled()); - if (bSubsOpt) + if (isSubsidiaryLinesEnabled()) PaintSubsidiaryLines( pPage, rRect ); const SwFrame *pLow = Lower(); @@ -7350,7 +7317,7 @@ std::vector SwPageFrame::GetSubsidiaryLinesPolygons(const S { std::vector aPolygons; - if (!rViewShell.GetViewOptions()->IsDocBoundaries()) + if (!rViewShell.GetViewOptions()->IsTextBoundaries()) return aPolygons; const SwFrame* pLay = Lower(); @@ -7499,7 +7466,7 @@ std::vector SwHeadFootFrame::GetSubsidiaryLinesPolygons(con { std::vector aPolygons; - if (!rViewShell.GetViewOptions()->IsDocBoundaries()) + if (!rViewShell.GetViewOptions()->IsTextBoundaries()) return aPolygons; SwRect aArea( getFramePrintArea() ); @@ -7573,22 +7540,12 @@ void SwLayoutFrame::PaintSubsidiaryLines( const SwPageFrame *pPage, const bool bCell = IsCellFrame(); - if (!bCell && IsFlyFrame()) - { - if (!gProp.pSGlobalShell->GetViewOptions()->IsObjectBoundaries()) - return; - - // if the frame is wrap none or wrap through, then text boundary lines have no meaning - // (unless the frame itself contains text) - const text::WrapTextMode aSurround = GetFormat()->GetSurround().GetSurround(); - if (GetFormat()->GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR - && (!Lower() || !Lower()->IsTextFrame()) - && (aSurround == text::WrapTextMode::WrapTextMode_THROUGH - || aSurround == text::WrapTextMode::WrapTextMode_NONE)) - { - return; - } - } + if ( (IsSctFrame() || IsFlyFrame()) && + !gProp.pSGlobalShell->GetViewOptions()->IsSectionBoundaries() ) + return; + if ( IsTextFrame() && + !gProp.pSGlobalShell->GetViewOptions()->IsTextBoundaries() ) + return; // #i3662# - use frame area for cells for section use also frame area const bool bUseFrameArea = bCell || IsSctFrame(); @@ -7698,7 +7655,7 @@ void SwPageFrame::RefreshExtraData( const SwRect &rRect ) const { const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo(); bool bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys()) - || static_cast(SW_MOD()->GetRedlineMarkPos()) != text::HoriOrientation::NONE; + || static_cast(SwModule::get()->GetRedlineMarkPos()) != text::HoriOrientation::NONE; SwRect aRect( rRect ); ::SwAlignRect( aRect, gProp.pSGlobalShell, gProp.pSGlobalShell->GetOut() ); @@ -7725,7 +7682,7 @@ void SwLayoutFrame::RefreshExtraData( const SwRect &rRect ) const const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo(); bool bLineInBody = rInfo.IsPaintLineNumbers(), bLineInFly = bLineInBody && rInfo.IsCountInFlys(), - bRedLine = static_cast(SW_MOD()->GetRedlineMarkPos())!=text::HoriOrientation::NONE; + bRedLine = static_cast(SwModule::get()->GetRedlineMarkPos())!=text::HoriOrientation::NONE; const SwContentFrame *pCnt = ContainsContent(); while ( pCnt && IsAnLower( pCnt ) ) diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 11245f084a92..d67c2b931650 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -846,6 +846,10 @@ void SwSectionFrame::MakeAll(vcl::RenderContext* pRenderContext) // appropriately; then drop the temporary, if needed. if (SwLayoutFrame* moveBackPos = GetPrevSctLeaf()) { + if (moveBackPos->IsColBodyFrame()) + { + moveBackPos = moveBackPos->GetUpper()->GetUpper(); + } SwLayoutFrame* newUpper = moveBackPos; SwFrame* newSibling = nullptr; const bool temporaryMasterCreated = IsFollow(); @@ -2828,16 +2832,19 @@ void SwSectionFrame::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) } else { - if (GetNext()) + if (pFollow->GetNext()) { - assert(GetNext()->IsFlowFrame()); - SwFlowFrame::CastFlowFrame(GetNext())->MoveSubTree(pLay, nullptr); + assert(pFollow->GetNext()->IsFlowFrame()); + SwFlowFrame::CastFlowFrame(pFollow->GetNext())->MoveSubTree(pLay, nullptr); } pFollow = new SwSectionFrame(*pFollow, false); SimpleFormat(); pFollow->InsertBehind(pLay, nullptr); pFollow->Init(); - SwFlowFrame::CastFlowFrame(pLowerFrame)->MoveSubTree(pFollow, nullptr); + SwLayoutFrame *const pTarget{pColumn + ? static_cast(static_cast(pFollow->Lower())->Lower()) + : pFollow}; + SwFlowFrame::CastFlowFrame(pLowerFrame)->MoveSubTree(pTarget, nullptr); } } } diff --git a/sw/source/core/layout/sortedobjs.cxx b/sw/source/core/layout/sortedobjs.cxx index e0c29d51801c..da3fba27598a 100644 --- a/sw/source/core/layout/sortedobjs.cxx +++ b/sw/source/core/layout/sortedobjs.cxx @@ -275,8 +275,10 @@ void SwSortedObjs::Update( SwAnchoredObject& _rAnchoredObj ) return; } - Remove( _rAnchoredObj ); - Insert( _rAnchoredObj ); + if (is_sorted()) + return; + + UpdateAll(); } void SwSortedObjs::UpdateAll() diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 38d0248e4e9e..65a6f7e8fdf7 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -293,11 +293,11 @@ bool SwPageFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, if (bConsiderBackground && bTestBackground && bBackRet) { - (*pPos) = aBackPos; + (*pPos) = std::move(aBackPos); } else if (!bBackRet) { - (*pPos) = aTextPos; + (*pPos) = std::move(aTextPos); } else // bBackRet && !(bConsiderBackground && bTestBackground) { @@ -328,7 +328,7 @@ bool SwPageFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, // previous character; to get a better measure from // lcl_getDistance, extend that to a rectangle over // the entire character. - SwPosition nextTextPos(prevTextPos); + SwPosition nextTextPos(std::move(prevTextPos)); nextTextPos.AdjustContent(+1); SwRect nextTextRect; pTextFrame->GetCharRect(nextTextRect, nextTextPos); @@ -375,11 +375,11 @@ bool SwPageFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, if ( bValidTextDistance && bValidBackDistance && basegfx::fTools::more( nTextDistance, nBackDistance ) ) { - (*pPos) = aBackPos; + (*pPos) = std::move(aBackPos); } else { - (*pPos) = aTextPos; + (*pPos) = std::move(aTextPos); } } } diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 3f3005eb9996..89517d652c24 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -179,6 +180,9 @@ ErrCode SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx, if ( OpenFile() != ERRCODE_NONE ) return ERR_SWG_READ_ERROR; + if (comphelper::LibreOfficeKit::isActive()) + return ERR_SWG_READ_ERROR; + try { m_xRoot = m_xBlkRoot->openStorageElement( m_aPackageName, embed::ElementModes::READ ); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 3a24d194339c..bad44b2b04dc 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -94,7 +94,7 @@ void SwTableBox::setDummyFlag( bool bDummy ) } //JP 15.09.98: Bug 55741 - Keep tabs (front and rear) -static OUString& lcl_TabToBlankAtSttEnd( OUString& rText ) +static void lcl_TabToBlankAtSttEnd( OUString& rText ) { sal_Unicode c; sal_Int32 n; @@ -105,10 +105,9 @@ static OUString& lcl_TabToBlankAtSttEnd( OUString& rText ) for( n = rText.getLength(); n && ' ' >= ( c = rText[--n] ); ) if( '\x9' == c ) rText = rText.replaceAt( n, 1, u" " ); - return rText; } -static OUString& lcl_DelTabsAtSttEnd( OUString& rText ) +static void lcl_DelTabsAtSttEnd( OUString& rText ) { sal_Unicode c; sal_Int32 n; @@ -125,7 +124,6 @@ static OUString& lcl_DelTabsAtSttEnd( OUString& rText ) sBuff.remove( n, 1 ); } rText = sBuff.makeStringAndClear(); - return rText; } void InsTableBox( SwDoc& rDoc, SwTableNode* pTableNd, diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index b23741335cb0..54f55f45f35e 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -295,7 +295,7 @@ void SwExtraPainter::PaintRedline( SwTwips nY, tools::Long nMax ) } } const Color aOldCol( m_pSh->GetOut()->GetLineColor() ); - m_pSh->GetOut()->SetLineColor( SW_MOD()->GetRedlineMarkColor() ); + m_pSh->GetOut()->SetLineColor(SwModule::get()->GetRedlineMarkColor()); if ( m_pTextFrame->IsVertical() ) { @@ -320,7 +320,7 @@ void SwTextFrame::PaintExtraData( const SwRect &rRect ) const const SwFormatLineNumber &rLineNum = GetAttrSet()->GetLineNumber(); bool bLineNum = !IsInTab() && rLineInf.IsPaintLineNumbers() && ( !IsInFly() || rLineInf.IsCountInFlys() ) && rLineNum.IsCount(); - sal_Int16 eHor = static_cast(SW_MOD()->GetRedlineMarkPos()); + sal_Int16 eHor = static_cast(SwModule::get()->GetRedlineMarkPos()); if (eHor != text::HoriOrientation::NONE && (!IDocumentRedlineAccess::IsShowChanges(rIDRA.GetRedlineFlags()) || getRootFrame()->IsHideRedlines())) @@ -378,59 +378,43 @@ void SwTextFrame::PaintExtraData( const SwRect &rRect ) const tools::Long nBottom = rRect.Bottom(); - bool bNoPrtLine = 0 == GetMinPrtLine(); - if( !bNoPrtLine ) - { - while ( aLine.Y() < GetMinPrtLine() ) - { - if( ( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasContent() ) - && !aLine.GetCurr()->IsDummy() ) - aExtra.IncLineNr(); - if( !aLine.Next() ) - break; - } - bNoPrtLine = aLine.Y() >= GetMinPrtLine(); - } const bool bIsShowChangesInMargin = pSh->GetViewOptions()->IsShowChangesInMargin(); - if( bNoPrtLine ) + do { - do + if( bNoDummy || !aLine.GetCurr()->IsDummy() ) { - if( bNoDummy || !aLine.GetCurr()->IsDummy() ) + bool bRed = bRedLine && aLine.GetCurr()->HasRedline(); + if( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasContent() ) { - bool bRed = bRedLine && aLine.GetCurr()->HasRedline(); - if( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasContent() ) + bool bRedInMargin = bIsShowChangesInMargin && bRed; + bool bNum = bLineNum && ( aExtra.HasNumber() || aExtra.HasDivider() ); + if( bRedInMargin || bNum ) { - bool bRedInMargin = bIsShowChangesInMargin && bRed; - bool bNum = bLineNum && ( aExtra.HasNumber() || aExtra.HasDivider() ); - if( bRedInMargin || bNum ) + SwTwips nTmpHeight, nTmpAscent; + aLine.CalcAscentAndHeight( nTmpAscent, nTmpHeight ); + if ( bRedInMargin ) { - SwTwips nTmpHeight, nTmpAscent; - aLine.CalcAscentAndHeight( nTmpAscent, nTmpHeight ); - if ( bRedInMargin ) + const OUString* pRedlineText = aLine.GetCurr()->GetRedlineText(); + if( !pRedlineText->isEmpty() ) { - const OUString* pRedlineText = aLine.GetCurr()->GetRedlineText(); - if( !pRedlineText->isEmpty() ) - { - aExtra.PaintExtra( aLine.Y(), nTmpAscent, - nTmpHeight, bRed, pRedlineText ); - bRed = false; - bNum = false; - } - } - if ( bNum ) - { - aExtra.PaintExtra( aLine.Y(), nTmpAscent, nTmpHeight, bRed ); + aExtra.PaintExtra( aLine.Y(), nTmpAscent, + nTmpHeight, bRed, pRedlineText ); bRed = false; + bNum = false; } } - aExtra.IncLineNr(); + if ( bNum ) + { + aExtra.PaintExtra( aLine.Y(), nTmpAscent, nTmpHeight, bRed ); + bRed = false; + } } - if( bRed ) - aExtra.PaintRedline( aLine.Y(), aLine.GetLineHeight() ); + aExtra.IncLineNr(); } - } while( aLine.Next() && aLine.Y() <= nBottom ); - } + if( bRed ) + aExtra.PaintRedline( aLine.Y(), aLine.GetLineHeight() ); + } + } while( aLine.Next() && aLine.Y() <= nBottom ); } else { @@ -773,21 +757,11 @@ void SwTextFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& aLine.TwipsToLine( rRect.Top() + 1 ); tools::Long nBottom = rRect.Bottom(); - bool bNoPrtLine = 0 == GetMinPrtLine(); - if( !bNoPrtLine ) + do { - while ( aLine.Y() < GetMinPrtLine() && aLine.Next() ) - ; - bNoPrtLine = aLine.Y() >= GetMinPrtLine(); - } - if( bNoPrtLine ) - { - do - { - aLine.DrawTextLine(rRect, aClip, IsUndersized(), oTaggedLabel, oTaggedParagraph, isPDFTaggingEnabled); + aLine.DrawTextLine(rRect, aClip, IsUndersized(), oTaggedLabel, oTaggedParagraph, isPDFTaggingEnabled); - } while( aLine.Next() && aLine.Y() <= nBottom ); - } + } while( aLine.Next() && aLine.Y() <= nBottom ); // Once is enough: if( aLine.IsPaintDrop() ) diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 1d7bbaf42e18..ec2d82be4356 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -313,7 +313,7 @@ void SwTextSizeInfo::CtorInitTextSizeInfo( OutputDevice* pRenderContext, SwTextF m_pOpt = m_pVsh ? m_pVsh->GetViewOptions() : - SW_MOD()->GetViewOption(rDoc.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE)); // Options from Module, due to StarONE + SwModule::get()->GetViewOption(rDoc.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE)); // Options from Module, due to StarONE // bURLNotify is set if MakeGraphic prepares it // TODO: Unwind @@ -1637,7 +1637,7 @@ void SwTextFormatInfo::CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwT m_nLineNetHeight = 0; SetLineStart(TextFrameIndex(0)); - SvtCTLOptions::TextNumerals const nTextNumerals(SW_MOD()->GetCTLTextNumerals()); + SvtCTLOptions::TextNumerals const nTextNumerals(SwModule::get()->GetCTLTextNumerals()); // cannot cache for NUMERALS_CONTEXT because we need to know the string // for the whole paragraph now if (nTextNumerals != SvtCTLOptions::NUMERALS_CONTEXT) diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 2038265014d2..28f3c80d06a6 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -206,6 +206,7 @@ inline SwLinePortion::SwLinePortion(const SwLinePortion &rPortion) : mnWhichPor( rPortion.mnWhichPor ), m_bJoinBorderWithPrev( rPortion.m_bJoinBorderWithPrev ), m_bJoinBorderWithNext( rPortion.m_bJoinBorderWithNext ), + m_bIsFieldmarkText( rPortion.m_bIsFieldmarkText ), m_nExtraBlankWidth(rPortion.m_nExtraBlankWidth), m_nExtraShrunkWidth(rPortion.m_nExtraShrunkWidth), m_nLayoutContext(rPortion.m_nLayoutContext) diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 9b4175d9697e..9285bf457803 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -873,14 +873,14 @@ void SwRedlineItr::FillHints( std::size_t nAuthor, RedlineType eType ) switch ( eType ) { case RedlineType::Insert: - SW_MOD()->GetInsertAuthorAttr(nAuthor, *m_pSet); + SwModule::get()->GetInsertAuthorAttr(nAuthor, *m_pSet); break; case RedlineType::Delete: - SW_MOD()->GetDeletedAuthorAttr(nAuthor, *m_pSet); + SwModule::get()->GetDeletedAuthorAttr(nAuthor, *m_pSet); break; case RedlineType::Format: case RedlineType::FmtColl: - SW_MOD()->GetFormatAuthorAttr(nAuthor, *m_pSet); + SwModule::get()->GetFormatAuthorAttr(nAuthor, *m_pSet); break; default: break; diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 3020a2118722..a9406f55740c 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -485,9 +485,9 @@ static bool lcl_setRedlineAttr( SwTextFormatInfo &rInf, const SwTextNode& rTextN : pRedlineNum->GetAuthor(); if ( RedlineType::Delete == pRedlineNum->GetType() ) - SW_MOD()->GetDeletedAuthorAttr(aAuthor, aSet); + SwModule::get()->GetDeletedAuthorAttr(aAuthor, aSet); else - SW_MOD()->GetInsertAuthorAttr(aAuthor, aSet); + SwModule::get()->GetInsertAuthorAttr(aAuthor, aSet); if (const SvxColorItem* pItem = aSet.GetItemIfSet(RES_CHRATR_COLOR)) pNumFnt->SetColor(pItem->GetValue()); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 787ea1390e78..84f961781232 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -797,10 +797,10 @@ SwFootnotePortion *SwTextFormatter::NewFootnotePortion( SwTextFormatInfo &rInf, OSL_ENSURE( ! m_pFrame->IsVertical() || m_pFrame->IsSwapped(), "NewFootnotePortion with unswapped frame" ); - SwTextFootnote *pFootnote = static_cast(pHint); + if (!m_pFrame->IsFootnoteAllowed()) + return new SwFootnotePortion(u""_ustr, nullptr); - if( !m_pFrame->IsFootnoteAllowed() ) - return new SwFootnotePortion(u""_ustr, pFootnote); + SwTextFootnote *pFootnote = static_cast(pHint); const SwFormatFootnote& rFootnote = pFootnote->GetFootnote(); SwDoc *const pDoc = &m_pFrame->GetDoc(); @@ -1015,9 +1015,9 @@ SwNumberPortion *SwTextFormatter::NewFootnoteNumPortion( SwTextFormatInfo const : pRedline->GetAuthor(); if ( RedlineType::Delete == pRedline->GetType() ) - SW_MOD()->GetDeletedAuthorAttr(aAuthor, aSet); + SwModule::get()->GetDeletedAuthorAttr(aAuthor, aSet); else - SW_MOD()->GetInsertAuthorAttr(aAuthor, aSet); + SwModule::get()->GetInsertAuthorAttr(aAuthor, aSet); if (const SvxColorItem* pItem = aSet.GetItemIfSet(RES_CHRATR_COLOR)) pNumFnt->SetColor(pItem->GetValue()); @@ -1408,7 +1408,7 @@ bool SwFootnotePortion::Format( SwTextFormatInfo &rInf ) SetAscent( rInf.GetAscent() ); Height( rInf.GetTextHeight() ); rInf.SetFootnoteDone( !bFull ); - if( !bFull ) + if (!bFull && m_pFootnote) rInf.SetParaFootnote(); return bFull; } diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 0c5818ee9cd3..9f1d5c90312e 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -197,6 +197,9 @@ void SwTOXMark::Notify(const SfxHint& rHint) // Check for being hidden by hidden redlines if (pLayout && pLayout->HasMergedParas() && sw::IsMarkHintHidden(*pLayout, rNode, rTextMark)) return; + // Check for being hidden by hidden sections + if (auto pFrame(rNode.getLayoutFrame(pLayout)); !pFrame || pFrame->IsHiddenNow()) + return; pCollectLayoutHint->m_rMarks.push_back(rTextMark); } } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 3c4c4fbd4561..356645f6c9d6 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -86,6 +86,8 @@ #include #include #include +#include +#include using namespace ::com::sun::star; @@ -4186,9 +4188,41 @@ void SwTextNode::UpdateOutlineState() m_bLastOutlineState = IsOutline(); } -int SwTextNode::GetAttrOutlineLevel() const +int SwTextNode::GetAttrOutlineLevel(bool bInlineHeading) const { - return GetAttr(RES_PARATR_OUTLINELEVEL).GetValue(); + sal_uInt16 nLevel = GetAttr(RES_PARATR_OUTLINELEVEL).GetValue(); + // not outline node, so if bIblineHeading = true, look for the + // outline level of the inline heading (i.e the outline node in + // an Inline Heading frame, which frame anchored as character to this node) + if ( !nLevel && bInlineHeading && HasHints() ) + { + // are we in a fly + for ( size_t j = m_pSwpHints->Count(); j; ) + { + SwTextAttr* const pHt = m_pSwpHints->Get( --j ); + if ( RES_TXTATR_FLYCNT == pHt->Which() ) + { + SwFrameFormat* pFrameFormat = pHt->GetFlyCnt().GetFrameFormat(); + const SwFormat* pParent = pFrameFormat->DerivedFrom(); + SwFormatAnchor const& rAnchor(pFrameFormat->GetAnchor()); + bool bInlineHeadingFrame = pParent && + pParent->GetPoolFormatId() == RES_POOLFRM_INLINE_HEADING && + RndStdIds::FLY_AS_CHAR == rAnchor.GetAnchorId(); + const SwNodeIndex* pNdIdx = bInlineHeadingFrame + ? pFrameFormat->GetContent().GetContentIdx() + : nullptr; + const SwNodes* pNodesArray = (pNdIdx != nullptr) + ? &(pNdIdx->GetNodes()) + : nullptr; + const SwTextNode *pTextNode = (pNodesArray != nullptr) + ? (*pNodesArray)[pNdIdx->GetIndex() + 1]->GetTextNode() + : nullptr; + if ( pTextNode ) + return pTextNode->GetAttrOutlineLevel(); + } + } + } + return nLevel; } void SwTextNode::SetAttrOutlineLevel(int nLevel) @@ -4201,12 +4235,14 @@ void SwTextNode::SetAttrOutlineLevel(int nLevel) } } -void SwTextNode::GetAttrOutlineContentVisible(bool& bOutlineContentVisibleAttr) +bool SwTextNode::GetAttrOutlineContentVisible() const { + bool bOutlineContentVisibleAttr = true; const SfxGrabBagItem & rGrabBagItem = GetAttr(RES_PARATR_GRABBAG); auto it = rGrabBagItem.GetGrabBag().find(u"OutlineContentVisibleAttr"_ustr); if (it != rGrabBagItem.GetGrabBag().end()) it->second >>= bOutlineContentVisibleAttr; + return bOutlineContentVisibleAttr; } void SwTextNode::SetAttrOutlineContentVisible(bool bVisible) diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 864d3c99ecfb..905d65d0a8b8 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1012,7 +1012,7 @@ Size SwSubFont::GetTextSize_( SwDrawTextInfo& rInf ) ChgFnt( rInf.GetShell(), rInf.GetOut() ); SwDigitModeModifier aDigitModeModifier(rInf.GetOut(), rInf.GetFont()->GetLanguage(), - SW_MOD()->GetCTLTextNumerals()); + SwModule::get()->GetCTLTextNumerals()); Size aTextSize; TextFrameIndex const nLn = rInf.GetLen() == TextFrameIndex(COMPLETE_STRING) @@ -1142,7 +1142,7 @@ void SwSubFont::DrawText_( SwDrawTextInfo &rInf, const bool bGrey ) ChgFnt( rInf.GetShell(), rInf.GetOut() ); SwDigitModeModifier aDigitModeModifier(rInf.GetOut(), rInf.GetFont()->GetLanguage(), - SW_MOD()->GetCTLTextNumerals()); + SwModule::get()->GetCTLTextNumerals()); const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); @@ -1268,7 +1268,7 @@ void SwSubFont::DrawStretchText_( SwDrawTextInfo &rInf ) ChgFnt( rInf.GetShell(), rInf.GetOut() ); SwDigitModeModifier aDigitModeModifier(rInf.GetOut(), rInf.GetFont()->GetLanguage(), - SW_MOD()->GetCTLTextNumerals()); + SwModule::get()->GetCTLTextNumerals()); rInf.ApplyAutoColor(); @@ -1334,7 +1334,7 @@ TextFrameIndex SwSubFont::GetModelPositionForViewPoint_( SwDrawTextInfo& rInf ) ChgFnt( rInf.GetShell(), rInf.GetOut() ); SwDigitModeModifier aDigitModeModifier(rInf.GetOut(), rInf.GetFont()->GetLanguage(), - SW_MOD()->GetCTLTextNumerals()); + SwModule::get()->GetCTLTextNumerals()); TextFrameIndex const nLn = rInf.GetLen() == TextFrameIndex(COMPLETE_STRING) ? TextFrameIndex(rInf.GetText().getLength()) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index e3ae5955a6da..0b448c74ead5 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -228,7 +228,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTextNode& rNode, OUStringBuffer& rText, nRedlinesMasked = lcl_MaskRedlines( rNode, rText, nStt, nEnd, cChar ); } - const bool bHideHidden = !SW_MOD()->GetViewOption(rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE))->IsShowHiddenChar(); + const bool bHideHidden = !SwModule::get()->GetViewOption(rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE))->IsShowHiddenChar(); // If called from word count, we want to mask the hidden ranges even // if they are visible: diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index bee8090f4fe0..0d7b29bf9ccf 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -814,12 +814,12 @@ lcl_ForceIntoMeta(SwPaM & rCursor, case META_CHECK_BOTH: if (*rCursor.Start() < start) { - *rCursor.Start() = start; + *rCursor.Start() = std::move(start); bRet = false; } if (*rCursor.End() > end) { - *rCursor.End() = end; + *rCursor.End() = std::move(end); bRet = false; } break; @@ -866,13 +866,13 @@ bool lcl_ForceIntoContentControl(SwPaM& rCursor, const uno::Reference aEnd) { - *rCursor.End() = aEnd; + *rCursor.End() = std::move(aEnd); bRet = false; } break; diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 4a3cd81c3c7f..d2910db91710 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1470,12 +1470,12 @@ SwXTextRange::setPropertyValue( { SolarMutexGuard aGuard; - if (!m_pMark) + if (!m_pMark && (m_eRangePosition != RANGE_IS_SECTION || !m_pTableOrSectionFormat)) { throw uno::RuntimeException(u"range has no mark (table?)"_ustr); } SwPaM aPaM(GetDoc().GetNodes()); - GetPositions(aPaM); + GetPositions(aPaM, ::sw::TextRangeMode::AllowNonTextNode); SwUnoCursorHelper::SetPropertyValue(aPaM, m_rPropSet, rPropertyName, rValue); } @@ -1485,12 +1485,12 @@ SwXTextRange::getPropertyValue(const OUString& rPropertyName) { SolarMutexGuard aGuard; - if (!m_pMark) + if (!m_pMark && (m_eRangePosition != RANGE_IS_SECTION || !m_pTableOrSectionFormat)) { throw uno::RuntimeException(u"range has no mark (table?)"_ustr); } SwPaM aPaM(GetDoc().GetNodes()); - GetPositions(aPaM); + GetPositions(aPaM, ::sw::TextRangeMode::AllowNonTextNode); return SwUnoCursorHelper::GetPropertyValue(aPaM, m_rPropSet, rPropertyName); } @@ -1532,12 +1532,12 @@ SwXTextRange::getPropertyState(const OUString& rPropertyName) { SolarMutexGuard aGuard; - if (!m_pMark) + if (!m_pMark && (m_eRangePosition != RANGE_IS_SECTION || !m_pTableOrSectionFormat)) { throw uno::RuntimeException(u"range has no mark (table?)"_ustr); } SwPaM aPaM(GetDoc().GetNodes()); - GetPositions(aPaM); + GetPositions(aPaM, ::sw::TextRangeMode::AllowNonTextNode); return SwUnoCursorHelper::GetPropertyState(aPaM, m_rPropSet, rPropertyName); } @@ -1547,12 +1547,12 @@ SwXTextRange::getPropertyStates(const uno::Sequence< OUString >& rPropertyName) { SolarMutexGuard g; - if (!m_pMark) + if (!m_pMark && (m_eRangePosition != RANGE_IS_SECTION || !m_pTableOrSectionFormat)) { throw uno::RuntimeException(u"range has no mark (table?)"_ustr); } SwPaM aPaM(GetDoc().GetNodes()); - GetPositions(aPaM); + GetPositions(aPaM, ::sw::TextRangeMode::AllowNonTextNode); return SwUnoCursorHelper::GetPropertyStates(aPaM, m_rPropSet, rPropertyName); } @@ -1561,12 +1561,12 @@ void SAL_CALL SwXTextRange::setPropertyToDefault(const OUString& rPropertyName) { SolarMutexGuard aGuard; - if (!m_pMark) + if (!m_pMark && (m_eRangePosition != RANGE_IS_SECTION || !m_pTableOrSectionFormat)) { throw uno::RuntimeException(u"range has no mark (table?)"_ustr); } SwPaM aPaM(GetDoc().GetNodes()); - GetPositions(aPaM); + GetPositions(aPaM, ::sw::TextRangeMode::AllowNonTextNode); SwUnoCursorHelper::SetPropertyToDefault(aPaM, m_rPropSet, rPropertyName); } @@ -1576,12 +1576,12 @@ SwXTextRange::getPropertyDefault(const OUString& rPropertyName) { SolarMutexGuard aGuard; - if (!m_pMark) + if (!m_pMark && (m_eRangePosition != RANGE_IS_SECTION || !m_pTableOrSectionFormat)) { throw uno::RuntimeException(u"range has no mark (table?)"_ustr); } SwPaM aPaM(GetDoc().GetNodes()); - GetPositions(aPaM); + GetPositions(aPaM, ::sw::TextRangeMode::AllowNonTextNode); return SwUnoCursorHelper::GetPropertyDefault(aPaM, m_rPropSet, rPropertyName); } diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index ce9f2bfb5698..54c58c112207 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; void SwXTextPortion::init(const SwUnoCursor* pPortionCursor) { - m_pUnoCursor = pPortionCursor->GetDoc().CreateUnoCursor(*pPortionCursor->GetPoint()); + m_pUnoCursor.reset(pPortionCursor->GetDoc().CreateUnoCursor(*pPortionCursor->GetPoint())); if (pPortionCursor->HasMark()) { m_pUnoCursor->SetMark(); diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index d7078e09f30b..7e84c1948768 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -317,9 +317,8 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration( const sal_Int32 nStart, const sal_Int32 nEnd, bool bOnlyTextFields) + : m_pUnoCursor(rParaCursor.GetDoc().CreateUnoCursor(*rParaCursor.GetPoint())) { - m_pUnoCursor = rParaCursor.GetDoc().CreateUnoCursor(*rParaCursor.GetPoint()); - OSL_ENSURE(nEnd == -1 || (nStart <= nEnd && nEnd <= m_pUnoCursor->Start()->GetNode().GetTextNode()->GetText().getLength()), "start or end value invalid!"); @@ -333,9 +332,9 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration( SwXTextPortionEnumeration::SwXTextPortionEnumeration( SwPaM& rParaCursor, TextRangeList_t && rPortions ) - : m_Portions( std::move(rPortions) ) + : m_Portions(std::move(rPortions)) + , m_pUnoCursor(rParaCursor.GetDoc().CreateUnoCursor(*rParaCursor.GetPoint())) { - m_pUnoCursor = rParaCursor.GetDoc().CreateUnoCursor(*rParaCursor.GetPoint()); } SwXTextPortionEnumeration::~SwXTextPortionEnumeration() diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 3d3f52d60516..d2c31d2474b7 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1454,7 +1454,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat* pFrameFormat, SwTableBox c SwDoc* pDoc = m_pFrameFormat->GetDoc(); const SwStartNode* pSttNd = pBox->GetSttNd(); SwPosition aPos(*pSttNd); - m_pUnoCursor = pDoc->CreateUnoCursor(aPos, true); + m_pUnoCursor.reset(pDoc->CreateUnoCursor(aPos, true)); m_pUnoCursor->Move( fnMoveForward, GoInNode ); SwUnoTableCursor& rTableCursor = dynamic_cast(*m_pUnoCursor); rTableCursor.MakeBoxSels(); @@ -1465,7 +1465,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat& rTableFormat, const SwTabl , m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR)) { StartListening(m_pFrameFormat->GetNotifier()); - m_pUnoCursor = pTableSelection->GetDoc().CreateUnoCursor(*pTableSelection->GetPoint(), true); + m_pUnoCursor.reset(pTableSelection->GetDoc().CreateUnoCursor(*pTableSelection->GetPoint(), true)); if(pTableSelection->HasMark()) { m_pUnoCursor->SetMark(); diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 9afe8ddca42e..ac857a806b55 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; static bool IsDocShellRegistered() { - return SvtModuleOptions().IsWriter(); + return SvtModuleOptions().IsWriterInstalled(); } SwIoDetect aFilterDetect[] = diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 85e5a8dd9525..88cef06127e7 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -497,8 +497,7 @@ SwDoc* Reader::GetTemplateDoc(SwDoc& rDoc) // we cannot create a SwDocShell. We could create a // SwWebDocShell however, because this exists always // for the help. - SvtModuleOptions aModuleOptions; - if (aModuleOptions.IsWriter()) + if (SvtModuleOptions().IsWriterInstalled()) { rtl::Reference pDocSh = new SwDocShell(SfxObjectCreateMode::INTERNAL); SfxObjectShellLock xDocSh = pDocSh.get(); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 9282b7b8c175..be46359ae39f 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -680,7 +680,8 @@ IMAGE_SETEVENT: bool bNeedWidth = (!bPercentWidth && !nWidth) || bRelWidthScale; bool bRelHeightScale = bPercentHeight && nHeight == SwFormatFrameSize::SYNCED; bool bNeedHeight = (!bPercentHeight && !nHeight) || bRelHeightScale; - if ((bNeedWidth || bNeedHeight) && !bFuzzing && allowAccessLink(*m_xDoc)) + if ((bNeedWidth || bNeedHeight) && !bFuzzing && allowAccessLink(*m_xDoc) && + !aGraphicURL.IsExoticProtocol()) { GraphicDescriptor aDescriptor(aGraphicURL); if (aDescriptor.Detect(/*bExtendedInfo=*/true)) diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index 046747754a38..7f09fd8ce8cc 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -187,24 +187,27 @@ SwHTMLWriter& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt, // unordered list:
              sOut += OOO_STRING_SVTOOLS_HTML_unorderlist; - // determine the type by the bullet character - const char *pStr = nullptr; - switch( rNumFormat.GetBulletChar() ) + if (!rWrt.mbReqIF) // No 'type' attribute in ReqIF { - case HTML_BULLETCHAR_DISC: - pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_disc; - break; - case HTML_BULLETCHAR_CIRCLE: - pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_circle; - break; - case HTML_BULLETCHAR_SQUARE: - pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_square; - break; - } + // determine the type by the bullet character + const char* pStr = nullptr; + switch (rNumFormat.GetBulletChar()) + { + case HTML_BULLETCHAR_DISC: + pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_disc; + break; + case HTML_BULLETCHAR_CIRCLE: + pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_circle; + break; + case HTML_BULLETCHAR_SQUARE: + pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_square; + break; + } - if( pStr ) - { - sOut += OString::Concat(" " OOO_STRING_SVTOOLS_HTML_O_type "=\"") + pStr + "\""; + if (pStr) + { + sOut += OString::Concat(" " OOO_STRING_SVTOOLS_HTML_O_type "=\"") + pStr + "\""; + } } } else if( SVX_NUM_BITMAP == eType ) diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index b4a277ec5df4..88a4da9e3dd3 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -377,7 +377,8 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( ErrCode SwHTMLWriter::WriteStream() { - if (!SW_MOD()) + SwModule* mod = SwModule::get(); + if (!mod) return ERRCODE_ABORT; // Intercept paste output if requested. char* pPasteEnv = getenv("SW_DEBUG_HTML_PASTE_TO"); @@ -439,7 +440,7 @@ ErrCode SwHTMLWriter::WriteStream() if( IsHTMLMode(HTMLMODE_SOME_STYLES | HTMLMODE_FULL_STYLES) ) m_nHTMLMode |= HTMLMODE_PRINT_EXT; - m_eCSS1Unit = SW_MOD()->GetMetric( m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) ); + m_eCSS1Unit = mod->GetMetric( m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) ); // Only for the MS-IE we favour the export of styles. m_bCfgPreferStyles = HTML_CFG_MSIE == m_nExportMode; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f3b5ce705242..8b0709638f3b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2214,7 +2214,7 @@ void DocxAttributeOutput::DoWriteMoveRangeTagStart(std::u16string_view bookmarkN SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo ) && !SvtSecurityOptions::IsOptionSet( SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo); - const OUString &rAuthor( SW_MOD()->GetRedlineAuthor( pRedlineData->GetAuthor() ) ); + const OUString& rAuthor(SwModule::get()->GetRedlineAuthor(pRedlineData->GetAuthor())); const DateTime& aDateTime = pRedlineData->GetTimeStamp(); bool bNoDate = bRemovePersonalInfo || ( aDateTime.GetYear() == 1970 && aDateTime.GetMonth() == 1 && aDateTime.GetDay() == 1 ); @@ -3490,6 +3490,7 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence aAttributes; rtl::Reference pAttributes = FastSerializerHelper::createAttrList(); + sal_Int32 nElements = 0; for (const auto& rElement : rElements) { @@ -3497,6 +3498,10 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence>= aAttributes; } + else + { + ++nElements; + } } for (const auto& rAttribute : aAttributes) @@ -3518,7 +3523,7 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequenceadd(*aSubElementId, aValue); } - if (rElements.size() == 0) + if (nElements == 0) { pSerializer->singleElement(aElementId, pAttributes); } @@ -4101,7 +4106,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData) SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo); OString aId( OString::number( pRedlineData->GetSeqNo() ) ); - const OUString &rAuthor( SW_MOD()->GetRedlineAuthor( pRedlineData->GetAuthor() ) ); + const OUString& rAuthor(SwModule::get()->GetRedlineAuthor(pRedlineData->GetAuthor())); const DateTime& aDateTime = pRedlineData->GetTimeStamp(); bool bNoDate = bRemovePersonalInfo || ( aDateTime.GetYear() == 1970 && aDateTime.GetMonth() == 1 && aDateTime.GetDay() == 1 ); @@ -4257,7 +4262,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData * pRedlineData, bool SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo ) && !SvtSecurityOptions::IsOptionSet( SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo); - const OUString &rAuthor( SW_MOD()->GetRedlineAuthor( pRedlineData->GetAuthor() ) ); + const OUString& rAuthor(SwModule::get()->GetRedlineAuthor(pRedlineData->GetAuthor())); OString aAuthor( OUStringToOString( bRemovePersonalInfo ? "Author" + OUString::number( GetExport().GetInfoID(rAuthor) ) : rAuthor, RTL_TEXTENCODING_UTF8 ) ); @@ -5656,11 +5661,6 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath, sa } } uno::Reference< uno::XInterface > xInterface( xObj->getComponent(), uno::UNO_QUERY ); - if (!xInterface.is()) - { - SAL_WARN("sw.ww8", "Broken math object"); - return; - } if( oox::FormulaImExportBase* formulaexport = dynamic_cast< oox::FormulaImExportBase* >( xInterface.get())) formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion(), oox::drawingml::DOCUMENT_DOCX, nAlign); @@ -9795,8 +9795,7 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad // LO does linear gradients top to bottom, while MSO does bottom to top. // LO does axial gradients inner to outer, while MSO does outer to inner. - // Conclusion: swap start and end colors. - const OString& sColor1 = sEndColor; // LO end color is MSO start color + OString sColor1 = sEndColor; // LO end color is MSO start color OString sColor2 = sStartColor; // LO start color is MSO end color switch (rGradient.GetGradientStyle()) @@ -9836,6 +9835,10 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad case css::awt::GradientStyle_RECT: AddToAttrList(m_rExport.SdrExporter().getFlyFillAttrList(), XML_type, "gradientRadial"); + // Since "focus" is not being written here, it defaults to 0. + // A zero focus triggers a swap at LO import time, so a reverse swap is needed here. + sColor1 = sStartColor; + sColor2 = sEndColor; break; default: break; diff --git a/sw/source/filter/ww8/docxtableexport.cxx b/sw/source/filter/ww8/docxtableexport.cxx index d8ee80836b0f..6a35e414a2d9 100644 --- a/sw/source/filter/ww8/docxtableexport.cxx +++ b/sw/source/filter/ww8/docxtableexport.cxx @@ -675,7 +675,7 @@ void DocxAttributeOutput::TableRowRedline( // use the same redline id in OOXML exported by MSO, but it seems, the recent solution // (different IDs for different ranges, also row changes) is also portable. OString aId(OString::number(m_nRedlineId++)); - const OUString& rAuthor(SW_MOD()->GetRedlineAuthor(aRedlineData.GetAuthor())); + const OUString& rAuthor(SwModule::get()->GetRedlineAuthor(aRedlineData.GetAuthor())); OString aAuthor(OUStringToOString( bRemovePersonalInfo ? "Author" + OUString::number(GetExport().GetInfoID(rAuthor)) : rAuthor, @@ -746,7 +746,7 @@ void DocxAttributeOutput::TableCellRedline( // use the same redline id in OOXML exported by MSO, but it seems, the recent solution // (different IDs for different ranges, also row changes) is also portable. OString aId(OString::number(m_nRedlineId++)); - const OUString& rAuthor(SW_MOD()->GetRedlineAuthor(aRedlineData.GetAuthor())); + const OUString& rAuthor(SwModule::get()->GetRedlineAuthor(aRedlineData.GetAuthor())); OString aAuthor(OUStringToOString( bRemovePersonalInfo ? "Author" + OUString::number(GetExport().GetInfoID(rAuthor)) : rAuthor, diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 7ddde4e78101..3edc159ce2ae 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -637,7 +637,7 @@ void RtfAttributeOutput::Redline(const SwRedlineData* pRedline) m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVISED); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTH); m_aRun->append(static_cast( - m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor())))); + m_rExport.GetRedline(SwModule::get()->GetRedlineAuthor(pRedline->GetAuthor())))); if (!bRemoveCommentAuthorDates) m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVDTTM); } @@ -646,7 +646,7 @@ void RtfAttributeOutput::Redline(const SwRedlineData* pRedline) m_aRun->append(OOO_STRING_SVTOOLS_RTF_DELETED); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTHDEL); m_aRun->append(static_cast( - m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor())))); + m_rExport.GetRedline(SwModule::get()->GetRedlineAuthor(pRedline->GetAuthor())))); if (!bRemoveCommentAuthorDates) m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVDTTMDEL); } @@ -4429,8 +4429,6 @@ bool RtfAttributeOutput::FlyFrameOLEMath(const SwFlyFrameFormat* pFlyFrameFormat m_aRunText->append("{" LO_STRING_SVTOOLS_RTF_MMATH " "); uno::Reference xClosable = xObj->getComponent(); - if (!xClosable.is()) - return false; auto pBase = dynamic_cast(xClosable.get()); SAL_WARN_IF(!pBase, "sw.rtf", "Math OLE object cannot write out RTF"); if (pBase) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index b8c78f828375..bdbcdbe000df 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -270,7 +270,7 @@ void RtfExport::WriteRevTab() for (SwRangeRedline* pRedl : m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()) { - GetRedline(SW_MOD()->GetRedlineAuthor(pRedl->GetAuthor())); + GetRedline(SwModule::get()->GetRedlineAuthor(pRedl->GetAuthor())); } bool bRemoveChangesInfo diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index e2c76cfaf257..1f3fa03fd962 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -744,6 +744,7 @@ namespace sw if ( rDT.GetDate() == 0 ) return 0; + // coverity[ tainted_data_return : FALSE ] version 2023.12.2 sal_uInt32 nDT = ( rDT.GetDayOfWeek() + 1 ) % 7; nDT <<= 9; nDT += ( rDT.GetYear() - 1900 ) & 0x1ff; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index db3a6b9674a9..e0b1f250db55 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2278,13 +2278,15 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) { OpenContainer( ESCHER_SpContainer ); - AddShape( ESCHER_ShpInst_Rectangle, - ShapeFlag::HaveAnchor | ShapeFlag::HaveShapeProperty | ShapeFlag::Background, - nSecondShapeId ); + const SwFrameFormat &rDefaultPageStyle = mrWrt.m_rDoc.GetPageDesc(0).GetMaster(); + const SvxBrushItem* pBrush = rDefaultPageStyle.GetItemIfSet(RES_BACKGROUND); + ShapeFlag nFlags = ShapeFlag::HaveAnchor | ShapeFlag::HaveShapeProperty; + if (pBrush) // document has background + nFlags |= ShapeFlag::Background; + AddShape(ESCHER_ShpInst_Rectangle, nFlags, nSecondShapeId); EscherPropertyContainer aPropOpt; - const SwFrameFormat &rFormat = mrWrt.m_rDoc.GetPageDesc(0).GetMaster(); - if (const SvxBrushItem* pBrush = rFormat.GetItemIfSet(RES_BACKGROUND)) + if (pBrush) { WriteBrushAttr(*pBrush, aPropOpt); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 39f195bc3d6e..6b26ce5533db 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -2222,7 +2222,7 @@ WW8_Annotation::WW8_Annotation(const SwRedlineData* pRedline) m_nRangeEnd(0), mpAuthorIDs(new SvtSecurityMapPersonalInfo) { - initPersonalInfo(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor()), u""_ustr, + initPersonalInfo(SwModule::get()->GetRedlineAuthor(pRedline->GetAuthor()), u""_ustr, pRedline->GetTimeStamp()); } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index d436a61d00d7..41ec0aaf4e46 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1684,7 +1684,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( std::size_t nId ) bool bRemovePersonalInfo = SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo) && !SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo); - OUString sName(SW_MOD()->GetRedlineAuthor(nId)); + OUString sName(SwModule::get()->GetRedlineAuthor(nId)); return m_pRedlAuthors->AddName( bRemovePersonalInfo ? "Author" + OUString::number(mpAuthorIDs->GetInfoID(sName)) : sName); } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 466e5d66e365..fd25867d8c8c 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -602,8 +602,8 @@ public: bool IsValidSel(const EditEngine& rEngine, const ESelection& rSel) { const auto nParaCount = rEngine.GetParagraphCount(); - if (rSel.nStartPara < nParaCount && rSel.nEndPara < nParaCount) - return rSel.nStartPos >= 0 && rSel.nEndPos >= 0; + if (rSel.start.nPara < nParaCount && rSel.end.nPara < nParaCount) + return rSel.start.nIndex >= 0 && rSel.end.nIndex >= 0; return false; } } @@ -685,7 +685,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, nTextStart - nStartCp)); sal_Int32 nParaCount = m_pDrawEditEngine->GetParagraphCount(); - bool bBadSelection = aReplaceSel.nStartPara >= nParaCount || aReplaceSel.nEndPara >= nParaCount; + bool bBadSelection = aReplaceSel.start.nPara >= nParaCount || aReplaceSel.end.nPara >= nParaCount; SAL_WARN_IF(bBadSelection, "sw.ww8", "editengine has different amount of text than expected"); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 0f5e7129b5f0..dc2a4ed4f77a 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -470,10 +470,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, //in tables) if (nCellLevel == m_nInTable) { - - if (!m_nInTable) - bTestAllowed = true; - else + if (m_nInTable) { if (!m_xTableDesc) { diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index d405e293658b..2a229d831a25 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1549,14 +1549,12 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, if (bRet) { rShadow.SetColor(COL_BLACK); - //i120718 + //i120718 short nVal = aRightBrc.DetermineBorderProperties(); - //End if (nVal < 0x10) nVal = 0x10; rShadow.SetWidth(nVal); rShadow.SetLocation(SvxShadowLocation::BottomRight); - bRet = true; } return bRet; } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index b0be42eab82f..6ccdf667ce20 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -191,7 +191,7 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) } sal_uInt16 const eUnit = SvXMLUnitConverter::GetMeasureUnit( - SW_MOD()->GetMetric(pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE))); + SwModule::get()->GetMetric(pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE))); if (GetMM100UnitConverter().GetXMLMeasureUnit() != eUnit ) { GetMM100UnitConverter().SetXMLMeasureUnit( eUnit ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 1838ac554570..209a468103cb 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -71,7 +71,7 @@ SwCondCollPage::SwCondCollPage(weld::Container* pPage, weld::DialogController* p m_xStyleLB->connect_changed(LINK(this, SwCondCollPage, SelectTreeListBoxHdl)); m_xFilterLB->connect_changed(LINK(this, SwCondCollPage, SelectListBoxHdl)); - std::optional xFamilies(SW_MOD()->CreateStyleFamilies()); + std::optional xFamilies(SwModule::get()->CreateStyleFamilies()); size_t nCount = xFamilies->size(); for (size_t j = 0; j < nCount; ++j) { diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index f3419cb1e968..917f18f7d7d5 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -623,7 +623,7 @@ OUString SwLoadOptPage::GetAllStrings() bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) { bool bRet = false; - SwModule* pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); sal_Int32 nNewLinkMode = AUTOMATIC; if (m_xNeverRB->get_active()) @@ -730,7 +730,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) void SwLoadOptPage::Reset( const SfxItemSet* rSet) { - const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(false); + const SwMasterUsrPref* pUsrPref = SwModule::get()->GetUsrPref(false); const SwPtrItem* pShellItem = rSet->GetItemIfSet(FN_PARAM_WRTSHELL, false); if(pShellItem) @@ -1081,7 +1081,7 @@ OUString SwCaptionOptPage::GetAllStrings() bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) { bool bRet = false; - SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); SaveEntry(m_xCheckLB->get_selected_index()); // apply current entry @@ -1177,7 +1177,7 @@ void SwCaptionOptPage::Reset( const SfxItemSet* rSet) SetOptions( nPos++, OLE_CAP, &rOleId ); } m_xLbCaptionOrder->set_active( - SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst() ? 1 : 0); + SwModule::get()->GetModuleConfig()->IsCaptionOrderNumberingFirst() ? 1 : 0); m_xLbCaptionOrder->set_sensitive(!officecfg::Office::Writer::Insert::Caption::CaptionOrderNumberingFirst::isReadOnly()); m_xLbCaptionOrderImg->set_visible(officecfg::Office::Writer::Insert::Caption::CaptionOrderNumberingFirst::isReadOnly()); m_xCheckLB->select(0); @@ -1187,7 +1187,7 @@ void SwCaptionOptPage::Reset( const SfxItemSet* rSet) void SwCaptionOptPage::SetOptions(const sal_uLong nPos, const SwCapObjType eObjType, const SvGlobalName *pOleId) { - SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); const InsCaptionOpt* pOpt = pModOpt->GetCapOption(m_bHTMLMode, eObjType, pOleId); if (pOpt) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5cb915d69785..3591ffb215ec 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -953,7 +953,7 @@ OUString SwStdFontTabPage::GetAllStrings() bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) { - SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(false); + SwModule::get()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(false); const OUString sStandard = m_xStandardBox->get_active_text(); const OUString sTitle = m_xTitleBox->get_active_text(); @@ -1475,7 +1475,7 @@ OUString SwTableOptionsTabPage::GetAllStrings() bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) { bool bRet = false; - SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); if (m_xRowMoveMF->get_value_changed_from_saved()) pModOpt->SetTableHMove( o3tl::narrowing(m_xRowMoveMF->denormalize( m_xRowMoveMF->get_value(FieldUnit::TWIP)))); @@ -1566,7 +1566,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) m_bHTMLMode = 0 != (pItem->GetValue() & HTMLMODE_ON); } - const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SfxItemState::DEFAULT ) { const SfxUInt16Item& rItem = rSet->Get( SID_ATTR_METRIC ); @@ -1744,6 +1744,9 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w , m_xFmtAidsAutoComplFrame(m_xBuilder->weld_frame(u"fmtaidsautocompleteframe"_ustr)) , m_xEncloseWithCharactersCB(m_xBuilder->weld_check_button(u"enclosewithcharacters"_ustr)) , m_xEncloseWithCharactersImg(m_xBuilder->weld_widget(u"lockenclosewithcharacters"_ustr)) + , m_xTextBoundariesCB(m_xBuilder->weld_check_button(u"cbTextBoundaries"_ustr)) + , m_xSectionBoundariesCB(m_xBuilder->weld_check_button(u"cbSectionBoundaries"_ustr)) + , m_xTableBoundariesCB(m_xBuilder->weld_check_button(u"cbTableBoundaries"_ustr)) { SwFillMode eMode = SwFillMode::Tab; bool bIsOn = false; @@ -1762,6 +1765,8 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w } m_xEncloseWithCharactersCB->set_active(bIsEncloseWithCharactersOn); + m_xTextBoundariesCB->connect_toggled(LINK(this, SwShdwCursorOptionsTabPage, TextBoundariesHdl)); + m_xDirectCursorFillMode->set_active( static_cast(eMode) ); const SfxUInt16Item* pHtmlModeItem = rSet.GetItemIfSet(SID_HTML_MODE, false); if(!pHtmlModeItem || !(pHtmlModeItem->GetValue() & HTMLMODE_ON)) @@ -1790,6 +1795,13 @@ SwShdwCursorOptionsTabPage::~SwShdwCursorOptionsTabPage() { } +IMPL_LINK_NOARG( SwShdwCursorOptionsTabPage, TextBoundariesHdl, weld::Toggleable&, void ) +{ + const bool bIsTextBoundaries(m_xTextBoundariesCB->get_active()); + m_xTextBoundariesFull->set_sensitive(bIsTextBoundaries); + m_xTextBoundariesCrop->set_sensitive(bIsTextBoundaries); +} + std::unique_ptr SwShdwCursorOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet ) { return std::make_unique(pPage, pController, *rSet); @@ -1880,6 +1892,9 @@ bool SwShdwCursorOptionsTabPage::FillItemSet( SfxItemSet* rSet ) aDisp.m_bManualBreak = m_xBreakCB->get_active(); aDisp.m_xDefaultAnchor = m_xDefaultAnchorType->get_active(); aDisp.m_bTextBoundariesFull = m_xTextBoundariesFull->get_active(); + aDisp.m_bTextBoundaries = m_xTextBoundariesCB->get_active(); + aDisp.m_bSectionBoundaries = m_xSectionBoundariesCB->get_active(); + aDisp.m_bTableBoundaries = m_xTableBoundariesCB->get_active(); bRet |= (!pOldAttr || aDisp != *pOldAttr); if(bRet) @@ -1991,10 +2006,25 @@ void SwShdwCursorOptionsTabPage::Reset( const SfxItemSet* rSet ) m_xDefaultAnchorType->set_sensitive(!bReadOnly); m_xDefaultAnchorTypeImg->set_visible(bReadOnly); + bReadOnly = officecfg::Office::Writer::Content::Display::TextBoundaries::isReadOnly(); + m_xTextBoundariesCB->set_active( pDocDisplayAttr->m_bTextBoundaries ); + m_xTextBoundariesCB->set_sensitive(!bReadOnly); + + const bool bIsTextBoundaries(m_xTextBoundariesCB->get_active()); + m_xTextBoundariesFull->set_sensitive(bIsTextBoundaries); + m_xTextBoundariesCrop->set_sensitive(bIsTextBoundaries); if (pDocDisplayAttr->m_bTextBoundariesFull) m_xTextBoundariesFull->set_active(true); else m_xTextBoundariesCrop->set_active(true); + + bReadOnly = officecfg::Office::Writer::Content::Display::SectionBoundaries::isReadOnly(); + m_xSectionBoundariesCB->set_active( pDocDisplayAttr->m_bSectionBoundaries ); + m_xSectionBoundariesCB->set_sensitive(!bReadOnly); + + bReadOnly = officecfg::Office::Writer::Content::Display::TableBoundaries::isReadOnly(); + m_xTableBoundariesCB->set_active( pDocDisplayAttr->m_bTableBoundaries ); + m_xTableBoundariesCB->set_sensitive(!bReadOnly); } } @@ -2302,7 +2332,7 @@ OUString SwRedlineOptionsTabPage::GetAllStrings() bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) { CharAttr *pAttr; - SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pOpt = SwModule::get()->GetModuleConfig(); AuthorCharAttr aInsertedAttr; AuthorCharAttr aDeletedAttr; @@ -2378,7 +2408,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) void SwRedlineOptionsTabPage::Reset( const SfxItemSet* ) { - const SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pOpt = SwModule::get()->GetModuleConfig(); const AuthorCharAttr &rInsertAttr = pOpt->GetInsertAuthorAttr(); const AuthorCharAttr &rDeletedAttr = pOpt->GetDeletedAuthorAttr(); @@ -2725,7 +2755,7 @@ OUString SwCompareOptionsTabPage::GetAllStrings() bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) { bool bRet = false; - SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pOpt = SwModule::get()->GetModuleConfig(); if( m_xAutoRB->get_state_changed_from_saved() || m_xWordRB->get_state_changed_from_saved() || @@ -2758,7 +2788,7 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) { - SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pOpt = SwModule::get()->GetModuleConfig(); SwCompareMode eCmpMode = pOpt->GetCompareMode(); if( eCmpMode == SwCompareMode::Auto ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 4a8dff5bee90..6ecdd3987211 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1003,7 +1003,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence& rSelection, break; } - const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); bool bHTML = 0 != (::GetHtmlMode( m_pView->GetDocShell() ) & HTMLMODE_ON); rSh.InsertTable( diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index c0fdbee88cd4..b674c4373f5e 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1137,7 +1137,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) const OUString sPara = m_xEditEngine->GetText( nPara ); if (!sPara.isEmpty() && !sPara.endsWith(" ")) { - ESelection aPaM(nPara, sPara.getLength(), nPara, sPara.getLength()); + ESelection aPaM(nPara, sPara.getLength()); m_xEditEngine->QuickInsertText(u" "_ustr, aPaM); } for(;;) @@ -1168,7 +1168,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) sal_Int32 nLastLen = m_xEditEngine->GetText(nParaCount - 1).getLength(); if (nLastLen) { - ESelection aPaM(nParaCount - 1, nLastLen, nParaCount - 1, nLastLen); + ESelection aPaM(nParaCount - 1, nLastLen); m_xEditEngine->QuickInsertText(u"\n \n "_ustr, aPaM); } } @@ -1182,13 +1182,13 @@ void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr ) { // insert new entry after current selected one. ESelection aSelection = m_xEditView->GetSelection(); - const sal_uInt32 nPara = aSelection.nStartPara; + const sal_uInt32 nPara = aSelection.start.nPara; std::vector aAttribList; m_xEditEngine->GetCharAttribs(nPara, aAttribList); - sal_Int32 nIndex = aSelection.nEndPara; - const EECharAttrib* pAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + sal_Int32 nIndex = aSelection.end.nPara; + const EECharAttrib* pAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if(nullptr != pAttrib) nIndex = pAttrib->nEnd; InsertNewEntryAtPosition( rStr, nPara, nIndex ); @@ -1205,7 +1205,7 @@ void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr ) void AddressMultiLineEdit::InsertNewEntryAtPosition( const OUString& rStr, sal_uLong nPara, sal_uInt16 nIndex ) { - ESelection aInsertPos(nPara, nIndex, nPara, nIndex); + ESelection aInsertPos(nPara, nIndex); m_xEditEngine->QuickInsertText(rStr, aInsertPos); //restore the attributes @@ -1221,14 +1221,14 @@ void AddressMultiLineEdit::RemoveCurrentEntry() ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); - const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if(pBeginAttrib && - (pBeginAttrib->nStart <= aSelection.nStartPos - && pBeginAttrib->nEnd >= aSelection.nEndPos)) + (pBeginAttrib->nStart <= aSelection.start.nIndex + && pBeginAttrib->nEnd >= aSelection.end.nIndex)) { - const sal_uInt32 nPara = aSelection.nStartPara; + const sal_uInt32 nPara = aSelection.start.nPara; ESelection aEntrySel(nPara, pBeginAttrib->nStart, nPara, pBeginAttrib->nEnd); m_xEditEngine->QuickInsertText(OUString(), aEntrySel); //restore the attributes @@ -1242,16 +1242,16 @@ void AddressMultiLineEdit::MoveCurrentItem(MoveItemFlags nMove) ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); - const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if(!pBeginAttrib || - pBeginAttrib->nStart > aSelection.nStartPos || - pBeginAttrib->nEnd < aSelection.nEndPos) + pBeginAttrib->nStart > aSelection.start.nIndex || + pBeginAttrib->nEnd < aSelection.end.nIndex) return; //current item has been found - sal_Int32 nPara = aSelection.nStartPara; + sal_Int32 nPara = aSelection.start.nPara; sal_Int32 nIndex = pBeginAttrib->nStart; ESelection aEntrySel(nPara, pBeginAttrib->nStart, nPara, pBeginAttrib->nEnd); const OUString sCurrentItem = m_xEditEngine->GetText(aEntrySel); @@ -1279,7 +1279,7 @@ void AddressMultiLineEdit::MoveCurrentItem(MoveItemFlags nMove) { //go right to find a successor or simple text ++nIndex; - const EECharAttrib* pEndAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pEndAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if(pEndAttrib && pEndAttrib->nEnd >= nIndex) { nIndex = pEndAttrib->nEnd; @@ -1301,7 +1301,7 @@ void AddressMultiLineEdit::MoveCurrentItem(MoveItemFlags nMove) { auto nInsPara = nPara - 1; auto nInsPos = m_xEditEngine->GetTextLen( nPara - 1 ); - ESelection aTemp(nInsPara, nInsPos, nInsPara, nInsPos); + ESelection aTemp(nInsPara, nInsPos); m_xEditEngine->QuickInsertText(u"\n"_ustr, aTemp); } InsertNewEntryAtPosition( sCurrentItem, nPara, nIndex ); @@ -1322,18 +1322,18 @@ MoveItemFlags AddressMultiLineEdit::IsCurrentItemMoveable() const ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); - const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if (pBeginAttrib && - (pBeginAttrib->nStart <= aSelection.nStartPos - && pBeginAttrib->nEnd >= aSelection.nEndPos)) + (pBeginAttrib->nStart <= aSelection.start.nIndex + && pBeginAttrib->nEnd >= aSelection.end.nIndex)) { if (pBeginAttrib->nStart) nRet |= MoveItemFlags::Left; //if there is an entry it can always be move to the right and down nRet |= MoveItemFlags::Right | MoveItemFlags::Down; - if (aSelection.nStartPara > 0) + if (aSelection.start.nPara > 0) nRet |= MoveItemFlags::Up; } return nRet; @@ -1344,12 +1344,12 @@ bool AddressMultiLineEdit::HasCurrentItem() const ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); - const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); return (pBeginAttrib && - (pBeginAttrib->nStart <= aSelection.nStartPos - && pBeginAttrib->nEnd >= aSelection.nEndPos)); + (pBeginAttrib->nStart <= aSelection.start.nIndex + && pBeginAttrib->nEnd >= aSelection.end.nIndex)); } OUString AddressMultiLineEdit::GetCurrentItem() const @@ -1357,14 +1357,14 @@ OUString AddressMultiLineEdit::GetCurrentItem() const ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); - const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if (pBeginAttrib && - (pBeginAttrib->nStart <= aSelection.nStartPos - && pBeginAttrib->nEnd >= aSelection.nEndPos)) + (pBeginAttrib->nStart <= aSelection.start.nIndex + && pBeginAttrib->nEnd >= aSelection.end.nIndex)) { - const sal_uInt32 nPara = aSelection.nStartPara; + const sal_uInt32 nPara = aSelection.start.nPara; ESelection aEntrySel(nPara, pBeginAttrib->nStart, nPara, pBeginAttrib->nEnd); return m_xEditEngine->GetText( aEntrySel ); } @@ -1376,14 +1376,14 @@ void AddressMultiLineEdit::SelectCurrentItem() ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); - const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.nStartPos, aAttribList); + const EECharAttrib* pBeginAttrib = FindCharAttrib(aSelection.start.nIndex, aAttribList); if (pBeginAttrib && - (pBeginAttrib->nStart <= aSelection.nStartPos - && pBeginAttrib->nEnd >= aSelection.nEndPos)) + (pBeginAttrib->nStart <= aSelection.start.nIndex + && pBeginAttrib->nEnd >= aSelection.end.nIndex)) { - const sal_uInt32 nPara = aSelection.nStartPara; + const sal_uInt32 nPara = aSelection.start.nPara; ESelection aEntrySel(nPara, pBeginAttrib->nStart, nPara, pBeginAttrib->nEnd); m_xEditView->SetSelection(aEntrySel); Invalidate(); @@ -1577,8 +1577,8 @@ bool AddressMultiLineEdit::SetCursorLogicPosition(const Point& rPosition) ESelection aSelection = m_xEditView->GetSelection(); std::vector aAttribList; - m_xEditEngine->GetCharAttribs(aSelection.nStartPara, aAttribList); - return FindCharAttrib(aSelection.nStartPos, aAttribList) == nullptr; + m_xEditEngine->GetCharAttribs(aSelection.start.nPara, aAttribList); + return FindCharAttrib(aSelection.start.nIndex, aAttribList) == nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 4893d1df86db..ab4b32cb7f53 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -213,7 +213,7 @@ SwMailMergeDlg::SwMailMergeDlg(weld::Window* pParent, SwWrtShell& rShell, } } - m_pModOpt = SW_MOD()->GetModuleConfig(); + m_pModOpt = SwModule::get()->GetModuleConfig(); MailTextFormats nMailingMode(m_pModOpt->GetMailingFormats()); m_xFormatSwCB->set_active(bool(nMailingMode & MailTextFormats::OFFICE)); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 99af2899746b..1a4bfebaca4c 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -515,7 +515,7 @@ void SwFieldDBPage::ActivateMailMergeAddress() { m_xTypeLB->select_id(OUString::number(static_cast(SwFieldTypesEnum::Database))); TypeListBoxHdl(*m_xTypeLB); - const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource(); + const SwDBData& rData = SwModule::get()->GetDBConfig()->GetAddressSource(); m_xDatabaseTLB->Select(rData.sDataSource, rData.sCommand, u""); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 40f9dd5e4100..292ac69838a2 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -95,7 +95,7 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV) , m_rView(rV) , m_pMgr(new SwFieldMgr(m_rView.GetWrtShellPtr())) , m_bCopyAttributes(false) - , m_bOrderNumberingFirst(SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst()) + , m_bOrderNumberingFirst(SwModule::get()->GetModuleConfig()->IsCaptionOrderNumberingFirst()) , m_xTextEdit(m_xBuilder->weld_entry(u"caption_edit"_ustr)) , m_xCategoryBox(m_xBuilder->weld_combo_box(u"category"_ustr)) , m_xFormatText(m_xBuilder->weld_label(u"numbering_label"_ustr)) @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SwCaptionDialog, OptionHdl, weld::Button&, void) if( m_bOrderNumberingFirst != pDlg->IsOrderNumberingFirst() ) { m_bOrderNumberingFirst = pDlg->IsOrderNumberingFirst(); - SW_MOD()->GetModuleConfig()->SetCaptionOrderNumberingFirst(m_bOrderNumberingFirst); + SwModule::get()->GetModuleConfig()->SetCaptionOrderNumberingFirst(m_bOrderNumberingFirst); ApplyCaptionOrder(); } DrawSample(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e2773bd6d363..d083d7a59e65 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -282,14 +282,14 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet SetCurPageId(u"index"_ustr); m_xShowExampleCB->connect_toggled(LINK(this, SwMultiTOXTabDialog, ShowPreviewHdl)); - m_xShowExampleCB->set_active(SW_MOD()->GetModuleConfig()->IsShowIndexPreview()); + m_xShowExampleCB->set_active(SwModule::get()->GetModuleConfig()->IsShowIndexPreview()); ShowPreview(); } SwMultiTOXTabDialog::~SwMultiTOXTabDialog() { - SW_MOD()->GetModuleConfig()->SetShowIndexPreview(m_xShowExampleCB->get_active()); + SwModule::get()->GetModuleConfig()->SetShowIndexPreview(m_xShowExampleCB->get_active()); } void SwMultiTOXTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index f1dbbce9f112..90b1c08acc41 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -132,7 +132,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) if (nOffset == USHRT_MAX) nOffset = 0; - FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(dynamic_cast< const SwWebDocShell*>( + FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(dynamic_cast< const SwWebDocShell*>( rVw.GetDocShell()) != nullptr)->GetMetric(); ::SetFieldUnit(*m_xOffsetMF, eFieldUnit); m_xOffsetMF->set_value(m_xOffsetMF->normalize(nOffset), FieldUnit::TWIP); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 92bfbbeaab88..c3a92f33131d 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -144,7 +144,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(weld::Window* pParent, const SfxItemSet* SwWrtShell &rSh) : SfxTabDialogController(pParent, u"modules/swriter/ui/outlinenumbering.ui"_ustr, u"OutlineNumberingDialog"_ustr, pSwItemSet) , m_rWrtSh(rSh) - , m_pChapterNumRules(SW_MOD()->GetChapterNumRules()) + , m_pChapterNumRules(SwModule::get()->GetChapterNumRules()) , m_bModified(m_rWrtSh.IsModified()) , m_xMenuButton(m_xBuilder->weld_menu_button(u"format"_ustr)) { diff --git a/sw/source/ui/table/autoformatpreview.cxx b/sw/source/ui/table/autoformatpreview.cxx index 2f728d9bba7c..cb999155cc81 100644 --- a/sw/source/ui/table/autoformatpreview.cxx +++ b/sw/source/ui/table/autoformatpreview.cxx @@ -436,7 +436,8 @@ void AutoFormatPreview::Paint(vcl::RenderContext& rRenderContext, const tools::R { rRenderContext.Push(vcl::PushFlags::ALL); - const Color& rWinColor = SW_MOD()->GetColorConfig().GetColorValue(::svtools::DOCCOLOR).nColor; + const Color& rWinColor + = SwModule::get()->GetColorConfig().GetColorValue(::svtools::DOCCOLOR).nColor; rRenderContext.SetBackground(Wallpaper(rWinColor)); rRenderContext.Erase(); diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 11c935953ccf..67a6bd7bfbfc 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -44,7 +44,7 @@ SwTableWidthDlg::SwTableWidthDlg(weld::Window *pParent, SwWrtShell *pShell) bool bIsWeb = m_xFnc->GetShell() && (dynamic_cast< const SwWebDocShell* >( m_xFnc->GetShell()->GetView().GetDocShell()) != nullptr ); - FieldUnit eFieldUnit = SW_MOD()->GetUsrPref( bIsWeb )->GetMetric(); + FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(bIsWeb)->GetMetric(); ::SetFieldUnit(*m_xWidthMF, eFieldUnit); m_xColNF->set_max(m_xFnc->GetColCount() + 1); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index c6ff833166a3..32f2d9323acb 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -173,7 +173,7 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) m_xOtherBtn->connect_toggled(aLk); m_xOtherEd->set_sensitive(m_xOtherBtn->get_active()); - const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell()) & HTMLMODE_ON); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 2bdd6c7cac50..5a38be0efea9 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -96,7 +96,7 @@ SwInsTableDlg::SwInsTableDlg(SwView& rView) m_xInsertBtn->connect_clicked(LINK(this, SwInsTableDlg, OKHdl)); bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON); - const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); SwInsertTableOptions aInsOpts = pModOpt->GetInsTableFlags(bHTMLMode); SwInsertTableFlags nInsTableFlags = aInsOpts.mnInsMode; diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 6b950bc6e136..89506d1304a2 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -47,7 +47,7 @@ SwTableHeightDlg::SwTableHeightDlg(weld::Window *pParent, SwWrtShell &rS) , m_xHeightEdit(m_xBuilder->weld_metric_spin_button(u"heightmf"_ustr, FieldUnit::CM)) , m_xAutoHeightCB(m_xBuilder->weld_check_button(u"fit"_ustr)) { - FieldUnit eFieldUnit = SW_MOD()->GetUsrPref( dynamic_cast< const SwWebDocShell*>( + FieldUnit eFieldUnit = SwModule::get()->GetUsrPref( dynamic_cast< const SwWebDocShell*>( m_rSh.GetView().GetDocShell() ) != nullptr )->GetMetric(); ::SetFieldUnit(*m_xHeightEdit, eFieldUnit); diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index ac519b9d7afd..1d1c8ef03806 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -90,7 +90,7 @@ SwVbaApplication::AddSink( const uno::Reference< XSink >& xSink ) SwGlobals::ensure(); } // No harm in potentially calling this several times - SW_MOD()->RegisterAutomationApplicationEventsCaller( uno::Reference< XSinkCaller >(this) ); + SwModule::get()->RegisterAutomationApplicationEventsCaller(uno::Reference(this)); mvSinks.push_back(xSink); return mvSinks.size(); } diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 63a2c8f08a9e..4bbd44ce78b1 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -215,9 +215,9 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) } SwWait aWait( *this, true ); + SwModule* mod = SwModule::get(); // Suppress SfxProgress, when we are Embedded - SW_MOD()->SetEmbeddedLoadSave( - SfxObjectCreateMode::EMBEDDED == GetCreateMode() ); + mod->SetEmbeddedLoadSave(SfxObjectCreateMode::EMBEDDED == GetCreateMode()); pRdr->GetDoc().getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, dynamic_cast< const SwWebDocShell *>( this ) != nullptr); @@ -243,7 +243,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) pRdr.reset(); - SW_MOD()->SetEmbeddedLoadSave( false ); + mod->SetEmbeddedLoadSave(false); SetError(nErr); bool bOk = !nErr.IsError(); @@ -280,6 +280,7 @@ bool SwDocShell::Save() ErrCode nVBWarning = ERRCODE_NONE; if( SfxObjectShell::Save() ) { + SwModule* mod = SwModule::get(); switch( GetCreateMode() ) { case SfxObjectCreateMode::INTERNAL: @@ -299,7 +300,7 @@ bool SwDocShell::Save() case SfxObjectCreateMode::EMBEDDED: // Suppress SfxProgress, if we are Embedded - SW_MOD()->SetEmbeddedLoadSave( true ); + mod->SetEmbeddedLoadSave(true); [[fallthrough]]; case SfxObjectCreateMode::STANDARD: @@ -334,7 +335,7 @@ bool SwDocShell::Save() } break; } - SW_MOD()->SetEmbeddedLoadSave( false ); + mod->SetEmbeddedLoadSave(false); } SetError(nErr ? nErr : nVBWarning); @@ -527,9 +528,9 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) Link aOldOLELnk( m_xDoc->GetOle2Link() ); m_xDoc->SetOle2Link( Link() ); + SwModule* mod = SwModule::get(); // Suppress SfxProgress when we are Embedded - SW_MOD()->SetEmbeddedLoadSave( - SfxObjectCreateMode::EMBEDDED == GetCreateMode() ); + mod->SetEmbeddedLoadSave(SfxObjectCreateMode::EMBEDDED == GetCreateMode()); WriterRef xWrt; ::GetXMLWriter(std::u16string_view(), rMedium.GetBaseURL(true), xWrt); @@ -554,7 +555,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) } m_xDoc->SetOle2Link( aOldOLELnk ); - SW_MOD()->SetEmbeddedLoadSave( false ); + mod->SetEmbeddedLoadSave(false); // Increase RSID m_xDoc->setRsid( m_xDoc->getRsid() ); @@ -752,9 +753,9 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) xWriter->SetAsciiOptions( aOpt ); } + SwModule* mod = SwModule::get(); // Suppress SfxProgress when we are Embedded - SW_MOD()->SetEmbeddedLoadSave( - SfxObjectCreateMode::EMBEDDED == GetCreateMode()); + mod->SetEmbeddedLoadSave(SfxObjectCreateMode::EMBEDDED == GetCreateMode()); // Span Context in order to suppress the Selection's View ErrCodeMsg nErrno; @@ -804,7 +805,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) } } - SW_MOD()->SetEmbeddedLoadSave( false ); + mod->SetEmbeddedLoadSave(false); SetError(nErrno ? nErrno : nVBWarning); if( !rMedium.IsStorage() ) rMedium.CloseOutStream(); @@ -879,7 +880,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, pDev->SetBackground(); const bool bWeb = dynamic_cast< const SwWebDocShell *>( this ) != nullptr; SwPrintData aOpts; - SwViewShell::PrtOle2(m_xDoc.get(), SW_MOD()->GetUsrPref(bWeb), aOpts, *pDev, aRect, bOutputForScreen); + SwViewShell::PrtOle2(m_xDoc.get(), SwModule::get()->GetUsrPref(bWeb), aOpts, *pDev, aRect, bOutputForScreen); pDev->Pop(); if( pOrig ) @@ -1040,11 +1041,8 @@ void SwDocShell::GetState(SfxItemSet& rSet) case FN_ABSTRACT_STARIMPRESS: case FN_OUTLINE_TO_IMPRESS: - { - SvtModuleOptions aMOpt; - if (!aMOpt.IsImpress() || GetObjectShell()->isExportLocked()) - rSet.DisableItem( nWhich ); - } + if (!SvtModuleOptions().IsImpressInstalled() || GetObjectShell()->isExportLocked()) + rSet.DisableItem(nWhich); [[fallthrough]]; case FN_ABSTRACT_NEWDOC: case FN_OUTLINE_TO_CLIPBOARD: @@ -1183,7 +1181,7 @@ void SwDocShell::SetView(SwView* pVw) // Set view-specific redline author. const OUString& rRedlineAuthor = m_pView->GetRedlineAuthor(); if (!rRedlineAuthor.isEmpty()) - SW_MOD()->SetRedlineAuthor(m_pView->GetRedlineAuthor()); + SwModule::get()->SetRedlineAuthor(m_pView->GetRedlineAuthor()); } else m_pWrtShell = nullptr; diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index a252737fa8a4..733121e9dd0e 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -252,7 +252,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) case SfxEventHintId::OpenDoc: { uno::Sequence< css::uno::Any > aArgs; - SW_MOD()->CallAutomationApplicationEventSinks( u"DocumentChange"_ustr, aArgs ); + SwModule::get()->CallAutomationApplicationEventSinks(u"DocumentChange"_ustr, aArgs); break; } default: @@ -266,7 +266,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Any aDocument; aDocument <<= mxAutomationDocumentObject; uno::Sequence< uno::Any > aArgs{ aDocument }; - SW_MOD()->CallAutomationApplicationEventSinks( u"NewDocument"_ustr, aArgs ); + SwModule::get()->CallAutomationApplicationEventSinks( u"NewDocument"_ustr, aArgs ); } break; case SfxEventHintId::OpenDoc: @@ -274,7 +274,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Any aDocument; aDocument <<= mxAutomationDocumentObject; uno::Sequence< uno::Any > aArgs{ aDocument }; - SW_MOD()->CallAutomationApplicationEventSinks( u"DocumentOpen"_ustr, aArgs ); + SwModule::get()->CallAutomationApplicationEventSinks( u"DocumentOpen"_ustr, aArgs ); } break; default: @@ -365,7 +365,7 @@ bool SwDocShell::PrepareClose( bool bUI ) uno::Any(false) }; - SW_MOD()->CallAutomationApplicationEventSinks( u"DocumentBeforeClose"_ustr, aArgs ); + SwModule::get()->CallAutomationApplicationEventSinks(u"DocumentBeforeClose"_ustr, aArgs); // If the Cancel argument was set to True by an event handler, return false. bool bCancel(false); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 8605ce7fba92..90d9629b1d2f 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -105,6 +105,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) if ( GetCreateMode() == SfxObjectCreateMode::EMBEDDED ) SwTransferable::InitOle( this ); + SwModule* mod = SwModule::get(); // set forbidden characters if necessary const bool bFuzzing = comphelper::IsFuzzing(); if (!bFuzzing) @@ -120,14 +121,14 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::KERN_ASIAN_PUNCTUATION, !SvxAsianConfig::IsKerningWesternTextOnly()); m_xDoc->getIDocumentSettingAccess().setCharacterCompressionType(SvxAsianConfig::GetCharDistanceCompression()); - m_xDoc->getIDocumentDeviceAccess().setPrintData(*SW_MOD()->GetPrtOptions(bWeb)); + m_xDoc->getIDocumentDeviceAccess().setPrintData(*mod->GetPrtOptions(bWeb)); } SubInitNew(); // for all - SwStdFontConfig* pStdFont = SW_MOD()->GetStdFontConfig(); + SwStdFontConfig* pStdFont = mod->GetStdFontConfig(); SfxPrinter* pPrt = m_xDoc->getIDocumentDeviceAccess().getPrinter( false ); OUString sEntry; @@ -287,7 +288,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // (old documents, where this property was not yet implemented, will get the // value 'false' in the SwDoc c-tor) m_xDoc->getIDocumentSettingAccess().set( DocumentSettingId::MATH_BASELINE_ALIGNMENT, - SW_MOD()->GetUsrPref( bWeb )->IsAlignMathObjectsToBaseline() ); + mod->GetUsrPref( bWeb )->IsAlignMathObjectsToBaseline() ); m_xDoc->getIDocumentSettingAccess().set( DocumentSettingId::FOOTNOTE_IN_COLUMN_TO_PAGEEND, true); } @@ -381,7 +382,7 @@ SwDocShell::~SwDocShell() void SwDocShell::Init_Impl() { - SetPool(&SW_MOD()->GetPool()); + SetPool(&SwModule::get()->GetPool()); SetBaseModel(new SwXTextDocument(this)); // we, as BroadCaster also become our own Listener // (for DocInfo/FileNames/...) @@ -497,6 +498,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; } + SwModule* mod = SwModule::get(); SwWait aWait( *this, true ); ErrCodeMsg nErr = ERR_SWG_READ_ERROR; switch( GetCreateMode() ) @@ -519,7 +521,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) SwTransferable::InitOle( this ); } // suppress SfxProgress, when we are Embedded - SW_MOD()->SetEmbeddedLoadSave( true ); + mod->SetEmbeddedLoadSave( true ); [[fallthrough]]; case SfxObjectCreateMode::STANDARD: @@ -568,7 +570,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) } // suppress SfxProgress, when we are Embedded - SW_MOD()->SetEmbeddedLoadSave( false ); + mod->SetEmbeddedLoadSave( false ); } return bRet; @@ -669,7 +671,7 @@ void SwDocShell::SubInitNew() aDfltSet.Put( aHyp ); - sal_uInt16 nNewPos = o3tl::toTwips(SW_MOD()->GetUsrPref(false)->GetDefTabInMm100(), o3tl::Length::mm100); + sal_uInt16 nNewPos = o3tl::toTwips(SwModule::get()->GetUsrPref(false)->GetDefTabInMm100(), o3tl::Length::mm100); if( nNewPos ) aDfltSet.Put( SvxTabStopItem( 1, nNewPos, SvxTabAdjust::Default, RES_PARATR_TABSTOP ) ); @@ -681,7 +683,7 @@ void SwDocShell::SubInitNew() //default page mode for text grid if(!bWeb) { - bool bSquaredPageMode = SW_MOD()->GetUsrPref(false)->IsSquaredPageMode(); + bool bSquaredPageMode = SwModule::get()->GetUsrPref(false)->IsSquaredPageMode(); m_xDoc->SetDefaultPageMode( bSquaredPageMode ); // only set Widow/Orphan defaults on a new, non-web document - not an opened one diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 6bc5e0b56ae2..ecdb14726e37 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -695,7 +695,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void) aUsrPref.SetKeepRatio(pBoolItem->GetValue()); if (pBoolItem->GetValue() != pVOpt->IsKeepRatio()) { - SW_MOD()->ApplyUsrPref(aUsrPref, &pWrtShell->GetView()); + SwModule::get()->ApplyUsrPref(aUsrPref, &pWrtShell->GetView()); } } } @@ -984,7 +984,7 @@ void SwDocShell::Edit( PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode)); FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode)); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); if (!pDialogParent) { diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx index 7c21797f8e3d..fce2d12970a1 100644 --- a/sw/source/uibase/app/mainwn.cxx +++ b/sw/source/uibase/app/mainwn.cxx @@ -52,7 +52,7 @@ static SwProgress *lcl_SwFindProgress( SwDocShell const *pDocShell ) void StartProgress( TranslateId pMessResId, tools::Long nStartValue, tools::Long nEndValue, SwDocShell *pDocShell ) { - if( SW_MOD()->IsEmbeddedLoadSave() ) + if (SwModule::get()->IsEmbeddedLoadSave()) return; SwProgress *pProgress = nullptr; @@ -81,7 +81,7 @@ void StartProgress( TranslateId pMessResId, tools::Long nStartValue, tools::Long void SetProgressState( tools::Long nPosition, SwDocShell const *pDocShell ) { - if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) + if (pProgressContainer && !SwModule::get()->IsEmbeddedLoadSave()) { SwProgress *pProgress = lcl_SwFindProgress( pDocShell ); if ( pProgress ) @@ -91,7 +91,7 @@ void SetProgressState( tools::Long nPosition, SwDocShell const *pDocShell ) void EndProgress( SwDocShell const *pDocShell ) { - if( !pProgressContainer || SW_MOD()->IsEmbeddedLoadSave() ) + if (!pProgressContainer || SwModule::get()->IsEmbeddedLoadSave()) return; SwProgress *pProgress = nullptr; @@ -122,7 +122,7 @@ void EndProgress( SwDocShell const *pDocShell ) void RescheduleProgress( SwDocShell const *pDocShell ) { - if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) + if (pProgressContainer && !SwModule::get()->IsEmbeddedLoadSave()) { SwProgress *pProgress = lcl_SwFindProgress( pDocShell ); if ( pProgress ) diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index ec258cac6dd6..a0d0d35773dd 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -86,12 +86,12 @@ SwDLL::SwDLL() if ( SfxApplication::GetModule(SfxToolsModule::Writer) ) // Module already active return; - std::unique_ptr xOpt; + std::optional oOpt; if (!comphelper::IsFuzzing()) - xOpt.reset(new SvtModuleOptions); + oOpt.emplace(); SfxObjectFactory* pDocFact = nullptr; SfxObjectFactory* pGlobDocFact = nullptr; - if (!xOpt || xOpt->IsWriter()) + if (!oOpt || oOpt->IsWriterInstalled()) { pDocFact = &SwDocShell::Factory(); pGlobDocFact = &SwGlobalDocShell::Factory(); @@ -105,7 +105,7 @@ SwDLL::SwDLL() pWDocFact->SetDocumentServiceName(u"com.sun.star.text.WebDocument"_ustr); - if (!xOpt || xOpt->IsWriter()) + if (!oOpt || oOpt->IsWriterInstalled()) { pGlobDocFact->SetDocumentServiceName(u"com.sun.star.text.GlobalDocument"_ustr); pDocFact->SetDocumentServiceName(u"com.sun.star.text.TextDocument"_ustr); @@ -156,7 +156,7 @@ SwDLL::~SwDLL() COVERITY_NOEXCEPT_FALSE } // Pool has to be deleted before statics are - SW_MOD()->RemoveAttrPool(); + SwModule::get()->RemoveAttrPool(); ::FinitUI(); m_pFilters.reset(); diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index be12a460ab6d..96bde7096a1b 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -432,15 +432,15 @@ static Color lcl_GetAuthorColor(std::size_t nPos) // same as SwPostItMgr::GetColorAnchor() switch (nPos % 9) { - case 0: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR1).nColor; - case 1: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR2).nColor; - case 2: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR3).nColor; - case 3: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR4).nColor; - case 4: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR5).nColor; - case 5: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR6).nColor; - case 6: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR7).nColor; - case 7: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR8).nColor; - case 8: return SW_MOD()->GetColorConfig().GetColorValue(svtools::AUTHOR9).nColor; + case 0: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR1).nColor; + case 1: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR2).nColor; + case 2: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR3).nColor; + case 3: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR4).nColor; + case 4: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR5).nColor; + case 5: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR6).nColor; + case 6: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR7).nColor; + case 7: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR8).nColor; + case 8: return SwModule::get()->GetColorConfig().GetColorValue(svtools::AUTHOR9).nColor; default: return COL_AUTO; // silence -Wreturn-type } } diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 001f9fe25fe8..98d4364fcdd9 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -168,12 +168,12 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, OUString SwResId(TranslateId aId) { - return Translate::get(aId, SW_MOD()->GetResLocale()); + return Translate::get(aId, SwModule::get()->GetResLocale()); } OUString SwResId(TranslateNId aContextSingularPlural, int nCardinality) { - return Translate::nget(aContextSingularPlural, nCardinality, SW_MOD()->GetResLocale()); + return Translate::nget(aContextSingularPlural, nCardinality, SwModule::get()->GetResLocale()); } uno::Reference< scanner::XScannerManager2 > const & @@ -212,13 +212,14 @@ void SwDLL::RegisterFactories() { // These Id's must not be changed. Through these Id's the View (resume Documentview) // is created by Sfx. - if (comphelper::IsFuzzing() || SvtModuleOptions().IsWriter()) + SvtModuleOptions aOptions; + if (comphelper::IsFuzzing() || aOptions.IsWriterInstalled()) SwView::RegisterFactory ( SFX_INTERFACE_SFXDOCSH ); #if HAVE_FEATURE_DESKTOP SwWebView::RegisterFactory ( SFX_INTERFACE_SFXMODULE ); - if (comphelper::IsFuzzing() || SvtModuleOptions().IsWriter()) + if (comphelper::IsFuzzing() || aOptions.IsWriterInstalled()) { SwSrcView::RegisterFactory ( SfxInterfaceId(6) ); SwPagePreview::RegisterFactory ( SfxInterfaceId(7) ); @@ -228,7 +229,7 @@ void SwDLL::RegisterFactories() void SwDLL::RegisterInterfaces() { - SwModule* pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); SwModule::RegisterInterface( pMod ); SwDocShell::RegisterInterface( pMod ); SwWebDocShell::RegisterInterface( pMod ); @@ -265,7 +266,7 @@ void SwDLL::RegisterInterfaces() void SwDLL::RegisterControls() { - SwModule* pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); SvxTbxCtlDraw::RegisterControl(SID_TRACK_CHANGES_BAR, pMod ); diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index 5018e1d0fbfa..33791054fe3a 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -34,7 +34,10 @@ SwDocDisplayItem::SwDocDisplayItem() : m_bCharHiddenText = m_bBookmarks = m_bManualBreak = true; + m_bTextBoundaries = true; m_bTextBoundariesFull = false; // default is crop + m_bSectionBoundaries = true; + m_bTableBoundaries = true; m_xDefaultAnchor = 1; //FLY_TO_CHAR }; @@ -50,7 +53,10 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt ) : m_bCharHiddenText = rVOpt.IsShowHiddenChar(true); m_bBookmarks = rVOpt.IsShowBookmarks(true); m_bManualBreak = rVOpt.IsLineBreak(true); + m_bTextBoundaries = rVOpt.IsTextBoundaries(); m_bTextBoundariesFull = rVOpt.IsTextBoundariesFull(); + m_bSectionBoundaries = rVOpt.IsSectionBoundaries(); + m_bTableBoundaries = rVOpt.IsTableBoundaries(); m_xDefaultAnchor = rVOpt.GetDefaultAnchor(); } @@ -73,7 +79,10 @@ bool SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const m_bCharHiddenText == rItem.m_bCharHiddenText && m_bBookmarks == rItem.m_bBookmarks && m_bManualBreak == rItem.m_bManualBreak && + m_bTextBoundaries == rItem.m_bTextBoundaries && m_bTextBoundariesFull == rItem.m_bTextBoundariesFull && + m_bSectionBoundaries == rItem.m_bSectionBoundaries && + m_bTableBoundaries == rItem.m_bTableBoundaries && m_xDefaultAnchor == rItem.m_xDefaultAnchor); } @@ -87,7 +96,10 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetShowHiddenChar(m_bCharHiddenText ); rVOpt.SetShowBookmarks(m_bBookmarks ); rVOpt.SetLineBreak (m_bManualBreak ); + rVOpt.SetTextBoundaries(m_bTextBoundaries); rVOpt.SetTextBoundariesFull(m_bTextBoundariesFull); + rVOpt.SetSectionBoundaries(m_bSectionBoundaries); + rVOpt.SetTableBoundaries(m_bTableBoundaries); rVOpt.SetDefaultAnchor( m_xDefaultAnchor ); } diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 795a678412e1..0dd805faf57d 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -75,9 +75,7 @@ SwMasterUsrPref::SwMasterUsrPref(bool bWeb) : m_eUserMetric = MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH; m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric; - m_aContentConfig.Load(); m_aLayoutConfig.Load(); - m_aGridConfig.Load(); m_aCursorConfig.Load(); if(m_pWebColorConfig) m_pWebColorConfig->Load(); @@ -125,8 +123,12 @@ Sequence SwContentViewConfig::GetPropertyNames() const "Display/DefaultAnchor", // 25 "Zoom/DefaultZoom", // 26 "Zoom/ZoomType", // 27 - "Zoom/ZoomValue", //28 - "Display/TextBoundaries" // 29 + "Zoom/ZoomValue", // 28 + "Display/TextBoundaries", // 29 + "Display/TextBoundariesFull", // 30 + "Display/SectionBoundaries", // 31 + "Display/TableBoundaries", // 32 + "Display/ShowBoundaries" // 33 }; #if defined(__GNUC__) && !defined(__clang__) // clang 8.0.0 says strcmp isn't constexpr @@ -205,7 +207,11 @@ void SwContentViewConfig::ImplCommit() case 26: bVal = m_rParent.IsDefaultZoom(); break;// "Zoom/DefaultZoom" case 27:pValues[nProp] <<= static_cast(m_rParent.GetDefaultZoomType()); break; // "Zoom/ZoomType" case 28: pValues[nProp] <<= static_cast(m_rParent.GetDefaultZoomValue()); break; // "Zoom/ZoomValue" - case 29: bVal = m_rParent.IsTextBoundariesFull(); break; // "Display/TextBoundaries" + case 29: bVal = m_rParent.IsTextBoundaries(); break; // "Display/TextBoundaries" + case 30: bVal = m_rParent.IsTextBoundariesFull(); break; // "Display/TextBoundariesFull" + case 31: bVal = m_rParent.IsSectionBoundaries(); break; // "Display/SectionBoundaries" + case 32: bVal = m_rParent.IsTableBoundaries(); break; // "Display/TableBoundaries" + case 33: bVal = m_rParent.IsShowBoundaries(); break; // "Display/ShowBoundaries" } if ((nProp != g_UpdateLinkIndex) && (nProp != g_DefaultAnchor) && (nProp != g_ZoomType) && (nProp != g_ZoomValue)) @@ -283,7 +289,11 @@ void SwContentViewConfig::Load() m_rParent.SetDefaultZoomValue(static_cast(nSet), true); } break; //"Zoom/ZoomValue" // 28 - case 29: m_rParent.SetTextBoundariesFull(bSet); break; //"Display/TextBoundaries" // 29 + case 29: m_rParent.SetTextBoundaries(bSet); break; //"Display/TextBoundaries" + case 30: m_rParent.SetTextBoundariesFull(bSet); break; //"Display/TextBoundariesFull" + case 31: m_rParent.SetSectionBoundaries(bSet); break; //"Display/SectionBoundaries" + case 32: m_rParent.SetTableBoundaries(bSet); break; //"Display/TableBoundaries" + case 33: m_rParent.SetShowBoundaries(bSet); break; //"Display/ShowBoundaries" } } } @@ -462,10 +472,11 @@ Sequence SwGridConfig::GetPropertyNames() } SwGridConfig::SwGridConfig(bool bIsWeb, SwMasterUsrPref& rPar) : - ConfigItem(bIsWeb ? u"Office.WriterWeb/Grid"_ustr : u"Office.Writer/Grid"_ustr, - ConfigItemMode::ReleaseTree), + ConfigItem(bIsWeb ? u"Office.WriterWeb/Grid"_ustr : u"Office.Writer/Grid"_ustr), m_rParent(rPar) { + Load(); + EnableNotification(GetPropertyNames()); } SwGridConfig::~SwGridConfig() @@ -528,7 +539,10 @@ void SwGridConfig::Load() m_rParent.SetSnapSize(aSnap); } -void SwGridConfig::Notify( const css::uno::Sequence< OUString >& ) {} +void SwGridConfig::Notify( const css::uno::Sequence< OUString >& ) +{ + Load(); +} Sequence SwCursorConfig::GetPropertyNames() { diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 00a908d7b624..082f8f4331dd 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -47,7 +47,6 @@ SwViewColors SwViewOption::s_aInitialColorConfig {}; SwViewColors::SwViewColors() : m_aDocColor(COL_LIGHTGRAY), m_aDocBoundColor(COL_LIGHTGRAY), - m_aObjectBoundColor(COL_LIGHTGRAY), m_aAppBackgroundColor(COL_LIGHTGRAY), m_aTableBoundColor(COL_LIGHTGRAY), m_aFontColor(COL_BLACK), @@ -72,23 +71,12 @@ SwViewColors::SwViewColors(const svtools::ColorConfig& rConfig) { m_aDocColor = rConfig.GetColorValue(svtools::DOCCOLOR).nColor; - svtools::ColorConfigValue aValue = rConfig.GetColorValue(svtools::DOCBOUNDARIES); - m_aDocBoundColor = aValue.nColor; + m_aDocBoundColor = rConfig.GetColorValue(svtools::DOCBOUNDARIES).nColor; m_nAppearanceFlags = ViewOptFlags::NONE; - if(aValue.bIsVisible) - m_nAppearanceFlags |= ViewOptFlags::DocBoundaries; - m_aAppBackgroundColor = rConfig.GetColorValue(svtools::APPBACKGROUND).nColor; + m_aTableBoundColor = rConfig.GetColorValue(svtools::TABLEBOUNDARIES).nColor; - aValue = rConfig.GetColorValue(svtools::OBJECTBOUNDARIES); - m_aObjectBoundColor = aValue.nColor; - if(aValue.bIsVisible) - m_nAppearanceFlags |= ViewOptFlags::ObjectBoundaries; - - aValue = rConfig.GetColorValue(svtools::TABLEBOUNDARIES); - m_aTableBoundColor = aValue.nColor; - if(aValue.bIsVisible) - m_nAppearanceFlags |= ViewOptFlags::TableBoundaries; + svtools::ColorConfigValue aValue; aValue = rConfig.GetColorValue(svtools::WRITERIDXSHADINGS); m_aIndexShadingsColor = aValue.nColor; @@ -126,10 +114,7 @@ SwViewColors::SwViewColors(const svtools::ColorConfig& rConfig) if (aValue.bIsVisible && !comphelper::LibreOfficeKit::isActive()) m_nAppearanceFlags |= ViewOptFlags::FieldShadings; - aValue = rConfig.GetColorValue(svtools::WRITERSECTIONBOUNDARIES); - m_aSectionBoundColor = aValue.nColor; - if(aValue.bIsVisible) - m_nAppearanceFlags |= ViewOptFlags::SectionBoundaries; + m_aSectionBoundColor = rConfig.GetColorValue(svtools::WRITERSECTIONBOUNDARIES).nColor; aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS); m_aPageBreakColor = aValue.nColor; @@ -470,11 +455,6 @@ const Color& SwViewOption::GetDocBoundariesColor() const return m_aColorConfig.m_aDocBoundColor; } -const Color& SwViewOption::GetObjectBoundariesColor() const -{ - return m_aColorConfig.m_aObjectBoundColor; -} - const Color& SwViewOption::GetAppBackgroundColor() const { return m_aColorConfig.m_aAppBackgroundColor; @@ -573,14 +553,10 @@ void SwViewOption::SetAppearanceFlag(ViewOptFlags nFlag, bool bSet, bool bSaveIn }; static const FlagToConfig_Impl aFlags[] = { - { ViewOptFlags::DocBoundaries , svtools::DOCBOUNDARIES }, - { ViewOptFlags::ObjectBoundaries , svtools::OBJECTBOUNDARIES }, - { ViewOptFlags::TableBoundaries , svtools::TABLEBOUNDARIES }, { ViewOptFlags::IndexShadings , svtools::WRITERIDXSHADINGS }, { ViewOptFlags::Links , svtools::LINKS }, { ViewOptFlags::VisitedLinks , svtools::LINKSVISITED }, { ViewOptFlags::FieldShadings , svtools::WRITERFIELDSHADINGS }, - { ViewOptFlags::SectionBoundaries , svtools::WRITERSECTIONBOUNDARIES }, { ViewOptFlags::Shadow , svtools::SHADOWCOLOR }, }; for (auto& item : aFlags) diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 79193c08eff5..757eba8c24c7 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1627,7 +1627,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, pViewFrame = SfxViewFrame::GetNext(*pViewFrame, pSourceDocSh); } - SW_MOD()->SetView(&pSourceShell->GetView()); + SwModule::get()->SetView(&pSourceShell->GetView()); if( xMailDispatcher.is() ) { @@ -2532,7 +2532,7 @@ SwDSParam* SwDBManager::FindDSConnection(const OUString& rDataSource, bool bCre const SwDBData& SwDBManager::GetAddressDBName() { - return SW_MOD()->GetDBConfig()->GetAddressSource(); + return SwModule::get()->GetDBConfig()->GetAddressSource(); } uno::Sequence SwDBManager::GetExistingDatabaseNames() diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 6a865078af74..65c96385f0e6 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -398,7 +398,7 @@ The code below would only be part of the solution. bCloseMessage = false; // no closing message if a wrap around has been denied } } - if( aRet.empty() && bCloseMessage && !bNoDictionaryAvailable ) + if( aRet.empty() && bCloseMessage ) { LockFocusNotification( true ); OUString sInfo( SwResId( bNoDictionaryAvailable ? STR_DICTIONARY_UNAVAILABLE : STR_SPELLING_COMPLETED ) ); @@ -805,9 +805,7 @@ bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPor { OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); ESelection aCurrentSelection = pOLV->GetSelection(); - if(m_pSpellState->m_aStartDrawingSelection.nEndPara < aCurrentSelection.nEndPara || - (m_pSpellState->m_aStartDrawingSelection.nEndPara == aCurrentSelection.nEndPara && - m_pSpellState->m_aStartDrawingSelection.nEndPos < aCurrentSelection.nEndPos)) + if (m_pSpellState->m_aStartDrawingSelection.end < aCurrentSelection.end) { bRet = false; rPortions.clear(); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 9e2bded63797..f6b1e9d9377a 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -300,8 +300,7 @@ SwTransferable::~SwTransferable() } m_aDocShellRef.Clear(); - SwModule* pMod = SW_MOD(); - if(pMod) + if (SwModule* pMod = SwModule::get()) { if ( pMod->m_pDragDrop == this ) pMod->m_pDragDrop = nullptr; @@ -321,7 +320,7 @@ static SwDoc& lcl_GetDoc(SwDocFac & rDocFac) void SwTransferable::ObjectReleased() { - SwModule *pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); if (!pMod) return; if( this == pMod->m_pDragDrop ) @@ -333,8 +332,7 @@ void SwTransferable::ObjectReleased() void SwTransferable::AddSupportedFormats() { // only need if we are the current XSelection Object - SwModule *pMod = SW_MOD(); - if( this == pMod->m_pXSelection || comphelper::LibreOfficeKit::isActive()) + if (this == SwModule::get()->m_pXSelection || comphelper::LibreOfficeKit::isActive()) { SetDataForDragAndDrop( Point( 0,0) ); } @@ -1710,7 +1708,7 @@ bool SwTransferable::PasteData( const TransferableDataHelper& rData, { SwWait aWait( *rSh.GetView().GetDocShell(), false ); std::unique_ptr> pAction; - SwModule* pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); bool bRet = false; bool bCallAutoCaption = false; @@ -3759,7 +3757,7 @@ void SwTransferable::StartDrag( vcl::Window* pWin, const Point& rPos ) if( m_pWrtShell->IsSelFrameMode() ) m_pWrtShell->ShowCursor(); - SW_MOD()->m_pDragDrop = this; + SwModule::get()->m_pDragDrop = this; SetDataForDragAndDrop( rPos ); @@ -4396,19 +4394,18 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, void SwTransferable::CreateSelection( SwWrtShell& rSh, const SwFrameShell * _pCreatorView ) { - SwModule *pMod = SW_MOD(); rtl::Reference pNew = new SwTransferable( rSh ); pNew->m_pCreatorView = _pCreatorView; - pMod->m_pXSelection = pNew.get(); + SwModule::get()->m_pXSelection = pNew.get(); pNew->CopyToPrimarySelection(); } void SwTransferable::ClearSelection( const SwWrtShell& rSh, const SwFrameShell * _pCreatorView) { - SwModule *pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); if( pMod->m_pXSelection && ((!pMod->m_pXSelection->m_pWrtShell) || (pMod->m_pXSelection->m_pWrtShell == &rSh)) && (!_pCreatorView || (pMod->m_pXSelection->m_pCreatorView == _pCreatorView)) ) diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index c69f7ff6826b..b8dc99c3b81a 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -461,12 +461,12 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject const & rText) GetOutlinerView()->InsertText(u"..."_ustr); GetOutlinerView()->InsertText(u"\"\n"_ustr); - GetOutlinerView()->SetSelection(ESelection(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL)); + GetOutlinerView()->SetSelection(ESelection::All()); SfxItemSet aAnswerSet( mrView.GetDocShell()->GetPool() ); aAnswerSet.Put(SvxFontHeightItem(200,80,EE_CHAR_FONTHEIGHT)); aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); GetOutlinerView()->SetAttribs(aAnswerSet); - GetOutlinerView()->SetSelection(ESelection(EE_PARA_MAX_COUNT,EE_TEXTPOS_MAX_COUNT,EE_PARA_MAX_COUNT,EE_TEXTPOS_MAX_COUNT)); + GetOutlinerView()->SetSelection(ESelection::AtEnd()); //remove all attributes and reset our standard ones GetOutlinerView()->GetEditView().RemoveAttribsKeepLanguages(true); diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index b3634148e7fe..83344e82d2e2 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -383,7 +383,7 @@ void SwAnnotationWin::InitControls() } mpOutliner->SetControlWord(nCntrl); - std::size_t aIndex = SW_MOD()->InsertRedlineAuthor(GetAuthor()); + std::size_t aIndex = SwModule::get()->InsertRedlineAuthor(GetAuthor()); SetColor( SwPostItMgr::GetColorDark(aIndex), SwPostItMgr::GetColorLight(aIndex), SwPostItMgr::GetColorAnchor(aIndex)); @@ -457,7 +457,7 @@ void SwAnnotationWin::CheckMetaText() void SwAnnotationWin::UpdateColors() { - std::size_t aIndex = SW_MOD()->InsertRedlineAuthor(GetAuthor()); + std::size_t aIndex = SwModule::get()->InsertRedlineAuthor(GetAuthor()); SetColor( SwPostItMgr::GetColorDark(aIndex), SwPostItMgr::GetColorLight(aIndex), SwPostItMgr::GetColorAnchor(aIndex)); @@ -1006,8 +1006,7 @@ void SwAnnotationWin::DeactivatePostIt() if (GetOutlinerView()->GetEditView().HasSelection()) { ESelection aSelection = GetOutlinerView()->GetEditView().GetSelection(); - aSelection.nEndPara = aSelection.nStartPara; - aSelection.nEndPos = aSelection.nStartPos; + aSelection.CollapseToStart(); GetOutlinerView()->GetEditView().SetSelection(aSelection); } @@ -1026,7 +1025,7 @@ void SwAnnotationWin::DeactivatePostIt() if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) GetOutlinerView()->SetBackgroundColor(COL_TRANSPARENT); - if (!mnDeleteEventId && !IsReadOnlyOrProtected() && mpOutliner->GetEditEngine().GetText().isEmpty()) + if (!mnDeleteEventId && !IsReadOnlyOrProtected() && !mpOutliner->GetEditEngine().HasText()) { mnDeleteEventId = Application::PostUserEvent( LINK( this, SwAnnotationWin, DeleteHdl), nullptr, true ); } @@ -1059,7 +1058,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot) const bool bReply = nSlot == FN_REPLY; // if this note is empty, it will be deleted once losing the focus, so no reply, but only a new note // will be created - if (!mrMgr.IsAnswer() && !mpOutliner->GetEditEngine().GetText().isEmpty()) + if (!mrMgr.IsAnswer() && mpOutliner->GetEditEngine().HasText()) { OutlinerParaObject aPara(GetOutlinerView()->GetEditView().CreateTextObject()); mrMgr.RegisterAnswer(aPara); diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx index eebc0e905f14..34f4f92ac992 100644 --- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx +++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx @@ -115,8 +115,7 @@ void SwOutlineContentVisibilityWin::Set() (void)rOutlineNodes.Seek_Entry(pTextNode, &m_nOutlinePos); // set symbol displayed on button - bool bVisible = true; - const_cast(pTextNode)->GetAttrOutlineContentVisible(bVisible); + bool bVisible = pTextNode->GetAttrOutlineContentVisible(); SetSymbol(bVisible ? ButtonSymbol::HIDE : ButtonSymbol::SHOW); // set quick help diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 177d52c9777b..5bcbdee0c061 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -380,7 +380,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView) mpView->GetWrtShell().MakeDrawView(); //make sure we get the colour yellow always, even if not the first one of comments or redlining - SW_MOD()->GetRedlineAuthor(); + SwModule::get()->GetRedlineAuthor(); // collect all PostIts and redline comments that exist after loading the document // don't check for existence for any of them, don't focus them @@ -2538,10 +2538,9 @@ sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const i18nuti { ESelection aOldSelection = pWin->GetOutlinerView()->GetSelection(); if (bSrchForward) - pWin->GetOutlinerView()->SetSelection(ESelection(0,0,0,0)); + pWin->GetOutlinerView()->SetSelection(ESelection(0, 0)); else - pWin->GetOutlinerView()->SetSelection( - ESelection(EE_PARA_MAX_COUNT,EE_TEXTPOS_MAX_COUNT,EE_PARA_MAX_COUNT,EE_TEXTPOS_MAX_COUNT)); + pWin->GetOutlinerView()->SetSelection(ESelection::AtEnd()); SvxSearchItem aItem(SID_SEARCH_ITEM ); aItem.SetSearchOptions(rSearchOptions); aItem.SetBackward(!bSrchForward); diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 287d2969f632..72e50a65599e 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -249,9 +249,9 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, nActionFlags, m_nDropFormat, m_nDropDestination, false, rEvt.mbDefault, &aDocPt, nRet)) nRet = DND_ACTION_NONE; - else if ( SW_MOD()->m_pDragDrop ) + else if (SwModule* mod = SwModule::get(); mod->m_pDragDrop) //Don't clean up anymore at internal D&D! - SW_MOD()->m_pDragDrop->SetCleanUp( false ); + mod->m_pDragDrop->SetCleanUp(false); return nRet; } @@ -400,7 +400,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) const Point aDocPt( PixelToLogic( aPixPt ) ); //With the default action we still want to have a say. - SwModule *pMod = SW_MOD(); + SwModule* pMod = SwModule::get(); if( pMod->m_pDragDrop ) { bool bCleanup = false; diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 4736ef280a51..0e24f7542f57 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1667,7 +1667,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) pACorr = pACfg->GetAutoCorrect(); } - SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); OUString sFormulaEntry; @@ -4334,7 +4334,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) if(aRelPos.X() >= 0) { FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( &GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); const SfxPointItem aTmp1( SID_ATTR_POSITION, aRelPos ); rBnd.SetState( aTmp1 ); } @@ -6148,7 +6148,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) { OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); ESelection aSelection = pOLV->GetSelection(); - if(!aSelection.IsZero()) + if(aSelection != ESelection()) { SdrOutliner* pOutliner = pSdrView->GetTextEditOutliner(); bool bVertical = pOutliner->IsVertical(); @@ -6167,8 +6167,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) else aEEPos -= rOutputArea.TopLeft(); - EPosition aDocPosition = rEditEng.FindDocPosition(aEEPos); - ESelection aCompare(aDocPosition.nPara, aDocPosition.nIndex); + ESelection aCompare(rEditEng.FindDocPosition(aEEPos)); // make it a forward selection - otherwise the IsLess/IsGreater do not work :-( aSelection.Adjust(); if(!(aCompare < aSelection) && !(aCompare > aSelection)) @@ -7072,8 +7071,7 @@ void SwEditWin::ToggleOutlineContentVisibility(const size_t nOutlinePos, const b if (!bSubs || rSh.GetViewOptions()->IsTreatSubOutlineLevelsAsContent()) { SwNode* pNode = rSh.GetNodes().GetOutLineNds()[nOutlinePos]; - bool bVisible = true; - pNode->GetTextNode()->GetAttrOutlineContentVisible(bVisible); + bool bVisible = pNode->GetTextNode()->GetAttrOutlineContentVisible(); pNode->GetTextNode()->SetAttrOutlineContentVisible(!bVisible); } else if (bSubs) diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index d8d7f7ec2057..11b3b3d4d9d1 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -533,7 +533,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) default: { - SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); if(!pModOpt->IsHideFieldTips()) { const SwField* pField = aContentAtPos.aFnd.pField; diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx index 423b6a53847e..4a60637c9624 100644 --- a/sw/source/uibase/docvw/edtwin3.cxx +++ b/sw/source/uibase/docvw/edtwin3.cxx @@ -106,7 +106,7 @@ bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt, TableChgMode GetTableChgDefaultMode() { - SwModuleOptions* pOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pOpt = SwModule::get()->GetModuleConfig(); return pOpt ? pOpt->GetTableMode() : TableChgMode::VarWidthChangeAbs; } diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index fb8d20d0e525..ae59afcc1abc 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -100,7 +100,7 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) , m_rView(rV) , m_xBrushItem(std::make_unique(RES_BACKGROUND)) { - m_bGrfToGalleryAsLnk = SW_MOD()->GetModuleConfig()->IsGrfToGalleryAsLnk(); + m_bGrfToGalleryAsLnk = SwModule::get()->GetModuleConfig()->IsGrfToGalleryAsLnk(); SwWrtShell &rSh = m_rView.GetWrtShell(); OUString sDescription; rSh.IsURLGrfAtPos( rDPos, &m_sURL, &m_sTargetFrameName, &sDescription ); @@ -303,9 +303,9 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId ) else if (nId == m_nReadonlyGraphicoff) nExecId = FN_VIEW_GRAPHIC; else if (nId == m_nReadonlyTogallerylink || nId == m_nReadonlyBackgroundTogallerylink) - SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk(true); + SwModule::get()->GetModuleConfig()->SetGrfToGalleryAsLnk(true); else if (nId == m_nReadonlyTogallerycopy || nId == m_nReadonlyBackgroundTogallerycopy) - SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk(false); + SwModule::get()->GetModuleConfig()->SetGrfToGalleryAsLnk(false); if( USHRT_MAX != nExecId ) rDis.GetBindings()->Execute( nExecId ); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 1fdc55838f29..8f6224682a61 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -700,7 +700,7 @@ void SwSrcEditWindow::ImpDoHighlight( std::u16string_view aSource, sal_uInt16 nL r.eType != svtools::HTMLKEYWORD && r.eType != svtools::HTMLUNKNOWN) r.eType = svtools::HTMLUNKNOWN; - Color aColor(SW_MOD()->GetColorConfig().GetColorValue(r.eType).nColor); + Color aColor(SwModule::get()->GetColorConfig().GetColorValue(r.eType).nColor); m_pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLineOff, r.nStart, r.nEnd+1 ); } } diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index c78ed3ea7f73..d1ca1ab1ad23 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -44,7 +44,7 @@ SfxPoolItem* SwEnvItem::CreateDefault() { return new SwEnvItem; } OUString MakeSender() { - SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions(); + SvtUserOptions& rUserOpt = SwModule::get()->GetUserOptions(); const OUString sSenderToken(SwResId(STR_SENDER_TOKENS)); if (sSenderToken.isEmpty()) diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index f2aed778f921..4fb5829bea24 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -366,7 +366,7 @@ SwLabCfgItem::SwLabCfgItem(bool bLabel) : if(m_bIsLabel || !bNoConfigValues) return; - SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions(); + SvtUserOptions& rUserOpt = SwModule::get()->GetUserOptions(); m_aItem.m_aPrivFirstName = rUserOpt.GetFirstName(); m_aItem.m_aPrivName = rUserOpt.GetLastName(); m_aItem.m_aPrivShortCut = rUserOpt.GetID(); diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index a02f2ec7864d..2619e6449e12 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -53,6 +53,10 @@ class SW_DLLPUBLIC SwDocDisplayItem final : public SfxPoolItem bool m_bBookmarks :1; bool m_bManualBreak :1; bool m_bTextBoundariesFull :1; + bool m_bTextBoundaries :1; + bool m_bSectionBoundaries :1; + bool m_bTableBoundaries :1; + sal_Int32 m_xDefaultAnchor; public: diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index cdeb071100a7..ca60e8f00219 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -336,6 +336,12 @@ class SwShdwCursorOptionsTabPage final : public SfxTabPage std::unique_ptr m_xEncloseWithCharactersCB; std::unique_ptr m_xEncloseWithCharactersImg; + std::unique_ptr m_xTextBoundariesCB; + std::unique_ptr m_xSectionBoundariesCB; + std::unique_ptr m_xTableBoundariesCB; + + DECL_LINK(TextBoundariesHdl, weld::Toggleable&, void); + public: SwShdwCursorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwShdwCursorOptionsTabPage() override; diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 0c737246317c..e2a992e841c7 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -292,7 +292,7 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->EnableItem(m_nCorrectMenuId, bEnable); - uno::Reference< linguistic2::XLanguageGuessing > xLG = SW_MOD()->GetLanguageGuesser(); + uno::Reference xLG = SwModule::get()->GetLanguageGuesser(); LanguageType nGuessLangWord = LANGUAGE_NONE; LanguageType nGuessLangPara = LANGUAGE_NONE; if (m_xSpellAlt.is() && xLG.is()) @@ -502,7 +502,7 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->EnableItem(m_nCorrectMenuId, false); m_xPopupMenu->EnableItem(m_nCorrectDialogId, false); - uno::Reference< linguistic2::XLanguageGuessing > xLG = SW_MOD()->GetLanguageGuesser(); + uno::Reference xLG = SwModule::get()->GetLanguageGuesser(); LanguageType nGuessLangWord = LANGUAGE_NONE; LanguageType nGuessLangPara = LANGUAGE_NONE; if (xLG.is()) diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 2282174ae9aa..d1180be8271a 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -256,7 +256,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(std::shared_ptr xParent, we m_aSelectTimer.SetInvokeHandler(LINK(this, SwRedlineAcceptDlg, GotoHdl)); // we want to receive SfxHintId::SwRedlineContentAtPos - StartListening(*(SW_MOD()->GetView()->GetDocShell())); + StartListening(*(SwModule::get()->GetView()->GetDocShell())); } SwRedlineAcceptDlg::~SwRedlineAcceptDlg() @@ -561,7 +561,7 @@ void SwRedlineAcceptDlg::Activate() } // check comment - bool bIsShowChangesInMargin = SW_MOD()->GetUsrPref(false)->IsShowChangesInMargin(); + bool bIsShowChangesInMargin = SwModule::get()->GetUsrPref(false)->IsShowChangesInMargin(); for (SwRedlineTable::size_type i = 0; i < nCount; i++) { const SwRangeRedline& rRedln = pSh->GetRedline(i); @@ -919,7 +919,7 @@ void SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli if (m_pTable->IsSorted()) rTreeView.make_unsorted(); - bool bIsShowChangesInMargin = SW_MOD()->GetUsrPref(false)->IsShowChangesInMargin(); + bool bIsShowChangesInMargin = SwModule::get()->GetUsrPref(false)->IsShowChangesInMargin(); // collect redlines of tracked table/row/column insertion/deletions under a single tree list // item to accept/reject the table change with a single click on Accept/Reject @@ -1653,7 +1653,7 @@ SwRedlineAcceptPanel::SwRedlineAcceptPanel(weld::Widget* pParent) mpImplDlg->Init(); // we want to receive SfxHintId::DocChanged - StartListening(*(SW_MOD()->GetView()->GetDocShell())); + StartListening(*(SwModule::get()->GetView()->GetDocShell())); } SwRedlineAcceptPanel::~SwRedlineAcceptPanel() diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 4d225dfc8aaa..0231546f1504 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -416,7 +416,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { // Select the field so that it will be deleted during insert ESelection aSel = pOLV->GetSelection(); - aSel.nEndPos++; + aSel.end.nIndex++; pOLV->SetSelection(aSel); } if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED) @@ -497,7 +497,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) /* mod SwView* pView = &GetView(); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( pView) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, eMetric)); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, eMetric)); */ SfxItemSetFixed aDlgAttr(GetPool()); @@ -550,7 +550,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) /* mod todo ??? SwView* pView = &GetView(); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( pView) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, eMetric)); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, eMetric)); */ SfxItemSetFixed< EE_ITEMS_START, EE_ITEMS_END, @@ -1899,8 +1899,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) // Erase selection ESelection aSel(pOLV->GetSelection()); - aSel.nStartPara = aSel.nEndPara; - aSel.nStartPos = aSel.nEndPos; + aSel.CollapseToEnd(); pOLV->SetSelection(aSel); // Restore old font diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index d5c0a4eac9f3..739b12cb251b 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -221,16 +221,12 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq) SwNodeIndex aIdx(rSh.GetCursor()->GetPointNode()); if (aIdx.GetNode().IsTextNode()) { - bool bVisible = true; - aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible); - if (!bVisible) + if (!aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible()) break; ++aIdx; if (aIdx.GetNode().IsTextNode()) { - bVisible = true; - aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible); - if (!bVisible) + if (!aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible()) break; } } @@ -250,9 +246,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq) SwNodeIndex aIdx(rSh.GetCursor()->GetPointNode()); if (aIdx.GetNode().IsTextNode()) { - bool bVisible = true; - aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible); - if (!bVisible) + if (!aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible()) break; --aIdx; if (aIdx.GetNode().IsContentNode() && @@ -2419,7 +2413,7 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq ) if(nInputLang != LANGUAGE_DONTKNOW && nInputLang != LANGUAGE_SYSTEM) nScripts = SvtLanguageOptions::GetScriptTypeOfLanguage( nInputLang ); sal_uInt32 nHeight = static_cast< const SvxFontHeightItem& >(pArgs->Get( nWhich )).GetHeight(); - SwStdFontConfig* pStdFont = SW_MOD()->GetStdFontConfig(); + SwStdFontConfig* pStdFont = SwModule::get()->GetStdFontConfig(); SfxItemSetFixedGetModuleConfig(); + const SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); SwInsertTableOptions aInsTableOpts = pModOpt->GetInsTableFlags(bHTMLMode); rSh.StartUndo(SwUndoId::INSTABLE); @@ -3146,7 +3140,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) aInsTableOptsIn.mnInsMode = static_cast(pFlags->GetValue()); else { - const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + const SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); aInsTableOptsIn = pModOpt->GetInsTableFlags(bHTMLMode); } } diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index dd93cb847387..e66d3e98021f 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -290,7 +290,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) case SID_FONTWORK: { FieldUnit eMetric = ::GetDfltMetric( dynamic_cast( &rSh.GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); SfxViewFrame& rVFrame = GetView().GetViewFrame(); if (pArgs) { diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 2c59cfe8ffa0..d0ee5e477bdb 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -217,7 +217,7 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq) const WhichRangesContainer aRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aSet( *aNewAttr.GetPool(), aRange ); FieldUnit eMetric = ::GetDfltMetric( dynamic_cast(&GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); aSet.Put( aNewAttr, false ); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 38d2a8521057..52aff06cdcaa 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -378,7 +378,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SwView& rView = GetView(); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast(&rView) != nullptr); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); SfxItemSetFixed aDlgAttr(GetPool()); // util::Language does not exists in the EditEngine! That is why not in set. @@ -454,7 +454,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) { SwView& rView = GetView(); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast(&rView) != nullptr); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); SfxItemSetFixed< EE_ITEMS_START, EE_ITEMS_END, SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_WIDOWS> aDlgAttr( GetPool() ); @@ -518,7 +518,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) { // Select field so that it will be deleted during insert ESelection aSel = pOLV->GetSelection(); - aSel.nEndPos++; + aSel.end.nIndex++; pOLV->SetSelection(aSel); } pOLV->InsertField(SvxFieldItem(aField, EE_FEATURE_FIELD)); @@ -1113,7 +1113,7 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest const &rReq) OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView(); ESelection aSel(pOLV->GetSelection()); - const bool bCopy = (aSel.nStartPara != aSel.nEndPara) || (aSel.nStartPos != aSel.nEndPos); + const bool bCopy = aSel.HasRange(); sal_uInt16 nId = rReq.GetSlot(); switch( nId ) { @@ -1193,8 +1193,7 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView(); ESelection aSel(pOLV->GetSelection()); - const bool bCopy = (aSel.nStartPara != aSel.nEndPara) || - (aSel.nStartPos != aSel.nEndPos); + const bool bCopy = aSel.HasRange(); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &GetView().GetEditWin() ) ); const bool bPaste = aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 0b50fe3b94b0..3679fefda26f 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -175,7 +175,7 @@ void SwDrawTextShell::ExecFontWork(SfxRequest const & rReq) { SwWrtShell &rSh = GetShell(); FieldUnit eMetric = ::GetDfltMetric( dynamic_cast( &rSh.GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); SfxViewFrame& rVFrame = GetView().GetViewFrame(); if ( rReq.GetArgs() ) { @@ -780,8 +780,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) // Remove selection ESelection aSel(pOLV->GetSelection()); - aSel.nStartPara = aSel.nEndPara; - aSel.nStartPos = aSel.nEndPos; + aSel.CollapseToEnd(); pOLV->SetSelection(aSel); // Restore old font diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index d1790ed10bdf..8f613c9a83f1 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -511,7 +511,8 @@ void SwFrameShell::Execute(SfxRequest &rReq) aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame().GetFrame())); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( &GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric) )); + SwModule* mod = SwModule::get(); + mod->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ScopedVclPtr pDlg(pFact->CreateFrameTabDialog( nSel & SelectionType::Graphic ? u"PictureDialog"_ustr : @@ -540,7 +541,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) { SwViewOption aUsrPref( *pVOpt ); aUsrPref.SetKeepRatio(pRatioItem->GetValue()); - SW_MOD()->ApplyUsrPref(aUsrPref, &GetView()); + mod->ApplyUsrPref(aUsrPref, &GetView()); } if (const SfxStringItem* pAltNameItem = pOutSet->GetItemIfSet(FN_SET_FRM_ALT_NAME)) { diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index d7d53292a80a..c508b0d4e86c 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -295,7 +295,8 @@ void SwGrfShell::Execute(SfxRequest &rReq) sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell()); aSet.Put(SfxUInt16Item(SID_HTML_MODE, nHtmlMode)); FieldUnit eMetric = ::GetDfltMetric(0 != (nHtmlMode&HTMLMODE_ON)); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); + SwModule* mod = SwModule::get(); + mod->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); const SwRect* pRect = &rSh.GetAnyCurRect(CurRectType::Page); SwFormatFrameSize aFrameSize( SwFrameSize::Variable, pRect->Width(), pRect->Height()); @@ -468,7 +469,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) } if( bApplyUsrPref ) - SW_MOD()->ApplyUsrPref(aUsrPref, &GetView()); + mod->ApplyUsrPref(aUsrPref, &GetView()); // and now set all the graphic attributes and other stuff if( const SvxBrushItem* pGraphicBrushItem = pSet->GetItemIfSet( diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index 3bcdd618d0e5..bb7d4d969668 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -512,11 +512,11 @@ namespace SwLangHelper // string for guessing language // get the full text of the paragraph that the end of selection is in - OUString aText = rEditEngine->GetText(rDocSelection.nEndPos); + OUString aText = rEditEngine->GetText(rDocSelection.end.nIndex); if (!aText.isEmpty()) { sal_Int32 nStt = 0; - sal_Int32 nEnd = rDocSelection.nEndPos; + sal_Int32 nEnd = rDocSelection.end.nIndex; // at most 100 chars to the left... nStt = nEnd > 100 ? nEnd - 100 : 0; // ... and 100 to the right of the cursor position @@ -529,7 +529,7 @@ namespace SwLangHelper void SelectPara( EditView &rEditView, const ESelection &rCurSel ) { - ESelection aParaSel( rCurSel.nStartPara, 0, rCurSel.nStartPara, EE_TEXTPOS_ALL ); + ESelection aParaSel(rCurSel.start.nPara, 0, rCurSel.start.nPara, EE_TEXTPOS_MAX); rEditView.SetSelection( aParaSel ); } diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 97589cd2c7b6..577be8fe0369 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -278,7 +278,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, { SwViewOption aUsrPref( *rSh.GetViewOptions() ); aUsrPref.SetTableDest(static_cast(pDestItem->GetValue())); - SW_MOD()->ApplyUsrPref(aUsrPref, &rSh.GetView()); + SwModule::get()->ApplyUsrPref(aUsrPref, &rSh.GetView()); } bool bBorder = ( SfxItemState::SET == rSet.GetItemState( RES_BOX ) || SfxItemState::SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); @@ -606,7 +606,7 @@ void SwTableShell::Execute(SfxRequest &rReq) SfxItemSet aCoreSet( GetPool(), aUITableAttrRange); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( &rSh.GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); std::shared_ptr xTableRep(::lcl_TableParamToItemSet(aCoreSet, rSh)); aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell()))); @@ -688,7 +688,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if (SwView* pView = GetActiveView()) { FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( pView) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SvNumberFormatter* pFormatter = rSh.GetNumberFormatter(); auto pCoreSet = std::make_shared>( GetPool() ); @@ -1466,7 +1466,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) case SID_INSERT_DIAGRAM: { SvtModuleOptions aMOpt; - if ( !aMOpt.IsMath() || rSh.IsTableComplexForChart() ) + if ( !aMOpt.IsMathInstalled() || rSh.IsTableComplexForChart() ) rSet.DisableItem(nSlot); } break; diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 4696335884aa..d313c899f659 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -373,8 +373,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) break; case SID_INSERT_DIAGRAM: { - SvtModuleOptions aMOpt; - if ( !aMOpt.IsChart() ) + if (!SvtModuleOptions().IsChartInstalled()) break; if(!rReq.IsAPI()) { @@ -527,7 +526,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) auto xSet = CreateInsertFrameItemSet(aMgr); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( GetView().GetDocShell()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); VclPtr pDlg(pFact->CreateFrameTabDialog(u"FrameDialog"_ustr, GetView().GetViewFrame(), @@ -621,7 +620,6 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) SfxWhichIter aIter( rSet ); SwWrtShell &rSh = GetShell(); sal_uInt16 nWhich = aIter.FirstWhich(); - SvtModuleOptions aMOpt; SfxObjectCreateMode eCreateMode = GetView().GetDocShell()->GetCreateMode(); const bool bCursorInHidden = rSh.IsInHiddenRange(/*bSelect=*/false); @@ -641,7 +639,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) break; case SID_INSERT_DIAGRAM: - if( !aMOpt.IsChart() + if (!SvtModuleOptions().IsChartInstalled() || GetShell().CursorInsideInputField() || eCreateMode == SfxObjectCreateMode::EMBEDDED || bCursorInHidden ) @@ -651,7 +649,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) break; case FN_INSERT_SMA: - if( !aMOpt.IsMath() + if (!SvtModuleOptions().IsMathInstalled() || eCreateMode == SfxObjectCreateMode::EMBEDDED || bCursorInHidden || rSh.CursorInsideInputField() ) diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index c9b9ceb60e38..2b3614437a79 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -164,7 +164,7 @@ static void sw_CharDialog(SwWrtShell& rWrtSh, bool bUseDialog, bool bApplyToPara sal_uInt16 nSlot, const SfxItemSet* pArgs, SfxRequest* pReq) { FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( &rWrtSh.GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); auto pCoreSet = std::make_shared( &GetView()) != nullptr ); - SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); + SwModule* mod = SwModule::get(); + mod->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); bool bApplyCharUnit = ::HasCharUnit( dynamic_cast( &GetView()) != nullptr ); - SW_MOD()->PutItem(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bApplyCharUnit)); + mod->PutItem(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bApplyCharUnit)); SfxItemSetFixed< RES_PARATR_BEGIN, RES_FRMATR_END - 1, diff --git a/sw/source/uibase/sidebar/QuickFindPanel.cxx b/sw/source/uibase/sidebar/QuickFindPanel.cxx index 11e5545b52d2..6cbaa4fe1f55 100644 --- a/sw/source/uibase/sidebar/QuickFindPanel.cxx +++ b/sw/source/uibase/sidebar/QuickFindPanel.cxx @@ -9,8 +9,8 @@ */ #include "QuickFindPanel.hxx" +#include #include - #include #include #include @@ -332,7 +332,8 @@ IMPL_LINK(QuickFindPanel, SearchFindsListRender, weld::TreeView::render_args, aP tools::Long aTextHeight = rRenderContext.GetTextHeight(); rRenderContext.Push(); - rRenderContext.SetLineColor(COL_BLACK); + svtools::ColorConfig aColorConfig; + rRenderContext.SetLineColor(aColorConfig.GetColorValue(svtools::BUTTONTEXTCOLOR).nColor); rRenderContext.DrawLine( aRect.LeftCenter(), Point(aRect.Center().AdjustX(-(aTextWidth / 2)) - 4, aRect.Center().getY())); diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx index a3c376835768..cee7dfeba5f7 100644 --- a/sw/source/uibase/sidebar/TableEditPanel.cxx +++ b/sw/source/uibase/sidebar/TableEditPanel.cxx @@ -188,7 +188,7 @@ void TableEditPanel::InitRowHeightToolitem() Link aLink = LINK(this, TableEditPanel, RowHeightMofiyHdl); m_aRowHeightEdit.connect_value_changed(aLink); - FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric(); + FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(false)->GetMetric(); m_aRowHeightEdit.SetFieldUnit(eFieldUnit); m_aRowHeightEdit.set_min(MINLAY, FieldUnit::TWIP); @@ -202,7 +202,7 @@ void TableEditPanel::InitColumnWidthToolitem() Link aLink = LINK(this, TableEditPanel, ColumnWidthMofiyHdl); m_aColumnWidthEdit.connect_value_changed(aLink); - FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric(); + FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(false)->GetMetric(); m_aColumnWidthEdit.SetFieldUnit(eFieldUnit); m_aColumnWidthEdit.set_min(MINLAY, FieldUnit::TWIP); @@ -229,7 +229,7 @@ void TableEditPanel::InitAlignmentControls() m_xAlignment->append(OUString::number(text::HoriOrientation::NONE), SwResId(STR_TABLE_PANEL_ALIGN_MANUAL)); - FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(false)->GetMetric(); + FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(false)->GetMetric(); m_aLeftSpacingEdit.SetFieldUnit(eFieldUnit); m_aRightSpacingEdit.SetFieldUnit(eFieldUnit); } diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 6fb310455a6f..aca313a9bc1b 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -178,7 +178,7 @@ SwPagePreviewWin::SwPagePreviewWin( vcl::Window *pParent, SwPagePreview& rPView GetOutDev()->SetLineColor( GetBackground().GetColor()); SetMapMode( MapMode(MapUnit::MapTwip) ); - const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(false); + const SwMasterUsrPref* pUsrPref = SwModule::get()->GetUsrPref(false); mnRow = pUsrPref->GetPagePrevRow(); // 1 row mnCol = pUsrPref->GetPagePrevCol(); // 1 column mnSttPage = USHRT_MAX; @@ -516,7 +516,7 @@ void SwPagePreviewWin::MouseButtonDown( const MouseEvent& rMEvt ) void SwPagePreviewWin::SetPagePreview( sal_Int16 nRow, sal_Int16 nCol ) { - SwMasterUsrPref *pOpt = const_cast(SW_MOD()->GetUsrPref(false)); + SwMasterUsrPref* pOpt = const_cast(SwModule::get()->GetUsrPref(false)); if (nRow != pOpt->GetPagePrevRow() || nCol != pOpt->GetPagePrevCol()) { @@ -1093,7 +1093,8 @@ void SwPagePreview::Init() // the handler, because the shell is unknown to the SFX management // within the CTOR phase. - const SwViewOption * pPrefs = SW_MOD()->GetUsrPref(false); + SwModule* mod = SwModule::get(); + const SwViewOption* pPrefs = mod->GetUsrPref(false); mbHScrollbarEnabled = pPrefs->IsViewHScrollBar(); mbVScrollbarEnabled = pPrefs->IsViewVScrollBar(); @@ -1135,7 +1136,7 @@ void SwPagePreview::Init() #endif // adjust view shell option to the same as for print - SwPrintData const aPrintOptions = *SW_MOD()->GetPrtOptions(false); + SwPrintData const aPrintOptions = *mod->GetPrtOptions(false); GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); GetViewShell()->CalcLayout(); diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index ed0c3c68fcfc..01dc4f856c06 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -104,7 +104,7 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq ) case SID_TWAIN_SELECT: { bool bDone = false; - Reference< XScannerManager2 > xScanMgr = SW_MOD()->GetScannerManager(); + Reference xScanMgr = SwModule::get()->GetScannerManager(); if( xScanMgr.is() ) { @@ -152,7 +152,7 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq ) { bool bDone = false; - Reference< XScannerManager2 > xScanMgr = SW_MOD()->GetScannerManager(); + Reference xScanMgr = SwModule::get()->GetScannerManager(); if( xScanMgr.is() ) { SwScannerEventListener& rListener = GetScannerEventListener(); diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 02722177646d..f2fef7d341e0 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -326,7 +326,7 @@ void SwView::SelectShell() { SfxDispatcher &rDispatcher = GetDispatcher(); - SwToolbarConfigItem *pBarCfg = SW_MOD()->GetToolbarConfig(); + SwToolbarConfigItem* pBarCfg = SwModule::get()->GetToolbarConfig(); if ( m_pShell ) { @@ -850,7 +850,7 @@ SwView::SwView(SfxViewFrame& _rFrame, SfxViewShell* pOldSh) rDocSh.UpdateFontList(); bool bWebDShell = dynamic_cast(&rDocSh) != nullptr; - const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(bWebDShell); + const SwMasterUsrPref* pUsrPref = SwModule::get()->GetUsrPref(bWebDShell); SwViewOption aUsrPref( *pUsrPref); //! get lingu options without loading lingu DLL @@ -1144,7 +1144,7 @@ SwViewGlueDocShell::SwViewGlueDocShell(SwView& rView, SwDocShell& rDocSh) { // Set DocShell rDocSh.SetView(&m_rView); - SW_MOD()->SetView(&m_rView); + SwModule::get()->SetView(&m_rView); } SwViewGlueDocShell::~SwViewGlueDocShell() @@ -1152,8 +1152,8 @@ SwViewGlueDocShell::~SwViewGlueDocShell() SwDocShell* pDocSh = m_rView.GetDocShell(); if (pDocSh && pDocSh->GetView() == &m_rView) pDocSh->SetView(nullptr); - if (SW_MOD()->GetView() == &m_rView) - SW_MOD()->SetView(nullptr); + if (SwModule* mod = SwModule::get(); mod->GetView() == &m_rView) + mod->SetView(nullptr); } SwView::~SwView() @@ -1289,7 +1289,7 @@ static bool lcl_IsOwnDocument( SwView& rView ) = xDPS->getDocumentProperties(); OUString Created = xDocProps->getAuthor(); OUString Changed = xDocProps->getModifiedBy(); - OUString FullName = SW_MOD()->GetUserOptions().GetFullName(); + OUString FullName = SwModule::get()->GetUserOptions().GetFullName(); return !FullName.isEmpty() && (Changed == FullName || (Changed.isEmpty() && Created == FullName)); } @@ -1573,7 +1573,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > // Got a custom value, then it makes sense to trigger notifications. SwViewOption aUsrPref(*pVOpt); aUsrPref.SetKeepRatio(bKeepRatio); - SW_MOD()->ApplyUsrPref(aUsrPref, this); + SwModule::get()->ApplyUsrPref(aUsrPref, this); } // Set ViewLayoutSettings @@ -1582,7 +1582,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > const bool bSetViewSettings = bGotZoomType && bGotZoomFactor && ( pVOpt->GetZoom() != nZoomFactor || pVOpt->GetZoomType() != eZoom ) && - SW_MOD()->GetUsrPref(pVOpt->getBrowseMode())->IsDefaultZoom(); + SwModule::get()->GetUsrPref(pVOpt->getBrowseMode())->IsDefaultZoom(); // In case we have a 'fixed' view layout of 2 or more columns, // we have to apply the view options *before* starting the action. @@ -1852,8 +1852,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) void SwView::ScannerEventHdl() { - uno::Reference< XScannerManager2 > xScanMgr = SW_MOD()->GetScannerManager(); - if( xScanMgr.is() ) + if (uno::Reference xScanMgr = SwModule::get()->GetScannerManager()) { const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] ); const ScanError eError = xScanMgr->getError( aContext ); @@ -2126,7 +2125,7 @@ namespace sw { void InitPrintOptionsFromApplication(SwPrintData & o_rData, bool const bWeb) { - o_rData = *SW_MOD()->GetPrtOptions(bWeb); + o_rData = *SwModule::get()->GetPrtOptions(bWeb); } } // namespace sw diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 8d236be3ce87..3b640c179eae 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -72,7 +72,7 @@ using namespace ::com::sun::star; SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") { - if (comphelper::IsFuzzing() || SvtModuleOptions().IsWriter()) + if (comphelper::IsFuzzing() || SvtModuleOptions().IsWriterInstalled()) { SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwGlobalDocShell); @@ -170,6 +170,7 @@ void SwView::RecheckBrowseMode() //SID_AUTOSPELL_MARKOFF, SID_TOGGLE_RESOLVED_NOTES, /* 11672*/ FN_RULER, /*20211*/ + FN_VIEW_BOUNDARIES, /*20212*/ FN_VIEW_GRAPHIC, /*20213*/ FN_VIEW_BOUNDS, /**/ FN_VIEW_FIELDS, /*20215*/ @@ -236,8 +237,10 @@ void SwView::StateViewOptions(SfxItemSet &rSet) aBool.SetValue( bState ); } break; + case FN_VIEW_BOUNDARIES: + aBool.SetValue( pOpt->IsShowBoundaries()); break; case FN_VIEW_BOUNDS: - aBool.SetValue( pOpt->IsDocBoundaries()); break; + aBool.SetValue( pOpt->IsTextBoundaries()); break; case FN_VIEW_SECTION_BOUNDARIES: aBool.SetValue(pOpt->IsSectionBoundaries()); break; case FN_VIEW_GRAPHIC: @@ -403,14 +406,26 @@ void SwView::ExecViewOptions(SfxRequest &rReq) case FN_VIEW_BOUNDS: if( STATE_TOGGLE == eState ) - bFlag = !pOpt->IsDocBoundaries(); - pOpt->SetAppearanceFlag(ViewOptFlags::DocBoundaries, bFlag, true ); + bFlag = !pOpt->IsTextBoundaries(); + pOpt->SetTextBoundaries( bFlag ); break; case FN_VIEW_SECTION_BOUNDARIES: if( STATE_TOGGLE == eState ) bFlag = !pOpt->IsSectionBoundaries(); - pOpt->SetAppearanceFlag(ViewOptFlags::SectionBoundaries, bFlag, true ); + pOpt->SetSectionBoundaries( bFlag ); + break; + + case FN_VIEW_TABLEGRID: + if( STATE_TOGGLE == eState ) + bFlag = !pOpt->IsTableBoundaries(); + pOpt->SetTableBoundaries( bFlag ); + break; + + case FN_VIEW_BOUNDARIES: + if( STATE_TOGGLE == eState ) + bFlag = !pOpt->IsShowBoundaries(); + pOpt->SetShowBoundaries( bFlag ); break; case SID_GRID_VISIBLE: @@ -521,13 +536,6 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->SetViewAnyRuler( bFlag ); break; - - case FN_VIEW_TABLEGRID: - if( STATE_TOGGLE == eState ) - bFlag = !pOpt->IsTableBoundaries(); - pOpt->SetAppearanceFlag(ViewOptFlags::TableBoundaries, bFlag, true ); - break; - case FN_VIEW_FIELDNAME: if( STATE_TOGGLE == eState ) bFlag = !pOpt->IsFieldName() ; @@ -699,7 +707,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) bool bWebView = dynamic_cast(this) != nullptr; SwWrtShell &rSh = GetWrtShell(); rSh.StartAction(); - SwModule* pModule = SW_MOD(); + SwModule* pModule = SwModule::get(); if( *rSh.GetViewOptions() != *pOpt ) { rSh.ApplyViewOptions( *pOpt ); diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index ca51ceba98c7..e18de9600d58 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -47,8 +47,7 @@ void SwView::Activate(bool bMDIActivate) SwDocShell* pDocSh = GetDocShell(); if(pDocSh) pDocSh->SetView(this); - SwModule* pSwMod = SW_MOD(); - pSwMod->SetView(this); + SwModule::get()->SetView(this); // Document size has changed. if(!bDocSzUpdated) diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index fa4d6b3d7eae..ff795be11827 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2952,7 +2952,7 @@ namespace return ( !aNames.hasElements() || ( ( 1 == aNames.getLength() ) - && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource + && aNames.getConstArray()[0] == SwModule::get()->GetDBConfig()->GetBibliographySource().sDataSource ) ); } diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 5eb3340627c6..49112bb77495 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -195,7 +195,7 @@ bool SwView::isQRCodeSelected() const void SwView::AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId) { - SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); + SwModuleOptions* pModOpt = SwModule::get()->GetModuleConfig(); bool bWeb = dynamic_cast( this ) != nullptr; if (pModOpt->IsInsWithCaption(bWeb)) diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 952f6f89244a..e02b0d284232 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -585,7 +585,7 @@ bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, } // editing should start at the end of text, spell checking at the beginning ... - ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND); + ESelection aNewSelection(ESelection::AtEnd()); if (bSetSelectionToStart) aNewSelection = ESelection(); if (pView) diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index f211396116d7..e62c4987ea79 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -95,7 +95,8 @@ void SwView::SetZoom_( const Size &rEditSize, SvxZoomType eZoomType, tools::Long nFac = nFactor; const bool bWeb = dynamic_cast< const SwWebView *>( this ) != nullptr; - SwMasterUsrPref *pUsrPref = const_cast(SW_MOD()->GetUsrPref(bWeb)); + SwModule* mod = SwModule::get(); + SwMasterUsrPref *pUsrPref = const_cast(mod->GetUsrPref(bWeb)); const SwPageDesc &rDesc = m_pWrtShell->GetPageDesc( m_pWrtShell->GetCurPageDesc() ); const SvxLRSpaceItem &rLRSpace = rDesc.GetMaster().GetLRSpace(); @@ -167,7 +168,7 @@ void SwView::SetZoom_( const Size &rEditSize, SvxZoomType eZoomType, { pUsrPref->SetZoom(nZoomFac); pUsrPref->SetZoomType(eZoomType); - SW_MOD()->ApplyUsrPref(*pUsrPref, nullptr); + mod->ApplyUsrPref(*pUsrPref, nullptr); pUsrPref->SetModified(); } if ( pOpt->GetZoom() != nZoomFac ) @@ -227,7 +228,8 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly if ( !GetViewFrame().GetFrame().IsInPlace() && !bViewOnly ) { const bool bWeb = dynamic_cast< const SwWebView *>( this ) != nullptr; - SwMasterUsrPref *pUsrPref = const_cast(SW_MOD()->GetUsrPref(bWeb)); + SwModule* mod = SwModule::get(); + SwMasterUsrPref *pUsrPref = const_cast(mod->GetUsrPref(bWeb)); // Update MasterUsrPrefs and after that update the ViewOptions of the current View. if ( nColumns != pUsrPref->GetViewLayoutColumns() || @@ -235,7 +237,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly { pUsrPref->SetViewLayoutColumns(nColumns); pUsrPref->SetViewLayoutBookMode(bBookMode); - SW_MOD()->ApplyUsrPref(*pUsrPref, nullptr); + mod->ApplyUsrPref(*pUsrPref, nullptr); pUsrPref->SetModified(); } } diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 1d19a897c034..aca4407a5264 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -79,7 +79,7 @@ SfxPrinter* SwView::GetPrinter( bool bCreate ) void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter const * pNew, bool bWeb ) { - SwPrintOptions* pOpt = SW_MOD()->GetPrtOptions(bWeb); + SwPrintOptions* pOpt = SwModule::get()->GetPrtOptions(bWeb); if( !pOpt) return; @@ -177,7 +177,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) { case FN_FAX: { - SwPrintOptions* pPrintOptions = SW_MOD()->GetPrtOptions(bWeb); + SwPrintOptions* pPrintOptions = SwModule::get()->GetPrtOptions(bWeb); const OUString& sFaxName(pPrintOptions->GetFaxName()); if (!sFaxName.isEmpty()) { @@ -214,7 +214,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) bool bFromMerge = pPrintFromMergeItem && pPrintFromMergeItem->GetValue(); bool bPrintSelection = false; if(!bSilent && !bFromMerge && - SW_MOD()->GetModuleConfig()->IsAskForMailMerge() && pSh->IsAnyDatabaseFieldInDoc()) + SwModule::get()->GetModuleConfig()->IsAskForMailMerge() && pSh->IsAnyDatabaseFieldInDoc()) { std::unique_ptr xBuilder(Application::CreateBuilder(GetEditWin().GetFrameWeld(), u"modules/swriter/ui/printmergedialog.ui"_ustr)); std::unique_ptr xBox(xBuilder->weld_message_dialog(u"PrintMergeDialog"_ustr)); diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 45267fc42651..866e1a9fa99a 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -301,7 +301,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_TWAIN_TRANSFER: #if defined(_WIN32) || defined UNX { - if(!SW_MOD()->GetScannerManager().is()) + if (!SwModule::get()->GetScannerManager().is()) rSet.DisableItem(nWhich); } #endif @@ -513,7 +513,7 @@ void SwView::GetState(SfxItemSet &rSet) rSet.DisableItem(nWhich); break; case SID_VIEW_DATA_SOURCE_BROWSER: - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) + if (!SvtModuleOptions().IsDataBaseInstalled()) rSet.Put( SfxVisibilityItem( nWhich, false ) ); else rSet.Put( SfxBoolItem( nWhich, GetViewFrame().HasChildWindow( SID_BROWSER ) ) ); diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 2414fbfe44e1..2d6c636f0bc9 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -270,7 +270,7 @@ void SwXPrintSettings::_preSetValues () switch (meType) { case SwXPrintSettingsType::Module: - mpPrtOpt = SW_MOD()->GetPrtOptions( false ); + mpPrtOpt = SwModule::get()->GetPrtOptions(false); break; case SwXPrintSettingsType::Document: { @@ -407,7 +407,7 @@ void SwXPrintSettings::_preGetValues() switch (meType) { case SwXPrintSettingsType::Module: - mpPrtOpt = SW_MOD()->GetPrtOptions( false ); + mpPrtOpt = SwModule::get()->GetPrtOptions(false); break; case SwXPrintSettingsType::Document: { @@ -543,7 +543,7 @@ void SwXViewSettings::_preSetValues () pVOpt = m_pView->GetWrtShell().GetViewOptions(); } else - pVOpt = SW_MOD()->GetViewOption(false); + pVOpt = SwModule::get()->GetViewOption(false); mpViewOption.reset( new SwViewOption (*pVOpt) ); mbApplyZoom = false; @@ -581,8 +581,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetShowHiddenField(*o3tl::doAccess(rValue)); break; case HANDLE_VIEWSET_HIDDEN_CHARACTERS : mpViewOption->SetShowHiddenChar(*o3tl::doAccess(rValue)); break; case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(*o3tl::doAccess(rValue)); break; - case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(ViewOptFlags::TableBoundaries, *o3tl::doAccess(rValue), true); break; - case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(*o3tl::doAccess(rValue)); break; + case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetTableBoundaries(*o3tl::doAccess(rValue)); break; + case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetTextBoundaries(*o3tl::doAccess(rValue)); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(*o3tl::doAccess(rValue)); break; case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : mpViewOption->SetShowContentTips(*o3tl::doAccess(rValue)); break; case HANDLE_VIEWSET_IS_RASTER_VISIBLE : mpViewOption->SetGridVisible(*o3tl::doAccess(rValue)); break; @@ -751,7 +751,6 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c } } break; - case HANDLE_VIEWSET_TEXTBOUNDARIES: mpViewOption->SetTextBoundariesFull(*o3tl::doAccess(rValue)); break; default: throw UnknownPropertyException(OUString::number(rInfo.mnHandle)); } @@ -759,6 +758,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c void SwXViewSettings::_postSetValues() { + SwModule* mod = SwModule::get(); if( m_pView ) { if(mbApplyZoom ) @@ -773,12 +773,12 @@ void SwXViewSettings::_postSetValues() else { if(mbApplyHRulerMetric) - SW_MOD()->ApplyRulerMetric( m_eHRulerUnit, true, false ); + mod->ApplyRulerMetric(m_eHRulerUnit, true, false); if(mbApplyVRulerMetric) - SW_MOD()->ApplyRulerMetric( m_eVRulerUnit, false, false ); + mod->ApplyRulerMetric(m_eVRulerUnit, false, false); } - SW_MOD()->ApplyUsrPref( *mpViewOption, m_pView, m_pView ? SvViewOpt::DestViewOnly + mod->ApplyUsrPref( *mpViewOption, m_pView, m_pView ? SvViewOpt::DestViewOnly : SvViewOpt::DestText ); mpViewOption.reset(); @@ -793,7 +793,7 @@ void SwXViewSettings::_preGetValues () mpConstViewOption = m_pView->GetWrtShell().GetViewOptions(); } else - mpConstViewOption = SW_MOD()->GetViewOption(false); + mpConstViewOption = SwModule::get()->GetViewOption(false); } void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue ) @@ -829,7 +829,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u case HANDLE_VIEWSET_HIDE_WHITESPACE : bBoolVal = mpConstViewOption->IsHideWhitespaceMode(); break; case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal = mpConstViewOption->IsShowHiddenPara(); break; case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = mpConstViewOption->IsTableBoundaries(); break; - case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = mpConstViewOption->IsDocBoundaries(); break; + case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = mpConstViewOption->IsTextBoundaries(); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break; case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : bBoolVal = mpConstViewOption->IsShowContentTips(); break; case HANDLE_VIEWSET_INLINECHANGES_TIPS : bBoolVal = mpConstViewOption->IsShowInlineTooltips(); break; @@ -910,7 +910,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u } else { - const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref( false ); + const SwMasterUsrPref* pUsrPref = SwModule::get()->GetUsrPref(false); rValue <<= static_cast(pUsrPref->GetHScrollMetric()); } bBool = false; @@ -926,13 +926,12 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u } else { - const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref( false ); + const SwMasterUsrPref* pUsrPref = SwModule::get()->GetUsrPref(false); rValue <<= static_cast(pUsrPref->GetVScrollMetric()); } bBool = false; } break; - case HANDLE_VIEWSET_TEXTBOUNDARIES : bBoolVal = mpConstViewOption->IsTextBoundariesFull(); break; default: OSL_FAIL("there is no such ID!"); } if( bBool ) diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index 714ae5d5ec1c..202e876f3b26 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -52,14 +52,15 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons SolarMutexGuard aGuard; SwGlobals::ensure(); - const SfxSlot* pSlot = SW_MOD()->GetInterface()->GetSlot( aURL.Complete ); + SwModule* mod = SwModule::get(); + const SfxSlot* pSlot = mod->GetInterface()->GetSlot(aURL.Complete); sal_Int16 aState = frame::DispatchResultState::DONTKNOW; if ( !pSlot ) aState = frame::DispatchResultState::FAILURE; else { - SfxRequest aReq( pSlot, aArgs, SfxCallMode::SYNCHRON, SW_MOD()->GetPool() ); + SfxRequest aReq(pSlot, aArgs, SfxCallMode::SYNCHRON, mod->GetPool()); SfxAllItemSet aInternalSet( SfxGetpApp()->GetPool() ); css::uno::Reference xDesktop = css::frame::Desktop::create(::comphelper::getProcessComponentContext()); @@ -68,7 +69,7 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons aInternalSet.Put(SfxUnoFrameItem(SID_FILLFRAME, xCurrentFrame)); aReq.SetInternalArgs_Impl(aInternalSet); - const SfxPoolItemHolder& rResult(SW_MOD()->ExecuteSlot(aReq)); + const SfxPoolItemHolder& rResult(mod->ExecuteSlot(aReq)); if (rResult) aState = frame::DispatchResultState::SUCCESS; else @@ -123,7 +124,7 @@ uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch( SolarMutexGuard aGuard; SwGlobals::ensure(); - const SfxSlot* pSlot = SW_MOD()->GetInterface()->GetSlot( aURL.Complete ); + const SfxSlot* pSlot = SwModule::get()->GetInterface()->GetSlot(aURL.Complete); if ( pSlot ) xReturn = this; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 2c5d72edaff2..148cb4de6189 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1944,7 +1944,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& { OUString sDelim; aValue >>= sDelim; - SW_MOD()->GetModuleConfig()->SetWordDelimiter(sDelim); + SwModule::get()->GetModuleConfig()->SetWordDelimiter(sDelim); } break; case WID_DOC_CHANGES_RECORD: @@ -1991,7 +1991,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& } break; case WID_DOC_HIDE_TIPS : - SW_MOD()->GetModuleConfig()->SetHideFieldTips(*o3tl::doAccess(aValue)); + SwModule::get()->GetModuleConfig()->SetHideFieldTips(*o3tl::doAccess(aValue)); break; case WID_DOC_REDLINE_DISPLAY: { @@ -2167,9 +2167,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) } break; case WID_DOC_WORD_SEPARATOR : - { - aAny <<= SW_MOD()->GetDocStatWordDelim(); - } + aAny <<= SwModule::get()->GetDocStatWordDelim(); break; case WID_DOC_CHANGES_RECORD: case WID_DOC_CHANGES_SHOW: @@ -2194,7 +2192,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) aAny <<= GetDocOrThrow().GetTOIAutoMarkURL(); break; case WID_DOC_HIDE_TIPS : - aAny <<= SW_MOD()->GetModuleConfig()->IsHideFieldTips(); + aAny <<= SwModule::get()->GetModuleConfig()->IsHideFieldTips(); break; case WID_DOC_REDLINE_DISPLAY: { @@ -3450,7 +3448,7 @@ void SwXTextDocument::getTrackedChanges(tools::JsonWriter& rJson) void SwXTextDocument::getTrackedChangeAuthors(tools::JsonWriter& rJsonWriter) { - SW_MOD()->GetRedlineAuthorInfo(rJsonWriter); + SwModule::get()->GetRedlineAuthorInfo(rJsonWriter); } void SwXTextDocument::getRulerState(tools::JsonWriter& rJsonWriter) @@ -3777,7 +3775,7 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::SequenceGetRedlineAuthor(SW_MOD()->GetRedlineAuthor()); + OUString sOrigAuthor = SwModule::get()->GetRedlineAuthor(SwModule::get()->GetRedlineAuthor()); OUString sAuthor; for (const beans::PropertyValue& rValue : rArguments) diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index f48457b483ee..e7d4ca9f76cd 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -1054,12 +1054,12 @@ void SwXTextViewCursor::gotoRange( auto [pParamLeft, pParamRight] = rDestPam.StartEnd(); // SwPosition* // Now four SwPositions are there, two of them are needed, but which? if(aOwnRight > *pParamRight) - *aOwnPaM.GetPoint() = aOwnRight; + *aOwnPaM.GetPoint() = std::move(aOwnRight); else *aOwnPaM.GetPoint() = *pParamRight; aOwnPaM.SetMark(); if(aOwnLeft < *pParamLeft) - *aOwnPaM.GetMark() = aOwnLeft; + *aOwnPaM.GetMark() = std::move(aOwnLeft); else *aOwnPaM.GetMark() = *pParamLeft; } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 722e5bc2e93f..c48b519bb276 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -479,7 +479,7 @@ SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, sal_uInt8 const int nShift = static_cast(m_nContentType); assert(nShift > -1); const sal_Int32 nMask = 1 << nShift; - const sal_Int32 nBlock = SW_MOD()->GetNavigationConfig()->GetSortAlphabeticallyBlock(); + const sal_Int32 nBlock = SwModule::get()->GetNavigationConfig()->GetSortAlphabeticallyBlock(); m_bAlphabeticSort = nBlock & nMask; FillMemberList(); @@ -1143,7 +1143,7 @@ SwContentTree::SwContentTree(std::unique_ptr xTreeView, SwNaviga , m_sInvisible(SwResId(STR_INVISIBLE)) , m_pHiddenShell(nullptr) , m_pActiveShell(nullptr) - , m_pConfig(SW_MOD()->GetNavigationConfig()) + , m_pConfig(SwModule::get()->GetNavigationConfig()) , m_nActiveBlock(0) , m_nHiddenBlock(0) , m_nEntryCount(0) @@ -3958,6 +3958,7 @@ void SwContentTree::ExecCommand(std::u16string_view rCmd, bool bOutlineWithChild // get first regular document content node outline node position in outline nodes array SwOutlineNodes::size_type nFirstRegularDocContentOutlineNodePos = SwOutlineNodes::npos; SwNodeOffset nEndOfExtrasIndex = rNodes.GetEndOfExtras().GetIndex(); + sal_Int32 nHasInlineHeading = 0; for (SwOutlineNodes::size_type nPos = 0; nPos < nOutlineNdsSize; nPos++) { if (rOutlineNodes[nPos]->GetIndex() > nEndOfExtrasIndex) @@ -3965,6 +3966,8 @@ void SwContentTree::ExecCommand(std::u16string_view rCmd, bool bOutlineWithChild nFirstRegularDocContentOutlineNodePos = nPos; break; } + if ( bUpDown && rOutlineNodes[nPos] != SwOutlineNodes::GetRootNode(rOutlineNodes[nPos]) ) + ++nHasInlineHeading; } for (auto const& pCurrentEntry : selected) @@ -3977,7 +3980,20 @@ void SwContentTree::ExecCommand(std::u16string_view rCmd, bool bOutlineWithChild (bUpDown && (!pShell->IsOutlineMovable(nActPos) || nFirstRegularDocContentOutlineNodePos == SwOutlineNodes::npos))) { - continue; + // except inline headings, i.e. Inline Heading frames with + // single outlines, and anchored as characters, which headings + // are movable with their anchor node, if they are + // 1) not in other frames or 2) not in tables and 3) not protected + const SwNode* pRootNode = nHasInlineHeading > 0 + ? SwOutlineNodes::GetRootNode(rOutlineNodes[nActPos]) + : nullptr; + if ( !pRootNode || pRootNode == rOutlineNodes[nActPos] || + pRootNode != SwOutlineNodes::GetRootNode(pRootNode) || // frame in frame + pRootNode->FindTableNode() || // frame in table + pRootNode->IsProtect() ) // write protection + { + continue; + } } if (!bStartedAction) @@ -3990,7 +4006,91 @@ void SwContentTree::ExecCommand(std::u16string_view rCmd, bool bOutlineWithChild pShell->GotoOutline( nActPos); // If text selection != box selection pShell->Push(); - if (bUpDown) + if (nHasInlineHeading && bUpDown) + { + SwOutlineNodesInline aOutlineNodesInline; + // sort inline headings correctly + for (SwNode* pNode : rOutlineNodes) + aOutlineNodesInline.insert(pNode); + const SwOutlineNodes::size_type nOutlineNdsSizeInline = aOutlineNodesInline.size(); + + // move outline position up/down (outline position promote/demote) + SwOutlineNodes::difference_type nDir = bUp ? -1 : 1; + SwOutlineNodesInline::size_type nActPosInline; + aOutlineNodesInline.Seek_Entry(rOutlineNodes[nActPos], &nActPosInline); + if ( (nDir == -1 && nActPosInline > 0) || + (nDir == 1 && nActPosInline < nOutlineNdsSizeInline - 1) ) + { + // make outline selection for use by MoveOutlinePara + pShell->MakeOutlineSel(nActPos, nActPos, bOutlineWithChildren, true, &aOutlineNodesInline); + + int nActPosOutlineLevel = + rOutlineNodes[nActPos]->GetTextNode()->GetAttrOutlineLevel(); + // search for sorted position + SwOutlineNodesInline::size_type nPos; + aOutlineNodesInline.Seek_Entry_By_Anchor(SwOutlineNodes::GetRootNode(rOutlineNodes[nActPos]), &nPos); + if (!bUp) + { + // move down + int nPosOutlineLevel = -1; + while (++nPos < nOutlineNdsSizeInline) + { + nPosOutlineLevel = aOutlineNodesInline[nPos]->GetTextNode()->GetAttrOutlineLevel(); + + // discontinue if moving out of parent or equal level is found + if (nPosOutlineLevel <= nActPosOutlineLevel) + { + break; + } + // count the children of the node when they are not included in the move + if (!bOutlineWithChildren) + nDir++; + } + if (nPosOutlineLevel >= nActPosOutlineLevel) + { + // move past children + while (++nPos < nOutlineNdsSizeInline) + { + nPosOutlineLevel = aOutlineNodesInline[nPos]->GetTextNode()->GetAttrOutlineLevel(); + // discontinue if moving out of parent or equal level is found + if (nPosOutlineLevel <= nActPosOutlineLevel) + break; + nDir++; + } + } + } + else + { + // move up + while (nPos && --nPos >= nFirstRegularDocContentOutlineNodePos - nHasInlineHeading) + { + int nPosOutlineLevel = + aOutlineNodesInline[nPos]->GetTextNode()->GetAttrOutlineLevel(); + // discontinue if equal level is found + if (nPosOutlineLevel == nActPosOutlineLevel) + { + break; + } + // discontinue if moving out of parent + if (nPosOutlineLevel < nActPosOutlineLevel) + { + // Required for expected chapter placement when the chapter being moved + // up has an outline level less than the outline level of chapters it + // is being moved above and then encounters a chapter with an outline + // level that is greater before reaching a chapter with the same + // outline level as itself. + if (nDir < -1) + nDir++; + break; + } + nDir--; + } + } + pShell->MoveOutlinePara(nDir, &aOutlineNodesInline); + } + pShell->ClearMark(); + } + else if (bUpDown) { // move outline position up/down (outline position promote/demote) SwOutlineNodes::difference_type nDir = bUp ? -1 : 1; diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index e8ab96545266..e0c77c357943 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -444,7 +444,7 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent, , m_pContentWrtShell(nullptr) , m_pActContView(nullptr) , m_pCreateView(nullptr) - , m_pConfig(SW_MOD()->GetNavigationConfig()) + , m_pConfig(SwModule::get()->GetNavigationConfig()) , m_rBindings(*_pBindings) , m_bIsZoomedIn(false) , m_bGlobalMode(false) @@ -1282,7 +1282,7 @@ SwNavigatorWin::SwNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, { _pBindings->Invalidate(SID_NAVIGATOR); - SwNavigationConfig* pNaviConfig = SW_MOD()->GetNavigationConfig(); + SwNavigationConfig* pNaviConfig = SwModule::get()->GetNavigationConfig(); SetMinOutputSizePixel(GetOptimalSize()); if (pNaviConfig->IsSmall()) diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 86c1c18264ef..ac13b482ea92 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -758,14 +758,14 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) FieldUnit GetDfltMetric(bool bWeb) { - return SW_MOD()->GetUsrPref(bWeb)->GetMetric(); + return SwModule::get()->GetUsrPref(bWeb)->GetMetric(); } // Determine metric void SetDfltMetric( FieldUnit eMetric, bool bWeb ) { - SW_MOD()->ApplyUserMetric(eMetric, bWeb); + SwModule::get()->ApplyUserMetric(eMetric, bWeb); } void InsertStringSorted(const OUString& rId, const OUString& rEntry, weld::ComboBox& rToFill, int nOffset) @@ -873,12 +873,12 @@ OUString GetAppLangDateTimeString( const DateTime& rDT ) bool HasCharUnit( bool bWeb) { - return SW_MOD()->GetUsrPref(bWeb)->IsApplyCharUnit(); + return SwModule::get()->GetUsrPref(bWeb)->IsApplyCharUnit(); } void SetApplyCharUnit(bool bApplyChar, bool bWeb) { - SW_MOD()->ApplyUserCharUnit(bApplyChar, bWeb); + SwModule::get()->ApplyUserCharUnit(bApplyChar, bWeb); } bool ExecuteMenuCommand(const css::uno::Reference& rMenu, const SfxViewFrame& rViewFrame, sal_uInt16 nId) diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 680f4f22c61e..7029b6f29e68 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -92,7 +92,7 @@ SwOneExampleFrame::SwOneExampleFrame(sal_uInt32 nFlags, const Link* pInitializedLink, const OUString* pURL) : m_aLoadedIdle("sw uibase SwOneExampleFrame Loaded") - , m_pModuleView(SW_MOD()->GetView()) + , m_pModuleView(SwModule::get()->GetView()) , m_nStyleFlags(nFlags) , m_bIsInitialized(false) { @@ -141,7 +141,7 @@ void SwOneExampleFrame::Paint(vcl::RenderContext& rRenderContext, const tools::R // invalidate on rRenderContext if it is a vcl::Window, which is the "classic" gen mode m_xVirDev->SetOutputSizePixel(aSize); - Color aBgColor = SW_MOD()->GetColorConfig().GetColorValue(::svtools::DOCCOLOR).nColor; + Color aBgColor = SwModule::get()->GetColorConfig().GetColorValue(::svtools::DOCCOLOR).nColor; m_xVirDev->DrawWallpaper(tools::Rectangle(Point(), aSize), aBgColor); if (m_xCursor) @@ -415,7 +415,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) } } - SW_MOD()->SetView(m_pModuleView); + SwModule::get()->SetView(m_pModuleView); Invalidate(); } diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index 766c1a5ccb00..2ed240b0252c 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -117,7 +117,7 @@ void SwWebView::SelectShell() else { SfxDispatcher &rDispatcher = *GetViewFrame().GetDispatcher(); - SwToolbarConfigItem *pBarCfg = SW_MOD()->GetWebToolbarConfig(); + SwToolbarConfigItem* pBarCfg = SwModule::get()->GetWebToolbarConfig(); if( GetCurShell() ) { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 0e980c9f262d..040d3c81ebc7 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -153,9 +153,7 @@ static bool lcl_IsAllowed(const SwWrtShell* rSh) if (pTextNode && pTextNode->IsOutline()) { // disallow if this is an outline node having folded content - bool bVisible = true; - pTextNode->GetAttrOutlineContentVisible(bVisible); - if (!bVisible) + if (!pTextNode->GetAttrOutlineContentVisible()) return false; } } @@ -457,7 +455,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName // TODO/LATER: recording! Convert properties to items case SID_INSERT_FLOATINGFRAME: { - SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool(); + SfxSlotPool* pSlotPool = SwModule::get()->GetSlotPool(); const SfxSlot* pSlot = pSlotPool->GetSlot(nSlotId); OUString aCmd = pSlot->GetCommand(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1262,9 +1260,7 @@ static bool lcl_FoldedOutlineNodeEndOfParaSplit(SwWrtShell *pThis) SwTextNode* pTextNode = pThis->GetCursor()->GetPointNode().GetTextNode(); if (pTextNode && pTextNode->IsOutline()) { - bool bVisible = true; - pTextNode->GetAttrOutlineContentVisible(bVisible); - if (!bVisible) + if (!pTextNode->GetAttrOutlineContentVisible()) { const SwNodes& rNodes = pThis->GetNodes(); const SwOutlineNodes& rOutlineNodes = rNodes.GetOutLineNds(); @@ -2264,8 +2260,9 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr, const SfxRequest& rReq) sAuthor = pAuthorItem->GetValue(); else { - std::size_t nAuthor = SW_MOD()->GetRedlineAuthor(); - sAuthor = SW_MOD()->GetRedlineAuthor(nAuthor); + SwModule* mod = SwModule::get(); + std::size_t nAuthor = mod->GetRedlineAuthor(); + sAuthor = mod->GetRedlineAuthor(nAuthor); } const SvxPostItTextItem* pTextItem = rReq.GetArg(SID_ATTR_POSTIT_TEXT); @@ -2568,9 +2565,7 @@ void SwWrtShell::MakeOutlineContentVisible(const size_t nPos, bool bMakeVisible, if (pNd->IsTextNode() && pNd->GetTextNode()->IsOutline()) { SwTextNode* pTextNd = pNd->GetTextNode(); - bool bOutlineContentVisibleAttr = true; - pTextNd->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr); - if (!bOutlineContentVisibleAttr) + if (!pTextNd->GetAttrOutlineContentVisible()) { SwOutlineNodes::size_type iPos; if (rOutlineNodes.Seek_Entry(pTextNd, &iPos)) @@ -2597,8 +2592,7 @@ void SwWrtShell::InvalidateOutlineContentVisibility() for (SwOutlineNodes::size_type nPos = 0; nPos < rOutlineNds.size(); ++nPos) { bool bIsOutlineContentVisible = IsOutlineContentVisible(nPos); - bool bOutlineContentVisibleAttr = true; - rOutlineNds[nPos]->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr); + bool bOutlineContentVisibleAttr = rOutlineNds[nPos]->GetTextNode()->GetAttrOutlineContentVisible(); if (!bIsOutlineContentVisible && bOutlineContentVisibleAttr) MakeOutlineContentVisible(nPos); else if (bIsOutlineContentVisible && !bOutlineContentVisibleAttr) @@ -2622,9 +2616,7 @@ void SwWrtShell::MakeAllFoldedOutlineContentVisible(bool bMakeVisible) std::vector aFoldedOutlineNodeArray; for (SwNode* pNd: GetNodes().GetOutLineNds()) { - bool bOutlineContentVisibleAttr = true; - pNd->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr); - if (!bOutlineContentVisibleAttr) + if (!pNd->GetTextNode()->GetAttrOutlineContentVisible()) { aFoldedOutlineNodeArray.push_back(pNd); pNd->GetTextNode()->SetAttrOutlineContentVisible(true); @@ -2666,9 +2658,7 @@ void SwWrtShell::MakeAllFoldedOutlineContentVisible(bool bMakeVisible) bool SwWrtShell::GetAttrOutlineContentVisible(const size_t nPos) const { - bool bVisibleAttr = true; - GetNodes().GetOutLineNds()[nPos]->GetTextNode()->GetAttrOutlineContentVisible(bVisibleAttr); - return bVisibleAttr; + return GetNodes().GetOutLineNds()[nPos]->GetTextNode()->GetAttrOutlineContentVisible(); } bool SwWrtShell::HasFoldedOutlineContentSelected() const diff --git a/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx index 35a561fbbd13..f1f53d626c91 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx @@ -295,6 +295,45 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) } } } + //Overwrite font size attribute on fill cells + RTFValue::Pointer_t pFontSize; + RTFValue::Pointer_t pFontSizeCs; + int nCell = 1; + for (Buf_t& rTableBufferElement : m_aTableBufferStack.back()) + { + if (BUFFER_CELLEND == std::get<0>(rTableBufferElement)) + ++nCell; + else if (nCell == nCellCount - 1) + { + if (BUFFER_PROPS_CHAR == std::get<0>(rTableBufferElement)) + { + tools::SvRef xPropValue + = std::get<1>(rTableBufferElement); + RTFSprms& rElementSprms = xPropValue->getSprms(); + pFontSize = rElementSprms.find(NS_ooxml::LN_EG_RPrBase_sz); + pFontSizeCs = rElementSprms.find(NS_ooxml::LN_EG_RPrBase_szCs); + } + } + } + + nCell = 1; + for (Buf_t& rTableBufferElement : m_aTableBufferStack.back()) + { + if (BUFFER_CELLEND == std::get<0>(rTableBufferElement)) + ++nCell; + //Remove paragraph spacing on fill cells + if (nCell == nCellCount && BUFFER_PROPS == std::get<0>(rTableBufferElement)) + { + tools::SvRef xPropValue + = std::get<1>(rTableBufferElement); + RTFSprms& rElementSprms = xPropValue->getSprms(); + rElementSprms.erase(NS_ooxml::LN_CT_PPrBase_spacing); + if (pFontSize) + rElementSprms.set(NS_ooxml::LN_EG_RPrBase_sz, pFontSize); + if (pFontSizeCs) + rElementSprms.set(NS_ooxml::LN_EG_RPrBase_szCs, pFontSizeCs); + } + } m_aStates.top().setTableRowWidthAfter(0); } diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 1b1370e8b380..dd3eb8c6bd12 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -200,8 +200,7 @@ - - + diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index dc0715beeb81..00c5cefefe15 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -131,7 +131,7 @@ - + diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 5eebcc9a96a1..6da6a923e662 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -168,8 +168,7 @@ - - + diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 59f630afc70e..57b49e6b9d90 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -160,8 +160,7 @@ - - + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index ea5ef0f6b9cb..04b9fb4e2c91 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -206,9 +206,7 @@ - - - + diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui index 7d043cff1560..7fcfaeb6674e 100644 --- a/sw/uiconfig/swriter/ui/navigatorpanel.ui +++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui @@ -1346,10 +1346,11 @@ True False - Document + Open Documents Active Window + Lists currently open documents. diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 25983178d3da..524dffbc4939 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -2263,21 +2263,7 @@ True False - .uno:ViewBounds - - - - - True - False - .uno:TableBoundaries - - - - - True - False - .uno:SectionBoundaries + .uno:ShowBoundaries diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 4e678b5a18ef..2a600fc1ccb5 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -2441,21 +2441,7 @@ True False - .uno:ViewBounds - - - - - True - False - .uno:TableBoundaries - - - - - True - False - .uno:SectionBoundaries + .uno:ShowBoundaries diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index e0129e255828..f1688927c5e1 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -1670,21 +1670,7 @@ True False - .uno:ViewBounds - - - - - True - False - .uno:TableBoundaries - - - - - True - False - .uno:SectionBoundaries + .uno:ShowBoundaries @@ -3406,21 +3392,7 @@ True False - .uno:ViewBounds - - - - - True - False - .uno:TableBoundaries - - - - - True - False - .uno:SectionBoundaries + .uno:ShowBoundaries diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 59a3584f33a8..1eeacc41be3c 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -1649,21 +1649,7 @@ True False - .uno:ViewBounds - - - - - True - False - .uno:TableBoundaries - - - - - True - False - .uno:SectionBoundaries + .uno:ShowBoundaries @@ -3747,21 +3733,7 @@ True False - .uno:ViewBounds - - - - - True - False - .uno:TableBoundaries - - - - - True - False - .uno:SectionBoundaries + .uno:ShowBoundaries diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui index de56bcb643a2..c461544ca92e 100644 --- a/sw/uiconfig/swriter/ui/optformataidspage.ui +++ b/sw/uiconfig/swriter/ui/optformataidspage.ui @@ -107,7 +107,7 @@ - Tabs + _Tabs True True False @@ -145,7 +145,7 @@ - Hidden characters + _Hidden characters True True False @@ -164,7 +164,7 @@ - Bookmarks + _Bookmarks True True False @@ -433,7 +433,7 @@ 6 - Math baseline alignment + _Math baseline alignment True True False @@ -844,38 +844,20 @@ 0 none - + True False + 12 6 3 - - Crop marks + + Te_xt True True False start - 12 - True - True - True - rbTextBoundariesFull - - - 0 - 1 - - - - - Full - True - True - False - start - 12 True True True @@ -885,13 +867,85 @@ 0 + + + Tab_les + True + True + False + start + True + True + True + + + 0 + 3 + 2 + + + + + _Sections and Frames + True + True + False + start + True + True + True + + + 0 + 2 + 2 + + + + + _Crop marks + True + True + False + start + 12 + True + True + True + + + 1 + 1 + + + + + Border _Outline + True + True + False + start + 12 + True + True + True + rbTextBoundariesCrop + + + 1 + 0 + + + + + True False - Text Boundaries + Object Boundaries diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 70e0c4a10b84..393fbf4aec4a 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -196,8 +196,7 @@ - - + diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index d74a496ad1ec..1c614b324c93 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -53,13 +53,11 @@ namespace { class SortableGridDataModel; typedef ::comphelper::WeakComponentImplHelper < css::awt::grid::XSortableMutableGridDataModel + , css::awt::grid::XGridDataListener , css::lang::XServiceInfo , css::lang::XInitialization > SortableGridDataModel_Base; -typedef ::cppu::ImplHelper1 < css::awt::grid::XGridDataListener - > SortableGridDataModel_PrivateBase; class SortableGridDataModel :public SortableGridDataModel_Base - ,public SortableGridDataModel_PrivateBase { public: explicit SortableGridDataModel( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); @@ -122,15 +120,6 @@ public: // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override; - // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; - virtual void SAL_CALL acquire( ) noexcept final override; - virtual void SAL_CALL release( ) noexcept override; - - // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) override; - private: /** translates the given public index into one to be passed to our delegator @throws css::lang::IndexOutOfBoundsException @@ -221,7 +210,6 @@ void lcl_clear( STLCONTAINER& i_container ) { } - SortableGridDataModel::SortableGridDataModel( SortableGridDataModel const & i_copySource ) :m_xContext( i_copySource.m_xContext ) ,m_isInitialized( true ) @@ -244,40 +232,6 @@ void lcl_clear( STLCONTAINER& i_container ) dispose(); } - - Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) - { - Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) ); - if ( !aReturn.hasValue() ) - aReturn = SortableGridDataModel_PrivateBase::queryInterface( aType ); - return aReturn; - } - - - void SAL_CALL SortableGridDataModel::acquire( ) noexcept - { - SortableGridDataModel_Base::acquire(); - } - - - void SAL_CALL SortableGridDataModel::release( ) noexcept - { - SortableGridDataModel_Base::release(); - } - - - Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( ) - { - return SortableGridDataModel_Base::getTypes(); - // don't expose the types got via SortableGridDataModel_PrivateBase - they're private, after all - } - - - Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId( ) - { - return css::uno::Sequence(); - } - Reference< XCollator > lcl_loadDefaultCollator_throw( const Reference & rxContext ) { Reference< XCollator > const xCollator = Collator::create( rxContext ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 2fff360fc88b..ea328276bf3c 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -69,7 +70,7 @@ css::uno::Reference< css::graphic::XGraphic > ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL, OUString const & referer ) { uno::Reference< graphic::XGraphic > xGraphic; - if ( _rURL.isEmpty() || SvtSecurityOptions::isUntrustedReferer(referer) ) + if (_rURL.isEmpty() || SvtSecurityOptions::isUntrustedReferer(referer) || INetURLObject(_rURL).IsExoticProtocol()) return xGraphic; try diff --git a/toolkit/source/hatchwindow/ipwin.cxx b/toolkit/source/hatchwindow/ipwin.cxx index 52d3668b7ffb..3315cd910089 100644 --- a/toolkit/source/hatchwindow/ipwin.cxx +++ b/toolkit/source/hatchwindow/ipwin.cxx @@ -382,7 +382,7 @@ void SvResizeHelper::ValidateRect( tools::Rectangle & rValidate ) const break; } - // Mindestgr"osse 5 x 5 + // Minimum size 5 x 5 if( rValidate.Left() + 5 > rValidate.Right() ) rValidate.SetRight( rValidate.Left() + 5 ); if( rValidate.Top() + 5 > rValidate.Bottom() ) diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index 03ec18e6f394..3548f08f06f8 100644 --- a/tools/source/datetime/tdate.cxx +++ b/tools/source/datetime/tdate.cxx @@ -209,9 +209,8 @@ sal_uInt16 Date::GetDayOfYear() const sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay, sal_Int16 nMinimumNumberOfDaysInWeek ) const { - short nWeek; + // coverity[ tainted_data_return : FALSE ] version 2023.12.2 short n1WDay = static_cast(Date( 1, 1, GetYear() ).GetDayOfWeek()); - assert(n1WDay >= 0); short nDayOfYear = static_cast(GetDayOfYear()); // weekdays start at 0, thus decrement one @@ -225,6 +224,7 @@ sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay, nMinimumNumberOfDaysInWeek = 4; } + short nWeek; if ( nMinimumNumberOfDaysInWeek == 1 ) { nWeek = ((n1WDay+nDayOfYear)/7) + 1; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 84a89cd32808..d09b0d547d7e 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -4892,6 +4892,7 @@ bool INetURLObject::IsExoticProtocol() const return m_eScheme == INetProtocol::Slot || m_eScheme == INetProtocol::Macro || m_eScheme == INetProtocol::Uno || + m_eScheme == INetProtocol::VndSunStarExpand || isSchemeEqualTo(u"vnd.sun.star.script") || isSchemeEqualTo(u"service"); } diff --git a/translations b/translations index fdabff5f73e1..096ea211364a 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit fdabff5f73e16046cb570561051304029eef48f9 +Subproject commit 096ea211364abd9f3a59671796e3aabb093faf54 diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 5e8fe8f2f934..7d7ba81f52cc 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -366,16 +366,12 @@ void CachedContentResultSetStub if( !m_bNeedToPropagateFetchSize ) return; - bool bNeedAction; sal_Int32 nLastSize; bool bLastDirection; bool bFirstPropagationDone; - bNeedAction = m_bNeedToPropagateFetchSize; nLastSize = m_nLastFetchSize; bLastDirection = m_bLastFetchDirection; bFirstPropagationDone = m_bFirstFetchSizePropagationDone; - if( !bNeedAction ) - return; if( nLastSize == nFetchSize && bLastDirection == bFetchDirection diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 4ffb97839100..ed1ef95e8dbd 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -875,48 +875,6 @@ void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, m_pImpl->SetFactoryDefaultFilter( eFactory, sFilter ); } -bool SvtModuleOptions::IsMath() const -{ - // doesn't need mutex, never modified - return m_pImpl->IsModuleInstalled( EModule::MATH ); -} - -bool SvtModuleOptions::IsChart() const -{ - // doesn't need mutex, never modified - return m_pImpl->IsModuleInstalled( EModule::CHART ); -} - -bool SvtModuleOptions::IsCalc() const -{ - // doesn't need mutex, never modified - return m_pImpl->IsModuleInstalled( EModule::CALC ); -} - -bool SvtModuleOptions::IsDraw() const -{ - // doesn't need mutex, never modified - return m_pImpl->IsModuleInstalled( EModule::DRAW ); -} - -bool SvtModuleOptions::IsWriter() const -{ - std::unique_lock aGuard( impl_GetOwnStaticMutex() ); - return m_pImpl->IsModuleInstalled( EModule::WRITER ); -} - -bool SvtModuleOptions::IsImpress() const -{ - // doesn't need mutex, never modified - return m_pImpl->IsModuleInstalled( EModule::IMPRESS ); -} - -bool SvtModuleOptions::IsDataBase() const -{ - // doesn't need mutex, never modified - return m_pImpl->IsModuleInstalled( EModule::DATABASE ); -} - OUString SvtModuleOptions::GetModuleName( EModule eModule ) const { switch( eModule ) diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index 87dcbab0cbf1..f1f192149086 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -337,6 +337,10 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi if (sURL.matchIgnoreAsciiCase(".component:") || sURL.matchIgnoreAsciiCase("private:factory/")) return false; // No UCB content for .component URLs and factory URLs + + if (INetURLObject(sURL).IsExoticProtocol()) + return false; + OUString referer(getUnpackedValueOrDefault(PROP_REFERRER, OUString())); if (SvtSecurityOptions::isUntrustedReferer(referer)) { return false; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 285d8d64d790..04ee85e3c2bf 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -401,7 +401,7 @@ void PrintOutHelper( SfxViewShell const * pViewShell, const uno::Any& From, cons if ( !pViewFrame->GetFrame().IsInPlace() ) { // #TODO is this necessary ( calc specific ) -// SC_MOD()->InputEnterHandler(); +// ScModule::get()->InputEnterHandler(); pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SfxCallMode::SYNCHRON ); WaitUntilPreviewIsClosed( pViewFrame ); } diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk index efa4fd9e16fd..3b7c6165e5ae 100644 --- a/vcl/CustomTarget_qt5_moc.mk +++ b/vcl/CustomTarget_qt5_moc.mk @@ -11,20 +11,25 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/qt5)) $(call gb_CustomTarget_get_target,vcl/qt5) : \ $(gb_CustomTarget_workdir)/vcl/qt5/QtClipboard.moc \ + $(gb_CustomTarget_workdir)/vcl/qt5/QtDoubleSpinBox.moc \ + $(gb_CustomTarget_workdir)/vcl/qt5/QtExpander.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtFilePicker.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtFrame.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstance.moc \ + $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceCheckButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceComboBox.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceContainer.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceDialog.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceDrawingArea.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceEntry.moc \ + $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceExpander.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceLevelBar.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceLinkButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceMessageDialog.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceNotebook.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceProgressBar.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceRadioButton.moc \ + $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceSpinButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceTreeView.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceWindow.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtMainWindow.moc \ diff --git a/vcl/CustomTarget_qt6_moc.mk b/vcl/CustomTarget_qt6_moc.mk index 69fc48db7ae5..63d90a3905e0 100644 --- a/vcl/CustomTarget_qt6_moc.mk +++ b/vcl/CustomTarget_qt6_moc.mk @@ -11,20 +11,25 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/qt6)) $(call gb_CustomTarget_get_target,vcl/qt6) : \ $(gb_CustomTarget_workdir)/vcl/qt6/QtClipboard.moc \ + $(gb_CustomTarget_workdir)/vcl/qt6/QtDoubleSpinBox.moc \ + $(gb_CustomTarget_workdir)/vcl/qt6/QtExpander.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtFilePicker.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtFrame.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstance.moc \ + $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceCheckButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceComboBox.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceContainer.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceDialog.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceDrawingArea.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceEntry.moc \ + $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceExpander.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceLevelBar.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceLinkButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceMessageDialog.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceNotebook.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceProgressBar.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceRadioButton.moc \ + $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceSpinButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceTreeView.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceWindow.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtMainWindow.moc \ diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk index 29dd1de6fba9..402698303f2d 100644 --- a/vcl/Library_vclplug_qt5.mk +++ b/vcl/Library_vclplug_qt5.mk @@ -84,7 +84,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\ vcl/qt5/QtClipboard \ vcl/qt5/QtCustomStyle \ vcl/qt5/QtData \ + vcl/qt5/QtDoubleSpinBox \ vcl/qt5/QtDragAndDrop \ + vcl/qt5/QtExpander \ vcl/qt5/QtFilePicker \ vcl/qt5/QtFont \ vcl/qt5/QtFontFace \ @@ -105,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\ vcl/qt5/QtInstanceDialog \ vcl/qt5/QtInstanceDrawingArea \ vcl/qt5/QtInstanceEntry \ + vcl/qt5/QtInstanceExpander \ vcl/qt5/QtInstanceFrame \ vcl/qt5/QtInstanceImage \ vcl/qt5/QtInstanceLabel \ diff --git a/vcl/Library_vclplug_qt6.mk b/vcl/Library_vclplug_qt6.mk index a1c28756220b..293ab41d87a9 100644 --- a/vcl/Library_vclplug_qt6.mk +++ b/vcl/Library_vclplug_qt6.mk @@ -83,7 +83,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt6,\ vcl/qt6/QtClipboard \ vcl/qt6/QtCustomStyle \ vcl/qt6/QtData \ + vcl/qt6/QtDoubleSpinBox \ vcl/qt6/QtDragAndDrop \ + vcl/qt6/QtExpander \ vcl/qt6/QtFilePicker \ vcl/qt6/QtFont \ vcl/qt6/QtFontFace \ @@ -104,6 +106,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt6,\ vcl/qt6/QtInstanceDialog \ vcl/qt6/QtInstanceDrawingArea \ vcl/qt6/QtInstanceEntry \ + vcl/qt6/QtInstanceExpander \ vcl/qt6/QtInstanceFrame \ vcl/qt6/QtInstanceImage \ vcl/qt6/QtInstanceLabel \ diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx index 1550f3cd898f..a36837d02923 100644 --- a/vcl/headless/CairoCommon.cxx +++ b/vcl/headless/CairoCommon.cxx @@ -1143,29 +1143,12 @@ bool CairoCommon::drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice, const bool bStrokeUsed(0.0 != fDotDashLength); assert(!bStrokeUsed || (bStrokeUsed && pStroke)); - // MM01 decide if to stroke directly - static const bool bDoDirectCairoStroke(true); - // MM01 activate to stroke directly - if (bDoDirectCairoStroke && bStrokeUsed) + if (bStrokeUsed) { cairo_set_dash(cr, pStroke->data(), pStroke->size(), 0.0); } - if (!bDoDirectCairoStroke && pSystemDependentData_CairoPath) - { - // MM01 - check on stroke change. Used against not used, or if both used, - // equal or different? - const bool bStrokeWasUsed(!pSystemDependentData_CairoPath->getStroke().empty()); - - if (bStrokeWasUsed != bStrokeUsed - || (bStrokeUsed && *pStroke != pSystemDependentData_CairoPath->getStroke())) - { - // data invalid, forget - pSystemDependentData_CairoPath.reset(); - } - } - // check for basegfx::B2DLineJoin::NONE to react accordingly const bool bNoJoin(basegfx::B2DLineJoin::NONE == eLineJoin && fLineWidth > 0.0 && !basegfx::fTools::equalZero(fLineWidth)); @@ -1196,20 +1179,8 @@ bool CairoCommon::drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice, // MM01 need to do line dashing as fallback stuff here now basegfx::B2DPolyPolygon aPolyPolygonLine; - if (!bDoDirectCairoStroke && bStrokeUsed) - { - // apply LineStyle - basegfx::utils::applyLineDashing(rPolyLine, // source - *pStroke, // pattern - &aPolyPolygonLine, // target for lines - nullptr, // target for gaps - fDotDashLength); // full length if available - } - else - { - // no line dashing or direct stroke, just copy - aPolyPolygonLine.append(rPolyLine); - } + // no line dashing or direct stroke, just copy + aPolyPolygonLine.append(rPolyLine); // MM01 checked/verified for Cairo for (sal_uInt32 a(0); a < aPolyPolygonLine.count(); a++) @@ -1988,13 +1959,10 @@ cairo_surface_t* CairoCommon::createCairoSurface(const BitmapBuffer* pBuffer) return target; } -bool CairoCommon::hasFastDrawTransformedBitmap() { return false; } - bool CairoCommon::supportsOperation(OutDevSupportType eType) { switch (eType) { - case OutDevSupportType::TransparentRect: case OutDevSupportType::TransparentText: return true; } diff --git a/vcl/headless/SvpGraphicsBackend.cxx b/vcl/headless/SvpGraphicsBackend.cxx index ddd85978dd82..029e65820209 100644 --- a/vcl/headless/SvpGraphicsBackend.cxx +++ b/vcl/headless/SvpGraphicsBackend.cxx @@ -24,8 +24,6 @@ SvpGraphicsBackend::SvpGraphicsBackend(CairoCommon& rCairoCommon) { } -void SvpGraphicsBackend::Init() {} - void SvpGraphicsBackend::setClipRegion(const vcl::Region& i_rClip) { m_rCairoCommon.m_aClipRegion = i_rClip; @@ -213,12 +211,6 @@ void SvpGraphicsBackend::invert(sal_uInt32 nPoints, const Point* pPtAry, SalInve m_rCairoCommon.invert(nPoints, pPtAry, nFlags, getAntiAlias()); } -bool SvpGraphicsBackend::drawEPS(tools::Long /*nX*/, tools::Long /*nY*/, tools::Long /*nWidth*/, - tools::Long /*nHeight*/, void* /*pPtr*/, sal_uInt32 /*nSize*/) -{ - return false; -} - bool SvpGraphicsBackend::blendBitmap(const SalTwoRect& /*rPosAry*/, const SalBitmap& /*rBitmap*/) { return false; @@ -248,11 +240,6 @@ bool SvpGraphicsBackend::drawTransformedBitmap(const basegfx::B2DPoint& rNull, getAntiAlias()); } -bool SvpGraphicsBackend::hasFastDrawTransformedBitmap() const -{ - return CairoCommon::hasFastDrawTransformedBitmap(); -} - bool SvpGraphicsBackend::drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) { diff --git a/vcl/inc/PriorityHBox.hxx b/vcl/inc/PriorityHBox.hxx index 8c5529ec8860..ee47b97e350a 100644 --- a/vcl/inc/PriorityHBox.hxx +++ b/vcl/inc/PriorityHBox.hxx @@ -37,8 +37,6 @@ protected: std::vector m_aSortedChildren; - virtual int GetHiddenCount() const; - virtual void GetChildrenWithPriorities(); public: diff --git a/vcl/inc/PriorityMergedHBox.hxx b/vcl/inc/PriorityMergedHBox.hxx index ed2f105f20f4..087f09a75928 100644 --- a/vcl/inc/PriorityMergedHBox.hxx +++ b/vcl/inc/PriorityMergedHBox.hxx @@ -38,7 +38,7 @@ public: virtual void dispose() override; - int GetHiddenCount() const override; + bool HasHiddenChildren() const; Size calculateRequisition() const override; diff --git a/vcl/inc/headless/CairoCommon.hxx b/vcl/inc/headless/CairoCommon.hxx index a62c2fad73dd..96630f39b681 100644 --- a/vcl/inc/headless/CairoCommon.hxx +++ b/vcl/inc/headless/CairoCommon.hxx @@ -229,7 +229,6 @@ struct VCL_DLLPUBLIC CairoCommon static cairo_surface_t* createCairoSurface(const BitmapBuffer* pBuffer); static bool supportsOperation(OutDevSupportType eType); - static bool hasFastDrawTransformedBitmap(); private: void doXorOnRelease(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop, sal_Int32 nExtentsRight, diff --git a/vcl/inc/headless/SvpGraphicsBackend.hxx b/vcl/inc/headless/SvpGraphicsBackend.hxx index 4e2322148376..a631cb161e8b 100644 --- a/vcl/inc/headless/SvpGraphicsBackend.hxx +++ b/vcl/inc/headless/SvpGraphicsBackend.hxx @@ -34,8 +34,6 @@ class SAL_DLLPUBLIC_RTTI SvpGraphicsBackend final : public SalGraphicsImpl public: SvpGraphicsBackend(CairoCommon& rCairoCommon); - void Init() override; - OUString getRenderBackendName() const override { return u"svp"_ustr; } void setClipRegion(vcl::Region const& rRegion) override; @@ -104,9 +102,6 @@ public: void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override; - bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) override; - bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap, @@ -119,8 +114,6 @@ public: const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, const SalBitmap* pAlphaBitmap, double fAlpha) override; - bool hasFastDrawTransformedBitmap() const override; - bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) override; diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index 3d3b8d3ab3e5..ec8cef53e238 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -520,7 +520,7 @@ public: virtual void collapse(weld::Widget* pEdit, weld::Widget* pButton) override; virtual void undo_collapse() override; virtual void response(int response) override; - virtual weld::Button* weld_widget_for_response(int response) override; + virtual std::unique_ptr weld_button_for_response(int response) override; virtual int run() override; virtual bool runAsync(std::shared_ptr const& rxOwner, const std::function& rEndDialogFn) override; @@ -537,7 +537,7 @@ public: virtual void set_current_page(int nPage) override; virtual void set_current_page(const OUString& rIdent) override; virtual void response(int response) override; - virtual weld::Button* weld_widget_for_response(int response) override; + virtual std::unique_ptr weld_button_for_response(int response) override; virtual int run() override; virtual bool runAsync(std::shared_ptr const& rxOwner, const std::function& rEndDialogFn) override; diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 6adbba81df4d..a9bbe3c5e369 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -204,7 +204,6 @@ #include #include #include -#include #include #include #include diff --git a/vcl/inc/pdf/PDFEncryptor.hxx b/vcl/inc/pdf/PDFEncryptor.hxx index e1602f11723f..3547252ceb5e 100644 --- a/vcl/inc/pdf/PDFEncryptor.hxx +++ b/vcl/inc/pdf/PDFEncryptor.hxx @@ -10,75 +10,94 @@ #pragma once -#include #include -#include +#include +#include +#include + +namespace vcl +{ +struct PDFEncryptionProperties; +} + +namespace com::sun::star::beans +{ +class XMaterialHolder; +} +namespace com::sun::star::uno +{ +template class Reference; +} namespace vcl::pdf { class EncryptionHashTransporter; -constexpr sal_Int32 ENCRYPTED_PWD_SIZE = 32; - -// the maximum password length -constexpr sal_Int32 MD5_DIGEST_SIZE = 16; - -// security 128 bit -constexpr sal_Int32 SECUR_128BIT_KEY = 16; - -// maximum length of MD5 digest input, in step 2 of algorithm 3.1 -// PDF spec ver. 1.4: see there for details -constexpr sal_Int32 MAXIMUM_RC4_KEY_LENGTH = SECUR_128BIT_KEY + 3 + 2; - -void padPassword(std::u16string_view i_rPassword, sal_uInt8* o_pPaddedPW); - -/* algorithm 3.2: compute an encryption key */ -bool computeEncryptionKey(vcl::pdf::EncryptionHashTransporter*, - vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, - sal_Int32 i_nAccessPermissions); - -/* algorithm 3.3: computing the encryption dictionary'ss owner password value ( /O ) */ -bool computeODictionaryValue(const sal_uInt8* i_pPaddedOwnerPassword, - const sal_uInt8* i_pPaddedUserPassword, - std::vector& io_rOValue, sal_Int32 i_nKeyLength); - -/* algorithm 3.4 or 3.5: computing the encryption dictionary's user password value ( /U ) revision 2 or 3 of the standard security handler */ -bool computeUDictionaryValue(vcl::pdf::EncryptionHashTransporter* i_pTransporter, - vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, - sal_Int32 i_nKeyLength, sal_Int32 i_nAccessPermissions); - -void computeDocumentIdentifier(std::vector& o_rIdentifier, - const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - const OString& i_rCString1, - const css::util::DateTime& rCreationMetaDate, OString& o_rCString2); - -sal_Int32 computeAccessPermissions(const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, - sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength); - -class PDFEncryptor +class IPDFEncryptor { public: - /* used to cipher the stream data and for password management */ - rtlCipher m_aCipher = nullptr; + virtual ~IPDFEncryptor() {} + virtual sal_Int32 getAccessPermissions() = 0; + virtual sal_Int32 getKeyLength() = 0; + virtual bool prepareEncryption( + const css::uno::Reference& xEncryptionMaterialHolder, + PDFEncryptionProperties& rProperties) + = 0; + virtual void setupKeysAndCheck(PDFEncryptionProperties& rProperties) = 0; - /* pad string used for password in Standard security handler */ - static const sal_uInt8 s_nPadString[ENCRYPTED_PWD_SIZE]; + virtual void setupEncryption(std::vector const& rEncryptionKey, sal_Int32 nObject) + = 0; + virtual void enableStreamEncryption() = 0; + virtual void disableStreamEncryption() = 0; + virtual bool isStreamEncryptionEnabled() = 0; + virtual void encrypt(const void* pInput, sal_uInt64 nInputSize, sal_uInt8* pOutput, + sal_uInt64 nOutputsSize) + = 0; +}; + +class PDFEncryptor : public IPDFEncryptor +{ +private: + /* the numerical value of the access permissions, according to PDF spec, must be signed */ + sal_Int32 m_nAccessPermissions = 0; + + /* The encryption key, formed with the user password according to algorithm 3.2, + * maximum length is 16 bytes + 3 + 2 for 128 bit security */ + + sal_Int32 m_nKeyLength = 0; // key length, 16 or 5 + sal_Int32 m_nRC4KeyLength = 0; // key length, 16 or 10, to be input to the algorithm 3.1 /* set to true if the following stream must be encrypted, used inside writeBuffer() */ bool m_bEncryptThisStream = false; - /* The encryption key, formed with the user password according to algorithm 3.2, - * maximum length is 16 bytes + 3 + 2 for 128 bit security */ - sal_Int32 m_nKeyLength = 0; // key length, 16 or 5 - sal_Int32 m_nRC4KeyLength = 0; // key length, 16 or 10, to be input to the algorithm 3.1 +public: + PDFEncryptor(); + ~PDFEncryptor(); - PDFEncryptor() - { - /* prepare the cypher engine */ - m_aCipher = rtl_cipher_createARCFOUR(rtl_Cipher_ModeStream); - } + /* used to cipher the stream data and for password management */ + rtlCipher m_aCipher = nullptr; - ~PDFEncryptor() { rtl_cipher_destroyARCFOUR(m_aCipher); } + sal_Int32 getAccessPermissions() override { return m_nAccessPermissions; } + sal_Int32 getKeyLength() override { return m_nKeyLength; } + sal_Int32 getRC4KeyLength() { return m_nRC4KeyLength; } + + static css::uno::Reference + initEncryption(const OUString& i_rOwnerPassword, const OUString& i_rUserPassword); + + virtual bool prepareEncryption( + const css::uno::Reference& xEncryptionMaterialHolder, + PDFEncryptionProperties& rProperties) override; + + void setupKeysAndCheck(PDFEncryptionProperties& rProperties) override; + + void setupEncryption(std::vector const& rEncryptionKey, sal_Int32 nObject) override; + void enableStreamEncryption() override; + void disableStreamEncryption() override; + + bool isStreamEncryptionEnabled() override { return m_bEncryptThisStream; } + + void encrypt(const void* pInput, sal_uInt64 nInputSize, sal_uInt8* pOutput, + sal_uInt64 nOutputsSize) override; }; } diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx index 2a1fb1febcae..e7644d7c4884 100644 --- a/vcl/inc/pdf/pdfwriter_impl.hxx +++ b/vcl/inc/pdf/pdfwriter_impl.hxx @@ -811,7 +811,7 @@ private: ExternalPDFStreams m_aExternalPDFStreams; - PDFEncryptor m_aPDFEncryptor; + std::unique_ptr m_pPDFEncryptor; /* output redirection; e.g. to accumulate content streams for XObjects @@ -843,8 +843,6 @@ private: return nPosition; } - /* the numerical value of the access permissions, according to PDF spec, must be signed */ - sal_Int32 m_nAccessPermissions; /* string to hold the PDF creation date */ OString m_aCreationDateString; /* string to hold the PDF creation date, for PDF/A metadata */ @@ -854,10 +852,9 @@ private: void addRoleMap(const OString& aAlias, PDFWriter::StructElement eType); - /* this function implements part of the PDF spec algorithm 3.1 in encryption, the rest (the actual encryption) is in PDFWriterImpl::writeBuffer */ void checkAndEnableStreamEncryption( sal_Int32 nObject ) override; - void disableStreamEncryption() override { m_aPDFEncryptor.m_bEncryptThisStream = false; }; + void disableStreamEncryption() override; /* */ void enableStringEncryption( sal_Int32 nObject ); @@ -1088,7 +1085,6 @@ private: pad a password according algorithm 3.2, step 1 */ void setupDocInfo(); - bool prepareEncryption( const css::uno::Reference< css::beans::XMaterialHolder >& ); // helper for playMetafile void implWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, @@ -1109,10 +1105,6 @@ public: ~PDFWriterImpl() override; void dispose() override; - static css::uno::Reference< css::beans::XMaterialHolder > - initEncryption( const OUString& i_rOwnerPassword, - const OUString& i_rUserPassword ); - /* document structure */ void newPage( double nPageWidth , double nPageHeight, PDFWriter::Orientation eOrientation ); bool emit(); diff --git a/vcl/inc/qt5/QtBuilder.hxx b/vcl/inc/qt5/QtBuilder.hxx index 6f0459d55b0d..a69158e10a8f 100644 --- a/vcl/inc/qt5/QtBuilder.hxx +++ b/vcl/inc/qt5/QtBuilder.hxx @@ -47,8 +47,8 @@ public: template T* get(std::u16string_view sID); - QObject* makeObject(QObject* pParent, std::u16string_view sName, const OUString& sID, - stringmap& rMap); + QObject* makeObject(QObject* pParent, std::u16string_view sName, std::string_view sType, + const OUString& sID, stringmap& rMap); virtual void applyAtkProperties(QObject* pObject, const stringmap& rProperties, bool bToolbarItem) override; @@ -61,9 +61,9 @@ public: virtual void insertComboBoxOrListBoxItems(QObject* pObject, stringmap& rMap, const std::vector& rItems) override; - virtual QObject* insertObject(QObject* pParent, const OUString& rClass, const OUString& rID, - stringmap& rProps, stringmap& rPangoAttributes, - stringmap& rAtkProps) override; + virtual QObject* insertObject(QObject* pParent, const OUString& rClass, std::string_view sType, + const OUString& rID, stringmap& rProps, + stringmap& rPangoAttributes, stringmap& rAtkProps) override; void tweakInsertedChild(QObject* pParent, QObject* pCurrentChild, std::string_view sType, std::string_view sInternalChild) override; @@ -84,6 +84,7 @@ public: virtual void set_response(std::u16string_view sID, short nResponse) override; private: + static void deleteObject(QObject* pObject); void setProperties(QObject* obj, stringmap& rProps); static void setLabelProperties(QLabel& rLabel, stringmap& rProps); void setSpinButtonProperties(QDoubleSpinBox& rSpinBox, stringmap& rProps); diff --git a/vcl/inc/qt5/QtDoubleSpinBox.hxx b/vcl/inc/qt5/QtDoubleSpinBox.hxx new file mode 100644 index 000000000000..5c9cac5930d7 --- /dev/null +++ b/vcl/inc/qt5/QtDoubleSpinBox.hxx @@ -0,0 +1,27 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include +#include +#include + +class QtDoubleSpinBox : public QDoubleSpinBox +{ + Q_OBJECT + +public: + QtDoubleSpinBox(QWidget* pParent); + + // public override of the protected base class method + QLineEdit* lineEdit() const; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt5/QtExpander.hxx b/vcl/inc/qt5/QtExpander.hxx new file mode 100644 index 000000000000..d9952c9f914d --- /dev/null +++ b/vcl/inc/qt5/QtExpander.hxx @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include +#include +#include + +class QtExpander : public QWidget +{ + Q_OBJECT + + QPushButton* m_pButton; + QGridLayout* m_pLayout; + QWidget* m_pContentWidget; + bool m_bExpanded; + +public: + QtExpander(QWidget* pParent); + void setContentWidget(QWidget* pWidget); + + void setText(const QString& rText); + QString text() const; + + void setExpanded(bool bExpand); + bool isExpanded() const; + +Q_SIGNALS: + void expandedChanged(bool bExpanded); + +private: + void update(); + +private Q_SLOTS: + void handleButtonClick(); +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx index 7867467b7bcf..efb534825e29 100644 --- a/vcl/inc/qt5/QtFrame.hxx +++ b/vcl/inc/qt5/QtFrame.hxx @@ -184,7 +184,6 @@ public: virtual void GetWorkArea(AbsoluteScreenPixelRectangle& rRect) override; virtual SalFrame* GetParent() const override; virtual void SetModal(bool bModal) override; - virtual bool GetModal() const override; virtual void SetWindowState(const vcl::WindowData*) override; virtual bool GetWindowState(vcl::WindowData*) override; virtual void ShowFullScreen(bool bFullScreen, sal_Int32 nDisplay) override; diff --git a/vcl/inc/qt5/QtGraphics.hxx b/vcl/inc/qt5/QtGraphics.hxx index 5212d30873b2..4c7deb5d3f68 100644 --- a/vcl/inc/qt5/QtGraphics.hxx +++ b/vcl/inc/qt5/QtGraphics.hxx @@ -59,8 +59,6 @@ public: QtGraphicsBackend(QtFrame* pFrame, QImage* pQImage); ~QtGraphicsBackend() override; - void Init() override {} - QImage* getQImage() { return m_pQImage; } void setQImage(QImage* pQImage) { m_pQImage = pQImage; } @@ -133,9 +131,6 @@ public: void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override; - bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) override; - bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap, @@ -148,8 +143,6 @@ public: const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, const SalBitmap* pAlphaBitmap, double fAlpha) override; - bool hasFastDrawTransformedBitmap() const override; - bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) override; diff --git a/vcl/inc/qt5/QtInstanceBuilder.hxx b/vcl/inc/qt5/QtInstanceBuilder.hxx index caf264735275..547d7aec1b8e 100644 --- a/vcl/inc/qt5/QtInstanceBuilder.hxx +++ b/vcl/inc/qt5/QtInstanceBuilder.hxx @@ -68,7 +68,7 @@ public: virtual std::unique_ptr weld_icon_view(const OUString&) override; virtual std::unique_ptr weld_label(const OUString&) override; virtual std::unique_ptr weld_text_view(const OUString& rId) override; - virtual std::unique_ptr weld_expander(const OUString&) override; + virtual std::unique_ptr weld_expander(const OUString& rId) override; virtual std::unique_ptr weld_drawing_area(const OUString&, const a11yref& rA11yImpl = nullptr, FactoryFunction pUITestFactoryFunction = nullptr, diff --git a/vcl/inc/qt5/QtInstanceCheckButton.hxx b/vcl/inc/qt5/QtInstanceCheckButton.hxx index 43db65c96a72..a13c883ac310 100644 --- a/vcl/inc/qt5/QtInstanceCheckButton.hxx +++ b/vcl/inc/qt5/QtInstanceCheckButton.hxx @@ -14,8 +14,12 @@ #include #include -class QtInstanceCheckButton : public QtInstanceWidget, public virtual weld::CheckButton +class QtInstanceCheckButton : public QObject, + public QtInstanceWidget, + public virtual weld::CheckButton { + Q_OBJECT + QCheckBox* m_pCheckBox; public: diff --git a/vcl/inc/qt5/QtInstanceDialog.hxx b/vcl/inc/qt5/QtInstanceDialog.hxx index e47849cc9bd7..82acf2d6c1dd 100644 --- a/vcl/inc/qt5/QtInstanceDialog.hxx +++ b/vcl/inc/qt5/QtInstanceDialog.hxx @@ -18,6 +18,7 @@ class QtInstanceDialog : public QtInstanceWindow, public virtual weld::Dialog Q_OBJECT std::unique_ptr m_pDialog; + QWidget* m_pContentArea; // the DialogController/Dialog/function passed to the runAsync variants std::shared_ptr m_xRunAsyncDialogController; @@ -51,7 +52,9 @@ public: virtual bool get_modal() const override; - virtual weld::Button* weld_widget_for_response(int) override; + virtual void set_centered_on_parent(bool bTrackGeometryRequests) override; + + virtual std::unique_ptr weld_button_for_response(int) override; virtual void set_default_response(int) override; diff --git a/vcl/inc/qt5/QtInstanceEntry.hxx b/vcl/inc/qt5/QtInstanceEntry.hxx index aa094e1b99d6..73a4e3fec9a3 100644 --- a/vcl/inc/qt5/QtInstanceEntry.hxx +++ b/vcl/inc/qt5/QtInstanceEntry.hxx @@ -48,6 +48,9 @@ public: virtual void paste_clipboard() override; virtual void set_alignment(TxtAlign eXAlign) override; + +protected Q_SLOTS: + void handleTextChanged(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt5/QtInstanceExpander.hxx b/vcl/inc/qt5/QtInstanceExpander.hxx new file mode 100644 index 000000000000..d596acb9ba94 --- /dev/null +++ b/vcl/inc/qt5/QtInstanceExpander.hxx @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include "QtInstanceWidget.hxx" +#include "QtExpander.hxx" + +class QtInstanceExpander : public QObject, public QtInstanceWidget, public virtual weld::Expander +{ + Q_OBJECT + + QtExpander* m_pExpander; + +public: + QtInstanceExpander(QtExpander* pExpander); + + virtual void set_label(const OUString& rText); + virtual OUString get_label() const; + virtual bool get_expanded() const; + virtual void set_expanded(bool bExpand); +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt5/QtInstanceMessageDialog.hxx b/vcl/inc/qt5/QtInstanceMessageDialog.hxx index 8df019da1d5c..a775b8618050 100644 --- a/vcl/inc/qt5/QtInstanceMessageDialog.hxx +++ b/vcl/inc/qt5/QtInstanceMessageDialog.hxx @@ -39,7 +39,7 @@ public: virtual void add_button(const OUString& rText, int nResponse, const OUString& rHelpId = {}) override; virtual void set_default_response(int nResponse) override; - QtInstanceButton* weld_widget_for_response(int nResponse) override; + std::unique_ptr weld_button_for_response(int nResponse) override; virtual int run() override; private: diff --git a/vcl/inc/qt5/QtInstanceSpinButton.hxx b/vcl/inc/qt5/QtInstanceSpinButton.hxx index b912760408b2..1766455a364e 100644 --- a/vcl/inc/qt5/QtInstanceSpinButton.hxx +++ b/vcl/inc/qt5/QtInstanceSpinButton.hxx @@ -9,43 +9,21 @@ #pragma once -#include "QtInstanceWidget.hxx" +#include "QtDoubleSpinBox.hxx" +#include "QtInstanceEntry.hxx" #include -class QtInstanceSpinButton : public QtInstanceWidget, public virtual weld::SpinButton +class QtInstanceSpinButton : public QtInstanceEntry, public virtual weld::SpinButton { - QDoubleSpinBox* m_pSpinBox; + Q_OBJECT + + QtDoubleSpinBox* m_pSpinBox; public: - QtInstanceSpinButton(QDoubleSpinBox* pSpinBox); + QtInstanceSpinButton(QtDoubleSpinBox* pSpinBox); - virtual void set_text(const OUString& rText) override; - virtual OUString get_text() const override; - virtual void set_width_chars(int nChars) override; - virtual int get_width_chars() const override; - virtual void set_max_length(int nChars) override; - virtual void select_region(int nStartPos, int nEndPos) override; - virtual bool get_selection_bounds(int& rStartPos, int& rEndPos) override; - virtual void replace_selection(const OUString& rText) override; - virtual void set_position(int nCursorPos) override; - virtual int get_position() const override; - virtual void set_editable(bool bEditable) override; - virtual bool get_editable() const override; - virtual void set_message_type(weld::EntryMessageType eType) override; - virtual void set_placeholder_text(const OUString& rText) override; - - virtual void set_overwrite_mode(bool bOn) override; - virtual bool get_overwrite_mode() const override; - - virtual void set_font(const vcl::Font& rFont) override; - virtual void set_font_color(const Color& rColor) override; - - virtual void cut_clipboard() override; - virtual void copy_clipboard() override; - virtual void paste_clipboard() override; - - virtual void set_alignment(TxtAlign eXAlign) override; + virtual QWidget* getQWidget() const override; virtual void set_value(sal_Int64 nValue) override; virtual sal_Int64 get_value() const override; @@ -56,6 +34,9 @@ public: virtual void get_increments(sal_Int64& rStep, sal_Int64& rPage) const override; virtual void set_digits(unsigned int nDigits) override; virtual unsigned int get_digits() const override; + +private Q_SLOTS: + void handleValueChanged(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt5/QtInstanceWidget.hxx b/vcl/inc/qt5/QtInstanceWidget.hxx index 2b9f33198b86..b63376208200 100644 --- a/vcl/inc/qt5/QtInstanceWidget.hxx +++ b/vcl/inc/qt5/QtInstanceWidget.hxx @@ -26,7 +26,7 @@ class QtInstanceWidget : public virtual weld::Widget public: QtInstanceWidget(QWidget* pWidget); - QWidget* getQWidget() const { return m_pWidget; } + virtual QWidget* getQWidget() const { return m_pWidget; } virtual void set_sensitive(bool bSensitive) override; diff --git a/vcl/inc/qt5/QtInstanceWindow.hxx b/vcl/inc/qt5/QtInstanceWindow.hxx index 9b73b39694d7..b92b830c7b9b 100644 --- a/vcl/inc/qt5/QtInstanceWindow.hxx +++ b/vcl/inc/qt5/QtInstanceWindow.hxx @@ -25,7 +25,6 @@ public: virtual Size get_size() const override; virtual Point get_position() const override; virtual AbsoluteScreenPixelRectangle get_monitor_workarea() const override; - virtual void set_centered_on_parent(bool) override; virtual bool has_toplevel_focus() const override; virtual void present() override; diff --git a/vcl/inc/qt5/QtTools.hxx b/vcl/inc/qt5/QtTools.hxx index 6877b7b5d985..c1b2b75fff5f 100644 --- a/vcl/inc/qt5/QtTools.hxx +++ b/vcl/inc/qt5/QtTools.hxx @@ -155,7 +155,6 @@ QImage toQImage(const Image& rImage); QMessageBox::Icon vclMessageTypeToQtIcon(VclMessageType eType); QString vclMessageTypeToQtTitle(VclMessageType eType); -int qtResponseTypeToVclResponseType(int ret); /** Converts a string potentially containing a '~' character to indicate an accelerator * to the Qt variant using '&' for the accelerator. diff --git a/vcl/inc/qt6/QtDoubleSpinBox.hxx b/vcl/inc/qt6/QtDoubleSpinBox.hxx new file mode 100644 index 000000000000..b4da15412db1 --- /dev/null +++ b/vcl/inc/qt6/QtDoubleSpinBox.hxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "../qt5/QtDoubleSpinBox.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt6/QtExpander.hxx b/vcl/inc/qt6/QtExpander.hxx new file mode 100644 index 000000000000..25c0ac365af9 --- /dev/null +++ b/vcl/inc/qt6/QtExpander.hxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "../qt5/QtExpander.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt6/QtInstanceExpander.hxx b/vcl/inc/qt6/QtInstanceExpander.hxx new file mode 100644 index 000000000000..1dd97000e6bd --- /dev/null +++ b/vcl/inc/qt6/QtInstanceExpander.hxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "../qt5/QtInstanceExpander.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 00abbc6df182..0b8e01b569ba 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -269,8 +269,6 @@ public: AquaGraphicsBackend(AquaSharedAttributes & rShared); ~AquaGraphicsBackend() override; - void Init() override; - OUString getRenderBackendName() const override { return "aqua"; @@ -357,8 +355,6 @@ public: const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, const SalBitmap* pAlphaBitmap, double fAlpha) override; - bool hasFastDrawTransformedBitmap() const override; - bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) override; @@ -444,6 +440,7 @@ protected: virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, const Color& rBackgroundColor ) override; +public: virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, tools::Rectangle &rNativeBoundingRegion, tools::Rectangle &rNativeContentRegion ) override; diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 0ea3fce1565b..8b239491d469 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -265,11 +265,6 @@ public: { } - virtual bool GetModal() const - { - return false; - } - // return true to indicate tooltips are shown natively, false otherwise virtual bool ShowTooltip(const OUString& /*rHelpText*/, const tools::Rectangle& /*rHelpArea*/) { diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 5c4356e5bf62..26daad069101 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -517,11 +517,12 @@ protected: virtual void invert( sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags ) = 0; + /// Only implemented by the macOS Quartz backend and the MS-Windows GDI backend. virtual bool drawEPS( - tools::Long nX, tools::Long nY, - tools::Long nWidth, tools::Long nHeight, - void* pPtr, - sal_uInt32 nSize ) = 0; + tools::Long /*nX*/, tools::Long /*nY*/, + tools::Long /*nWidth*/, tools::Long /*nHeight*/, + void* /*pPtr*/, + sal_uInt32 /*nSize*/ ) { return false; } /** Blend the bitmap with the current buffer */ virtual bool blendBitmap( @@ -571,7 +572,8 @@ protected: /// (for example, some OutputDevice optimizations could try access the pixels, which /// would make performance worse for GPU-backed backends). /// See also tdf#138068. - virtual bool hasFastDrawTransformedBitmap() const = 0; + /// Only currently true for SkiaSalGraphicsImpl + virtual bool hasFastDrawTransformedBitmap() const { return false; } /** Render solid rectangle with given transparency * diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx index 8fa7b54ca3f0..4d76d9a41446 100644 --- a/vcl/inc/salgdiimpl.hxx +++ b/vcl/inc/salgdiimpl.hxx @@ -72,7 +72,8 @@ public: // so see the SalGraphics class for documentation (both uppercase and lowercase // function variants). - virtual void Init() = 0; + /// Only used by the X11SkiaSalGraphicsImpl backend + virtual void UpdateX11GeometryProvider() {} virtual void DeInit() {} @@ -176,11 +177,12 @@ public: virtual void invert( sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags ) = 0; + /// Only implemented by the macOS Quartz backend and the MS-Windows GDI backend. virtual bool drawEPS( - tools::Long nX, tools::Long nY, - tools::Long nWidth, tools::Long nHeight, - void* pPtr, - sal_uInt32 nSize ) = 0; + tools::Long /*nX*/, tools::Long /*nY*/, + tools::Long /*nWidth*/, tools::Long /*nHeight*/, + void* /*pPtr*/, + sal_uInt32 /*nSize*/ ) { return false; } virtual bool blendBitmap( const SalTwoRect&, @@ -205,7 +207,8 @@ public: const SalBitmap* pAlphaBitmap, double fAlpha) = 0; - virtual bool hasFastDrawTransformedBitmap() const = 0; + /// Only currently true for SkiaSalGraphicsImpl + virtual bool hasFastDrawTransformedBitmap() const { return false; } virtual bool drawAlphaRect( tools::Long nX, tools::Long nY, diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 196be2c4193a..3837576c486e 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -483,8 +483,6 @@ public: virtual AbsoluteScreenPixelRectangle get_monitor_workarea() const override; - virtual void set_centered_on_parent(bool /*bTrackGeometryRequests*/) override; - virtual bool get_resizable() const override; virtual bool has_toplevel_focus() const override; @@ -551,7 +549,9 @@ public: virtual bool get_modal() const override; - virtual weld::Button* weld_widget_for_response(int nResponse) override; + virtual void set_centered_on_parent(bool /*bTrackGeometryRequests*/) override; + + virtual std::unique_ptr weld_button_for_response(int nResponse) override; virtual void set_default_response(int nResponse) override; @@ -592,7 +592,7 @@ public: virtual void set_page_sensitive(const OUString& rIdent, bool bSensitive) override; virtual void set_page_side_help_id(const OUString& rHelpId) override; virtual void set_page_side_image(const OUString& rImage) override; - weld::Button* weld_widget_for_response(int nResponse) override; + std::unique_ptr weld_button_for_response(int nResponse) override; virtual ~SalInstanceAssistant() override; }; diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx index 88d066aaafdb..c261e4af97c1 100644 --- a/vcl/inc/skia/gdiimpl.hxx +++ b/vcl/inc/skia/gdiimpl.hxx @@ -41,8 +41,6 @@ public: SkiaSalGraphicsImpl(SalGraphics& pParent, SalGeometryProvider* pProvider); virtual ~SkiaSalGraphicsImpl() override; - virtual void Init() override; - virtual void DeInit() override; virtual OUString getRenderBackendName() const override { return u"skia"_ustr; } @@ -151,9 +149,6 @@ public: virtual void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override; - virtual bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) override; - /** Render bitmap with alpha channel @param rSourceBitmap diff --git a/vcl/inc/skia/x11/gdiimpl.hxx b/vcl/inc/skia/x11/gdiimpl.hxx index 835f565e9c36..990c3d60b64a 100644 --- a/vcl/inc/skia/x11/gdiimpl.hxx +++ b/vcl/inc/skia/x11/gdiimpl.hxx @@ -24,7 +24,7 @@ private: public: X11SkiaSalGraphicsImpl(X11SalGraphics& rParent); - virtual void Init() override; + virtual void UpdateX11GeometryProvider() override; virtual void Flush() override; static void prepareSkia(); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 5fbf4413105c..b8b10691843b 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -606,7 +606,6 @@ public: virtual void PositionByToolkit(const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override; virtual void SetModal(bool bModal) override; - virtual bool GetModal() const override; void HideTooltip(); void BlockTooltip(); void UnblockTooltip(); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 1a152a7142e1..eadb096e0c1e 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -103,7 +103,7 @@ public: MenuItemBits nBits, bool bChecked, bool bIsSubmenu ); - void NativeSetEnableItem( gchar const * aCommand, gboolean bEnable ); + void NativeSetEnableItem(const OString& sCommand, gboolean bEnable); void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck ); void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const vcl::KeyCode& rKeyCode, std::u16string_view rKeyName ); diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index d1ce9311c904..f5459f2e9a5c 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -1413,27 +1413,28 @@ bool JSAssistant::runAsync(std::shared_ptr const& rxSelf, return ret; } -weld::Button* JSDialog::weld_widget_for_response(int nResponse) +std::unique_ptr JSDialog::weld_button_for_response(int nResponse) { PushButton* pButton = dynamic_cast<::PushButton*>(m_xDialog->get_widget_for_response(nResponse)); - auto pWeldWidget = pButton ? new JSButton(m_pSender, pButton, nullptr, false) : nullptr; + std::unique_ptr xWeldWidget + = pButton ? std::make_unique(m_pSender, pButton, nullptr, false) : nullptr; - if (pWeldWidget) + if (xWeldWidget) { auto pParentDialog = m_xDialog->GetParentWithLOKNotifier(); if (pParentDialog) JSInstanceBuilder::RememberWidget(OUString::number(pParentDialog->GetLOKWindowId()), - pButton->get_id(), pWeldWidget); + pButton->get_id(), xWeldWidget.get()); } - return pWeldWidget; + return xWeldWidget; } -weld::Button* JSAssistant::weld_widget_for_response(int nResponse) +std::unique_ptr JSAssistant::weld_button_for_response(int nResponse) { ::PushButton* pButton = nullptr; - JSButton* pWeldWidget = nullptr; + std::unique_ptr xWeldWidget; if (nResponse == RET_YES) pButton = m_xWizard->m_pNextPage; else if (nResponse == RET_NO) @@ -1445,17 +1446,17 @@ weld::Button* JSAssistant::weld_widget_for_response(int nResponse) else if (nResponse == RET_HELP) pButton = m_xWizard->m_pHelp; if (pButton) - pWeldWidget = new JSButton(m_pSender, pButton, nullptr, false); + xWeldWidget = std::make_unique(m_pSender, pButton, nullptr, false); - if (pWeldWidget) + if (xWeldWidget) { auto pParentDialog = m_xWizard->GetParentWithLOKNotifier(); if (pParentDialog) JSInstanceBuilder::RememberWidget(OUString::number(pParentDialog->GetLOKWindowId()), - pButton->get_id(), pWeldWidget); + pButton->get_id(), xWeldWidget.get()); } - return pWeldWidget; + return xWeldWidget; } JSAssistant::JSAssistant(JSDialogSender* pSender, vcl::RoadmapWizard* pDialog, diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 81aae45457a7..109ccfd16ba8 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include @@ -34,6 +35,7 @@ #include #include #include +#include #include #include @@ -1345,6 +1347,58 @@ bool AquaSalFrame::GetUseReducedAnimation() const return [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceMotion]; } +static void lcl_LoadColorsFromTheme(StyleSettings& rStyleSet) +{ + const ThemeColors& rThemeColors = ThemeColors::GetThemeColors(); + rStyleSet.SetWindowColor(rThemeColors.GetWindowColor()); + rStyleSet.BatchSetBackgrounds(rThemeColors.GetWindowColor()); + rStyleSet.SetActiveTabColor(rThemeColors.GetWindowColor()); + rStyleSet.SetInactiveTabColor(rThemeColors.GetBaseColor()); + rStyleSet.SetDisableColor(rThemeColors.GetDisabledColor()); // tab outline + // Highlight related colors + rStyleSet.SetAccentColor(rThemeColors.GetAccentColor()); + rStyleSet.SetHighlightColor(rThemeColors.GetAccentColor()); + rStyleSet.SetListBoxWindowHighlightColor(rThemeColors.GetAccentColor()); + rStyleSet.SetListBoxWindowTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetListBoxWindowBackgroundColor(rThemeColors.GetBaseColor()); + rStyleSet.SetListBoxWindowHighlightTextColor(rThemeColors.GetMenuHighlightTextColor()); + rStyleSet.SetWindowTextColor(rThemeColors.GetWindowTextColor()); // Treeview Lists + rStyleSet.SetRadioCheckTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetLabelTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetFieldTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetFieldColor(rThemeColors.GetBaseColor()); + rStyleSet.SetMenuBarTextColor(rThemeColors.GetMenuBarTextColor()); + rStyleSet.SetMenuTextColor(rThemeColors.GetMenuTextColor()); + rStyleSet.SetDefaultActionButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetActionButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetShadowColor(rThemeColors.GetShadeColor()); + rStyleSet.SetDefaultButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFlatButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFlatButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFlatButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultActionButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultActionButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetActionButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetActionButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFieldRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetHelpColor(rThemeColors.GetWindowColor()); + rStyleSet.SetHelpTextColor(rThemeColors.GetWindowTextColor()); + // rStyleSet.SetHighlightTextColor(rThemeColors.GetActiveTextColor()); + // rStyleSet.SetActiveColor(rThemeColors.GetActiveColor()); + // rStyleSet.SetActiveTextColor(rThemeColors.GetActiveTextColor()); + // rStyleSet.SetLinkColor(rThemeColors.GetAccentColor()); + // Color aVisitedLinkColor = rThemeColors.GetActiveColor(); + // aVisitedLinkColor.Merge(rThemeColors.GetWindowColor(), 100); + // rStyleSet.SetVisitedLinkColor(aVisitedLinkColor); + // rStyleSet.SetToolTextColor(Color(255, 0, 0)); + rStyleSet.SetTabRolloverTextColor(rThemeColors.GetMenuBarHighlightTextColor()); +} + // on OSX-Aqua the style settings are independent of the frame, so it does // not really belong here. Since the connection to the Appearance_Manager // is currently done in salnativewidgets.cxx this would be a good place. @@ -1376,8 +1430,18 @@ SAL_WNODEPRECATED_DECLARATIONS_POP StyleSettings aStyleSettings = rSettings.GetStyleSettings(); bool bUseDarkMode(GetUseDarkMode()); - OUString sThemeName(!bUseDarkMode ? u"sukapura_svg" : u"sukapura_dark_svg"); - aStyleSettings.SetPreferredIconTheme(sThemeName, bUseDarkMode); + if (!ThemeColors::IsThemeLoaded()) + { + OUString sThemeName(!bUseDarkMode ? u"sukapura_svg" : u"sukapura_dark_svg"); + aStyleSettings.SetPreferredIconTheme(sThemeName, bUseDarkMode); + } + else + { + aStyleSettings.SetPreferredIconTheme( + vcl::IconThemeSelector::GetIconThemeForDesktopEnvironment( + Application::GetDesktopEnvironment(), + ThemeColors::GetThemeColors().GetWindowColor().IsDark())); + } Color aControlBackgroundColor(getNSBoxBackgroundColor([NSColor controlBackgroundColor])); Color aWindowBackgroundColor(getNSBoxBackgroundColor([NSColor windowBackgroundColor])); @@ -1540,6 +1604,9 @@ SAL_WNODEPRECATED_DECLARATIONS_POP aStyleSettings.SetHideDisabledMenuItems( true ); aStyleSettings.SetPreferredContextMenuShortcuts( false ); + if (ThemeColors::IsThemeLoaded()) + lcl_LoadColorsFromTheme(aStyleSettings); + rSettings.SetStyleSettings( aStyleSettings ); // don't draw frame around each and every toolbar diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index b5a2d682e34c..2570581cb140 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -255,7 +255,7 @@ static bool isMouseScrollWheelEvent( NSEvent *pEvent ) mpLiveResizeTimer = nil; mpResetParentWindowTimer = nil; mpFrame = pFrame; - const SalFrameGeometry& rFrameGeometry = pFrame->GetUnmirroredGeometry(); + const SalFrameGeometry rFrameGeometry = pFrame->GetUnmirroredGeometry(); NSRect aRect = { { static_cast(rFrameGeometry.x()), static_cast(rFrameGeometry.y()) }, { static_cast(rFrameGeometry.width()), static_cast(rFrameGeometry.height()) } }; pFrame->VCLToCocoa( aRect ); @@ -440,6 +440,25 @@ static bool isMouseScrollWheelEvent( NSEvent *pEvent ) { mpFrame->UpdateFrameGeometry(); mpFrame->CallCallback( SalEvent::Move, nullptr ); + +#if HAVE_FEATURE_SKIA + // tdf#163734 Flush parent frame when Skia is enabled + // When a dockable window is dragged by its titlebar, a rectangle + // may be drawn in its parent window. However, the Skia flush + // timer doesn't run until after the mouse button has been + // released (probably due to lowering of the Skia flush timer's + // priority to fix tdf#163734). So run the parent frame's Skia + // flush timer immediately to display the rectangle. + if ( SkiaHelper::isVCLSkiaEnabled() && + mpFrame->mbShown && mpFrame->mpParent && + AquaSalFrame::isAlive( mpFrame->mpParent ) && + mpFrame->mpParent->mbShown ) + { + AquaSalGraphics* pGraphics = mpFrame->mpParent->mpGraphics; + if ( pGraphics ) + pGraphics->Flush(); + } +#endif } } @@ -1998,7 +2017,7 @@ static bool isMouseScrollWheelEvent( NSEvent *pEvent ) aString = [[[NSAttributedString alloc] initWithString:aString] autorelease]; // Reset cached state - BOOL bOldHasMarkedText = [self hasMarkedText]; + bool bOldHasMarkedText = [self hasMarkedText]; [self unmarkText]; // tdf#163876 ignore marked text generated from Command-` events diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 7ff36f0cf690..113049b8eeda 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -254,6 +255,14 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, return mpBackend->drawNativeControl(nType, nPart, rControlRegion, nState, aValue); } +static NSColor* colorFromRGB(const Color& rColor) +{ + return [NSColor colorWithSRGBRed:(rColor.GetRed() / 255.0f) + green:(rColor.GetGreen() / 255.0f) + blue:(rColor.GetBlue() / 255.0f) + alpha:(rColor.GetAlpha() / 255.0f)]; +} + static void paintCell(NSCell* pBtn, const NSRect& bounds, bool bShowsFirstResponder, CGContextRef context, NSView* pView) { //translate and scale because up side down otherwise @@ -380,6 +389,8 @@ bool AquaGraphicsBackend::drawNativeControl(ControlType nType, static void drawBox(CGContextRef context, const NSRect& rc, NSColor* pColor) { + assert(pColor); + CGContextSaveGState(context); CGContextTranslateCTM(context, rc.origin.x, rc.origin.y + rc.size.height); CGContextScaleCTM(context, 1, -1); @@ -388,12 +399,27 @@ static void drawBox(CGContextRef context, const NSRect& rc, NSColor* pColor) NSRect rect = { NSZeroPoint, NSMakeSize(rc.size.width, rc.size.height) }; NSBox* pBox = [[NSBox alloc] initWithFrame: rect]; - [pBox setBoxType: NSBoxCustom]; - [pBox setFillColor: pColor]; - SAL_WNODEPRECATED_DECLARATIONS_PUSH // setBorderType first deprecated in macOS 10.15 - [pBox setBorderType: NSNoBorder]; - SAL_WNODEPRECATED_DECLARATIONS_POP + + // Related tdf#163945: Set fill color to NSColorTypeComponentBased color type + // Many system colors have the NSColorTypeCatalog color type. For + // some unknown reason, setting the NSBox's fill color to a color set + // to NSColorTypeCatalog causes drawing to take at least twice as long + // as when the fill color is set to NSColorTypeComponentBased. So, + // only draw with a fill color set to NSColorTypeComponentBased. + NSColor* pRGBColor = pColor; + if ([pColor type] != NSColorTypeComponentBased) + { + pRGBColor = [pColor colorUsingType: NSColorTypeComponentBased]; + if (!pRGBColor) + pRGBColor = pColor; + } + [pBox setFillColor: pRGBColor]; + + // -[NSBox setBorderType: NSNoBorder] is deprecated so hide the border + // by setting the border color to transparent + [pBox setBorderColor: [NSColor clearColor]]; + [pBox setTitlePosition: NSNoTitle]; [pBox displayRectIgnoringOpacity: rect inContext: graphicsContext]; @@ -407,7 +433,10 @@ static void drawBox(CGContextRef context, const NSRect& rc, NSColor* pColor) static void drawEditableBackground(CGContextRef context, const NSRect& rc) { CGContextSaveGState(context); - CGContextSetFillColorWithColor(context, [NSColor controlBackgroundColor].CGColor); + if (ThemeColors::IsThemeLoaded()) + CGContextSetFillColorWithColor(context, colorFromRGB(ThemeColors::GetThemeColors().GetBaseColor()).CGColor); + else + CGContextSetFillColorWithColor(context, [NSColor controlBackgroundColor].CGColor); CGContextFillRect(context, rc); CGContextRestoreGState(context); } @@ -424,19 +453,26 @@ bool AquaGraphicsBackendBase::performDrawNativeControl(ControlType nType, AquaSalFrame* mpFrame) { bool bOK = false; + bool bThemeLoaded(ThemeColors::IsThemeLoaded()); AquaSalInstance* pInst = GetSalData()->mpInstance; HIRect rc = ImplGetHIRectFromRectangle(rControlRegion); switch (nType) { case ControlType::Toolbar: { - drawBox(context, rc, NSColor.windowBackgroundColor); + if (bThemeLoaded) + drawBox(context, rc, colorFromRGB(ThemeColors::GetThemeColors().GetWindowColor())); + else + drawBox(context, rc, NSColor.windowBackgroundColor); bOK = true; } break; case ControlType::WindowBackground: { - drawBox(context, rc, NSColor.windowBackgroundColor); + if (bThemeLoaded) + drawBox(context, rc, colorFromRGB(ThemeColors::GetThemeColors().GetWindowColor())); + else + drawBox(context, rc, NSColor.windowBackgroundColor); bOK = true; } break; @@ -444,7 +480,10 @@ bool AquaGraphicsBackendBase::performDrawNativeControl(ControlType nType, { rc.size.width += 2; rc.size.height += 2; - drawBox(context, rc, NSColor.controlBackgroundColor); + if (bThemeLoaded) + drawBox(context, rc, colorFromRGB(ThemeColors::GetThemeColors().GetBaseColor())); + else + drawBox(context, rc, NSColor.controlBackgroundColor); bOK = true; } break; @@ -703,7 +742,10 @@ bool AquaGraphicsBackendBase::performDrawNativeControl(ControlType nType, ? static_cast(&aValue) : nullptr; if (nPart == ControlPart::DrawBackgroundVert || nPart == ControlPart::DrawBackgroundHorz) { - drawBox(context, rc, NSColor.controlBackgroundColor); + if (bThemeLoaded) + drawBox(context, rc, colorFromRGB(ThemeColors::GetThemeColors().GetBaseColor())); + else + drawBox(context, rc, NSColor.controlBackgroundColor); NSRect rect = { NSZeroPoint, NSMakeSize(rc.size.width, rc.size.height) }; NSScroller* pBar = [[NSScroller alloc] initWithFrame: rect]; diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index ed035f6f8fb9..38e2109d3ef8 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx @@ -731,6 +731,46 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testVersion15) CPPUNIT_ASSERT_EQUAL(15, nFileVersion); } +CPPUNIT_TEST_FIXTURE(PdfExportTest2, testVersion20) +{ + // Create an empty document. + mxComponent = loadFromDesktop("private:factory/swriter"); + + // Save as PDF. + uno::Reference xStorable(mxComponent, uno::UNO_QUERY); + uno::Sequence aFilterData = comphelper::InitPropertySequence( + { { "SelectPdfVersion", uno::Any(static_cast(20)) } }); + aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); + aMediaDescriptor["FilterData"] <<= aFilterData; + xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + + // Parse the export result. + std::unique_ptr pPdfDocument = parsePDFExport(); + int nFileVersion = pPdfDocument->getFileVersion(); + CPPUNIT_ASSERT_EQUAL(20, nFileVersion); +} + +CPPUNIT_TEST_FIXTURE(PdfExportTest2, testEncryptionRoundtrip) +{ + mxComponent = loadFromDesktop("private:factory/swriter"); + + // Save PDF + uno::Reference xStorable(mxComponent, uno::UNO_QUERY); + aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); + uno::Sequence aFilterData = comphelper::InitPropertySequence( + { { "SelectPdfVersion", uno::Any(sal_Int32(20)) }, + { "EncryptFile", uno::Any(true) }, + { "DocumentOpenPassword", uno::Any(u"secret"_ustr) } }); + aMediaDescriptor["FilterData"] <<= aFilterData; + xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + + // Load the exported result in PDFium + std::unique_ptr pPdfDocument = parsePDFExport("secret"_ostr); + CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount()); + int nFileVersion = pPdfDocument->getFileVersion(); + CPPUNIT_ASSERT_EQUAL(20, nFileVersion); +} + // Check round-trip of importing and exporting the PDF with PDFium filter, // which imports the PDF document as multiple PDFs as graphic object. // Each page in the document has one PDF graphic object which content is diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx index 044e3ea9d421..0cf1712073c6 100644 --- a/vcl/qt5/QtBuilder.cxx +++ b/vcl/qt5/QtBuilder.cxx @@ -9,6 +9,8 @@ #include +#include +#include #include #include #include @@ -83,12 +85,12 @@ void QtBuilder::insertComboBoxOrListBoxItems(QObject* pObject, stringmap& rMap, assert(false && "list boxes are not supported yet"); } -QObject* QtBuilder::insertObject(QObject* pParent, const OUString& rClass, const OUString& rID, - stringmap& rProps, stringmap&, stringmap&) +QObject* QtBuilder::insertObject(QObject* pParent, const OUString& rClass, std::string_view sType, + const OUString& rID, stringmap& rProps, stringmap&, stringmap&) { QObject* pCurrentChild = nullptr; - pCurrentChild = makeObject(pParent, rClass, rID, rProps); + pCurrentChild = makeObject(pParent, rClass, sType, rID, rProps); setProperties(pCurrentChild, rProps); @@ -97,8 +99,8 @@ QObject* QtBuilder::insertObject(QObject* pParent, const OUString& rClass, const return pCurrentChild; } -QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, const OUString& sID, - stringmap& rMap) +QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, std::string_view sType, + const OUString& sID, stringmap& rMap) { // ignore placeholders if (sName.empty()) @@ -202,6 +204,10 @@ QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, cons pObject = pLineEdit; } + else if (sName == u"GtkExpander") + { + pObject = new QtExpander(pParentWidget); + } else if (sName == u"GtkFrame") { pObject = new QGroupBox(pParentWidget); @@ -267,7 +273,7 @@ QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, cons } else if (sName == u"GtkSpinButton") { - QDoubleSpinBox* pSpinBox = new QDoubleSpinBox(pParentWidget); + QtDoubleSpinBox* pSpinBox = new QtDoubleSpinBox(pParentWidget); setSpinButtonProperties(*pSpinBox, rMap); pObject = pSpinBox; } @@ -301,6 +307,16 @@ QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, cons // unset pParentWidget to not create a layout below pParentWidget = nullptr; } + else if (QtExpander* pExpander = qobject_cast(pParentWidget)) + { + // set the content (not the label) child as the expander's widget + if (sType != "label") + { + pExpander->setContentWidget(pWidget); + // erase "visible" property, QtExpander shows/hides the widget as needed + rMap.erase("visible"); + } + } if (pWidget) { @@ -348,7 +364,7 @@ void QtBuilder::tweakInsertedChild(QObject* pParent, QObject* pCurrentChild, std // an editable GtkComboBox has an internal GtkEntry child, // but QComboBox doesn't need a separate widget for it, so // delete it - pCurrentChild->deleteLater(); + deleteObject(pCurrentChild); } if (sType == "label") @@ -362,8 +378,16 @@ void QtBuilder::tweakInsertedChild(QObject* pParent, QObject* pCurrentChild, std // For QGroupBox, the title can be set directly. Therefore, take over the // title from the label and delete the separate label widget again pGroupBox->setTitle(pLabel->text()); - pLabel->setParent(nullptr); - pLabel->deleteLater(); + deleteObject(pLabel); + } + else if (QtExpander* pExpander = qobject_cast(pParent)) + { + // GtkExpander has a `child-type="label"` child for the expander label + // in the GtkBuilder .ui file, s. https://docs.gtk.org/gtk3/class.Expander.html + // For QtExpander, the (button) text can be set directly. Therefore, take over + // text from the label and delete the separate label widget again + pExpander->setText(pLabel->text()); + deleteObject(pLabel); } } } @@ -526,6 +550,13 @@ void QtBuilder::set_response(std::u16string_view sID, short nResponse) pPushButton->setProperty(QtInstanceMessageDialog::PROPERTY_VCL_RESPONSE_CODE, int(nResponse)); } +void QtBuilder::deleteObject(QObject* pObject) +{ + if (pObject->isWidgetType()) + static_cast(pObject)->hide(); + pObject->deleteLater(); +} + void QtBuilder::setProperties(QObject* pObject, stringmap& rProps) { if (QMessageBox* pMessageBox = qobject_cast(pObject)) @@ -604,7 +635,7 @@ void QtBuilder::setProperties(QObject* pObject, stringmap& rProps) // parentless GtkImage in .ui file is only used for setting button // image, so the object is no longer needed after doing so if (!pImageLabel->parent()) - pImageLabel->deleteLater(); + deleteObject(pImageLabel); } else if (rKey == u"label") { diff --git a/vcl/qt5/QtDoubleSpinBox.cxx b/vcl/qt5/QtDoubleSpinBox.cxx new file mode 100644 index 000000000000..730b29919ee3 --- /dev/null +++ b/vcl/qt5/QtDoubleSpinBox.cxx @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +QtDoubleSpinBox::QtDoubleSpinBox(QWidget* pParent) + : QDoubleSpinBox(pParent) +{ +} + +QLineEdit* QtDoubleSpinBox::lineEdit() const { return QDoubleSpinBox::lineEdit(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtExpander.cxx b/vcl/qt5/QtExpander.cxx new file mode 100644 index 000000000000..1b690ecdc888 --- /dev/null +++ b/vcl/qt5/QtExpander.cxx @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +QtExpander::QtExpander(QWidget* pParent) + : QWidget(pParent) + , m_pContentWidget(nullptr) + , m_bExpanded(false) +{ + m_pLayout = new QGridLayout; + setLayout(m_pLayout); + + m_pButton = new QPushButton; + m_pButton->setFlat(true); + m_pButton->setSizePolicy(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Maximum); + m_pLayout->addWidget(m_pButton, 0, 0); + m_pLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Policy::MinimumExpanding, + QSizePolicy::Policy::MinimumExpanding), + 0, 1); + + update(); + + connect(m_pButton, &QAbstractButton::clicked, this, &QtExpander::handleButtonClick); +} + +void QtExpander::setContentWidget(QWidget* pWidget) +{ + assert(pWidget); + m_pContentWidget = pWidget; + m_pLayout->addWidget(m_pContentWidget, 1, 0, 1, 2); + update(); +} + +void QtExpander::setText(const QString& rText) { m_pButton->setText(rText); } + +QString QtExpander::text() const { return m_pButton->text(); } + +void QtExpander::setExpanded(bool bExpand) +{ + if (m_bExpanded == bExpand) + return; + + m_bExpanded = bExpand; + update(); + + emit expandedChanged(isExpanded()); +} + +bool QtExpander::isExpanded() const { return m_bExpanded; } + +void QtExpander::update() +{ + const QString sIcon = m_bExpanded ? "go-down" : "go-next"; + m_pButton->setIcon(QIcon::fromTheme(sIcon)); + + if (m_pContentWidget) + m_pContentWidget->setVisible(m_bExpanded); +} + +void QtExpander::handleButtonClick() +{ + // toggle + setExpanded(!isExpanded()); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx index 9bbed032c334..d993c63e7762 100644 --- a/vcl/qt5/QtFrame.cxx +++ b/vcl/qt5/QtFrame.cxx @@ -626,8 +626,6 @@ void QtFrame::SetModal(bool bModal) }); } -bool QtFrame::GetModal() const { return isWindow() && windowHandle()->isModal(); } - void QtFrame::SetWindowState(const vcl::WindowData* pState) { QtInstance& rQtInstance = GetQtInstance(); diff --git a/vcl/qt5/QtGraphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx index 15a0c64f14bc..5f411e2ebf30 100644 --- a/vcl/qt5/QtGraphics_GDI.cxx +++ b/vcl/qt5/QtGraphics_GDI.cxx @@ -570,12 +570,6 @@ void QtGraphicsBackend::invert(sal_uInt32 /*nPoints*/, const Point* /*pPtAry*/, { } -bool QtGraphicsBackend::drawEPS(tools::Long /*nX*/, tools::Long /*nY*/, tools::Long /*nWidth*/, - tools::Long /*nHeight*/, void* /*pPtr*/, sal_uInt32 /*nSize*/) -{ - return false; -} - bool QtGraphicsBackend::blendBitmap(const SalTwoRect&, const SalBitmap& /*rBitmap*/) { return false; @@ -633,8 +627,6 @@ bool QtGraphicsBackend::drawTransformedBitmap(const basegfx::B2DPoint& rNull, return true; } -bool QtGraphicsBackend::hasFastDrawTransformedBitmap() const { return false; } - bool QtGraphicsBackend::drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) { @@ -676,15 +668,6 @@ void QtGraphicsBackend::SetROPLineColor(SalROPColor /*nROPColor*/) {} void QtGraphicsBackend::SetROPFillColor(SalROPColor /*nROPColor*/) {} -bool QtGraphicsBackend::supportsOperation(OutDevSupportType eType) const -{ - switch (eType) - { - case OutDevSupportType::TransparentRect: - return true; - default: - return false; - } -} +bool QtGraphicsBackend::supportsOperation(OutDevSupportType /*eType*/) const { return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 33838a2151f6..d3239f5cb56b 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) u"cui/ui/aboutdialog.ui"_ustr, u"cui/ui/insertrowcolumn.ui"_ustr, u"cui/ui/optnewdictionarydialog.ui"_ustr, + u"cui/ui/password.ui"_ustr, u"cui/ui/querysetinsmodedialog.ui"_ustr, u"cui/ui/securityoptionsdialog.ui"_ustr, u"cui/ui/tipofthedaydialog.ui"_ustr, @@ -71,6 +73,9 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) u"sfx/ui/safemodequerydialog.ui"_ustr, u"svt/ui/printersetupdialog.ui"_ustr, u"svt/ui/restartdialog.ui"_ustr, + u"svx/ui/gotopagedialog.ui"_ustr, + u"svx/ui/safemodedialog.ui"_ustr, + u"vcl/ui/openlockedquerybox.ui"_ustr, u"vcl/ui/printprogressdialog.ui"_ustr, u"writerperfect/ui/exportepub.ui"_ustr, }; @@ -263,7 +268,7 @@ std::unique_ptr QtInstanceBuilder::weld_entry(const OUString& rId) std::unique_ptr QtInstanceBuilder::weld_spin_button(const OUString& rId) { - QDoubleSpinBox* pSpinBox = m_xBuilder->get(rId); + QtDoubleSpinBox* pSpinBox = m_xBuilder->get(rId); std::unique_ptr xRet( pSpinBox ? std::make_unique(pSpinBox) : nullptr); return xRet; @@ -327,10 +332,12 @@ std::unique_ptr QtInstanceBuilder::weld_text_view(const OUString return xRet; } -std::unique_ptr QtInstanceBuilder::weld_expander(const OUString&) +std::unique_ptr QtInstanceBuilder::weld_expander(const OUString& rId) { - assert(false && "Not implemented yet"); - return nullptr; + QtExpander* pExpander = m_xBuilder->get(rId); + std::unique_ptr xRet(pExpander ? std::make_unique(pExpander) + : nullptr); + return xRet; } std::unique_ptr diff --git a/vcl/qt5/QtInstanceCheckButton.cxx b/vcl/qt5/QtInstanceCheckButton.cxx index f4590d393444..835dcd356196 100644 --- a/vcl/qt5/QtInstanceCheckButton.cxx +++ b/vcl/qt5/QtInstanceCheckButton.cxx @@ -8,6 +8,7 @@ */ #include +#include #include @@ -16,6 +17,7 @@ QtInstanceCheckButton::QtInstanceCheckButton(QCheckBox* pCheckBox) , m_pCheckBox(pCheckBox) { assert(m_pCheckBox); + connect(m_pCheckBox, &QCheckBox::toggled, this, [&] { signal_toggled(); }); } void QtInstanceCheckButton::set_active(bool bActive) diff --git a/vcl/qt5/QtInstanceDialog.cxx b/vcl/qt5/QtInstanceDialog.cxx index 7a4ca77ad70f..a975403fbda4 100644 --- a/vcl/qt5/QtInstanceDialog.cxx +++ b/vcl/qt5/QtInstanceDialog.cxx @@ -19,6 +19,7 @@ const char* const QtInstanceDialog::PROPERTY_VCL_RESPONSE_CODE = "response-code" QtInstanceDialog::QtInstanceDialog(QDialog* pDialog) : QtInstanceWindow(pDialog) , m_pDialog(pDialog) + , m_pContentArea(nullptr) , m_aRunAsyncFunc(nullptr) { } @@ -138,7 +139,12 @@ bool QtInstanceDialog::get_modal() const return m_pDialog->isModal(); } -weld::Button* QtInstanceDialog::weld_widget_for_response(int) +void QtInstanceDialog::set_centered_on_parent(bool) +{ + // QDialog is centered on parent toplevel by default +} + +std::unique_ptr QtInstanceDialog::weld_button_for_response(int) { assert(false && "Not implemented yet"); return nullptr; @@ -148,8 +154,22 @@ void QtInstanceDialog::set_default_response(int) { assert(false && "Not implemen std::unique_ptr QtInstanceDialog::weld_content_area() { - assert(false && "Not implemented yet"); - return nullptr; + if (!m_pContentArea) + { + if (QBoxLayout* pBoxLayout = qobject_cast(m_pDialog->layout())) + { + // insert an extra widget and layout at beginning of the dialog's layout + m_pContentArea = new QWidget; + m_pContentArea->setLayout(new QVBoxLayout); + pBoxLayout->insertWidget(0, m_pContentArea); + } + else + { + assert(false && "Dialog has layout that's not supported (yet)"); + } + } + + return std::make_unique(m_pContentArea); } void QtInstanceDialog::dialogFinished(int nResult) diff --git a/vcl/qt5/QtInstanceEntry.cxx b/vcl/qt5/QtInstanceEntry.cxx index 55dbfd0f964f..49da357f6d8c 100644 --- a/vcl/qt5/QtInstanceEntry.cxx +++ b/vcl/qt5/QtInstanceEntry.cxx @@ -22,7 +22,8 @@ QtInstanceEntry::QtInstanceEntry(QLineEdit* pLineEdit) QObject::connect(m_pLineEdit, &QLineEdit::cursorPositionChanged, this, [&] { signal_cursor_position(); }); - QObject::connect(m_pLineEdit, &QLineEdit::textEdited, this, [&] { signal_changed(); }); + QObject::connect(m_pLineEdit, &QLineEdit::textChanged, this, + &QtInstanceEntry::handleTextChanged); } void QtInstanceEntry::set_text(const OUString& rText) @@ -89,6 +90,9 @@ void QtInstanceEntry::replace_selection(const OUString& rText) void QtInstanceEntry::set_position(int nCursorPos) { SolarMutexGuard g; + if (nCursorPos == -1) + nCursorPos = m_pLineEdit->text().length(); + GetQtInstance().RunInMainThread([&] { m_pLineEdit->setCursorPosition(nCursorPos); }); } @@ -170,4 +174,10 @@ void QtInstanceEntry::paste_clipboard() { assert(false && "Not implemented yet") void QtInstanceEntry::set_alignment(TxtAlign) { assert(false && "Not implemented yet"); } +void QtInstanceEntry::handleTextChanged() +{ + SolarMutexGuard aGuard; + signal_changed(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtInstanceExpander.cxx b/vcl/qt5/QtInstanceExpander.cxx new file mode 100644 index 000000000000..1c120105e690 --- /dev/null +++ b/vcl/qt5/QtInstanceExpander.cxx @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include + +QtInstanceExpander::QtInstanceExpander(QtExpander* pExpander) + : QtInstanceWidget(pExpander) + , m_pExpander(pExpander) +{ + assert(m_pExpander); + + connect(m_pExpander, &QtExpander::expandedChanged, this, [&] { signal_expanded(); }); +} + +void QtInstanceExpander::set_label(const OUString& rText) +{ + SolarMutexGuard g; + GetQtInstance().RunInMainThread([&] { m_pExpander->setText(toQString(rText)); }); +} + +OUString QtInstanceExpander::get_label() const +{ + SolarMutexGuard g; + OUString sLabel; + GetQtInstance().RunInMainThread([&] { sLabel = toOUString(m_pExpander->text()); }); + return sLabel; +} + +bool QtInstanceExpander::get_expanded() const +{ + SolarMutexGuard g; + bool bExpanded = false; + GetQtInstance().RunInMainThread([&] { bExpanded = m_pExpander->isExpanded(); }); + return bExpanded; +} + +void QtInstanceExpander::set_expanded(bool bExpand) +{ + SolarMutexGuard g; + GetQtInstance().RunInMainThread([&] { m_pExpander->setExpanded(bExpand); }); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtInstanceMessageDialog.cxx b/vcl/qt5/QtInstanceMessageDialog.cxx index e444e8ddf75e..fb27aa544cb6 100644 --- a/vcl/qt5/QtInstanceMessageDialog.cxx +++ b/vcl/qt5/QtInstanceMessageDialog.cxx @@ -120,19 +120,19 @@ void QtInstanceMessageDialog::set_default_response(int nResponse) m_pMessageDialog->setDefaultButton(pButton); } -QtInstanceButton* QtInstanceMessageDialog::weld_widget_for_response(int nResponse) +std::unique_ptr QtInstanceMessageDialog::weld_button_for_response(int nResponse) { SolarMutexGuard g; QtInstance& rQtInstance = GetQtInstance(); if (!rQtInstance.IsMainThread()) { - QtInstanceButton* pButton; - rQtInstance.RunInMainThread([&] { pButton = weld_widget_for_response(nResponse); }); - return pButton; + std::unique_ptr xButton; + rQtInstance.RunInMainThread([&] { xButton = weld_button_for_response(nResponse); }); + return xButton; } if (QPushButton* pButton = buttonForResponseCode(nResponse)) - return new QtInstanceButton(pButton); + return std::make_unique(pButton); return nullptr; } diff --git a/vcl/qt5/QtInstanceNotebook.cxx b/vcl/qt5/QtInstanceNotebook.cxx index 6c28ce5c87e4..c8da18d5f5d6 100644 --- a/vcl/qt5/QtInstanceNotebook.cxx +++ b/vcl/qt5/QtInstanceNotebook.cxx @@ -155,6 +155,9 @@ weld::Container* QtInstanceNotebook::get_page(const OUString& rIdent) const pWidget = m_pTabWidget->widget(nIndex); }); + if (!pWidget) + return nullptr; + if (!m_aPageContainerInstances.contains(pWidget)) m_aPageContainerInstances.emplace(pWidget, std::make_unique(pWidget)); diff --git a/vcl/qt5/QtInstanceSpinButton.cxx b/vcl/qt5/QtInstanceSpinButton.cxx index c07de8e350ff..22b4ba401c25 100644 --- a/vcl/qt5/QtInstanceSpinButton.cxx +++ b/vcl/qt5/QtInstanceSpinButton.cxx @@ -8,94 +8,34 @@ */ #include +#include #include -QtInstanceSpinButton::QtInstanceSpinButton(QDoubleSpinBox* pSpinBox) - : QtInstanceWidget(pSpinBox) +QtInstanceSpinButton::QtInstanceSpinButton(QtDoubleSpinBox* pSpinBox) + : QtInstanceEntry(pSpinBox->lineEdit()) , m_pSpinBox(pSpinBox) { assert(pSpinBox); + + connect(m_pSpinBox, QOverload::of(&QtDoubleSpinBox::valueChanged), this, + &QtInstanceSpinButton::handleValueChanged); + + // While QtInstanceEntry generally takes care of handling signals + // for the spinbox's QLineEdit, this doesn't work when the value + // is changed as a result of setting a new spinbox value (e.g. + // by using the spinbox buttons), as the QLineEdit signals are blocked + // then, see QAbstractSpinBoxPrivate::updateEdit in qtbase: + // https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/widgets/qabstractspinbox.cpp?id=ced47a590aeb85953a16eaf362887f14c2815c45#n1790 + // Therefore, connect the QDoubleSpinBox::textChanged signal + // to the slot that calls signal_changed() instead to ensure + // it gets called nonetheless, and disconnect from the other signal. + disconnect(pSpinBox->lineEdit(), &QLineEdit::textChanged, this, nullptr); + connect(m_pSpinBox, &QDoubleSpinBox::textChanged, this, + &QtInstanceSpinButton::handleTextChanged); } -void QtInstanceSpinButton::set_text(const OUString&) { assert(false && "Not implemented yet"); } - -OUString QtInstanceSpinButton::get_text() const -{ - SolarMutexGuard g; - OUString sText; - GetQtInstance().RunInMainThread([&] { sText = toOUString(m_pSpinBox->text()); }); - return sText; -} - -void QtInstanceSpinButton::set_width_chars(int) { assert(false && "Not implemented yet"); } - -int QtInstanceSpinButton::get_width_chars() const -{ - assert(false && "Not implemented yet"); - return -1; -} - -void QtInstanceSpinButton::set_max_length(int) { assert(false && "Not implemented yet"); } - -void QtInstanceSpinButton::select_region(int, int) { assert(false && "Not implemented yet"); } - -bool QtInstanceSpinButton::get_selection_bounds(int&, int&) -{ - assert(false && "Not implemented yet"); - return false; -} - -void QtInstanceSpinButton::replace_selection(const OUString&) -{ - assert(false && "Not implemented yet"); -} - -void QtInstanceSpinButton::set_position(int) { assert(false && "Not implemented yet"); } - -int QtInstanceSpinButton::get_position() const -{ - assert(false && "Not implemented yet"); - return -1; -} - -void QtInstanceSpinButton::set_editable(bool) { assert(false && "Not implemented yet"); } - -bool QtInstanceSpinButton::get_editable() const -{ - assert(false && "Not implemented yet"); - return false; -} - -void QtInstanceSpinButton::set_message_type(weld::EntryMessageType) -{ - assert(false && "Not implemented yet"); -} - -void QtInstanceSpinButton::set_placeholder_text(const OUString&) -{ - assert(false && "Not implemented yet"); -} - -void QtInstanceSpinButton::set_overwrite_mode(bool) { assert(false && "Not implemented yet"); } - -bool QtInstanceSpinButton::get_overwrite_mode() const -{ - assert(false && "Not implemented yet"); - return false; -} - -void QtInstanceSpinButton::set_font(const vcl::Font&) { assert(false && "Not implemented yet"); } - -void QtInstanceSpinButton::set_font_color(const Color&) { assert(false && "Not implemented yet"); } - -void QtInstanceSpinButton::cut_clipboard() { assert(false && "Not implemented yet"); } - -void QtInstanceSpinButton::copy_clipboard() { assert(false && "Not implemented yet"); } - -void QtInstanceSpinButton::paste_clipboard() { assert(false && "Not implemented yet"); } - -void QtInstanceSpinButton::set_alignment(TxtAlign) { assert(false && "Not implemented yet"); } +QWidget* QtInstanceSpinButton::getQWidget() const { return m_pSpinBox; } void QtInstanceSpinButton::set_value(sal_Int64 nValue) { @@ -161,4 +101,10 @@ unsigned int QtInstanceSpinButton::get_digits() const return nDigits; } +void QtInstanceSpinButton::handleValueChanged() +{ + SolarMutexGuard aGuard; + signal_value_changed(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtInstanceWindow.cxx b/vcl/qt5/QtInstanceWindow.cxx index 8cc9573a6be5..262fe299a0c9 100644 --- a/vcl/qt5/QtInstanceWindow.cxx +++ b/vcl/qt5/QtInstanceWindow.cxx @@ -80,8 +80,6 @@ AbsoluteScreenPixelRectangle QtInstanceWindow::get_monitor_workarea() const return AbsoluteScreenPixelRectangle(); } -void QtInstanceWindow::set_centered_on_parent(bool) { assert(false && "Not implemented yet"); } - bool QtInstanceWindow::has_toplevel_focus() const { SolarMutexGuard g; diff --git a/vcl/qt6/QtDoubleSpinBox.cxx b/vcl/qt6/QtDoubleSpinBox.cxx new file mode 100644 index 000000000000..ec3caf954c79 --- /dev/null +++ b/vcl/qt6/QtDoubleSpinBox.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "../qt5/QtDoubleSpinBox.cxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt6/QtExpander.cxx b/vcl/qt6/QtExpander.cxx new file mode 100644 index 000000000000..9978011ff290 --- /dev/null +++ b/vcl/qt6/QtExpander.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "../qt5/QtExpander.cxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt6/QtInstanceExpander.cxx b/vcl/qt6/QtInstanceExpander.cxx new file mode 100644 index 000000000000..584bb0bc3fab --- /dev/null +++ b/vcl/qt6/QtInstanceExpander.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "../qt5/QtInstanceExpander.cxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/quartz/AquaGraphicsBackend.cxx b/vcl/quartz/AquaGraphicsBackend.cxx index daf413165f8f..1a3b45949801 100644 --- a/vcl/quartz/AquaGraphicsBackend.cxx +++ b/vcl/quartz/AquaGraphicsBackend.cxx @@ -196,8 +196,6 @@ AquaGraphicsBackend::AquaGraphicsBackend(AquaSharedAttributes& rShared) AquaGraphicsBackend::~AquaGraphicsBackend() {} -void AquaGraphicsBackend::Init() {} - void AquaGraphicsBackend::setClipRegion(vcl::Region const& rRegion) { // release old clip path @@ -1289,8 +1287,6 @@ bool AquaGraphicsBackend::drawTransformedBitmap(const basegfx::B2DPoint& rNull, return true; } -bool AquaGraphicsBackend::hasFastDrawTransformedBitmap() const { return false; } - bool AquaGraphicsBackend::drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) { @@ -1330,16 +1326,6 @@ bool AquaGraphicsBackend::implDrawGradient(basegfx::B2DPolyPolygon const& /*rPol return false; } -bool AquaGraphicsBackend::supportsOperation(OutDevSupportType eType) const -{ - switch (eType) - { - case OutDevSupportType::TransparentRect: - return true; - default: - break; - } - return false; -} +bool AquaGraphicsBackend::supportsOperation(OutDevSupportType /*eType*/) const { return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index eaf0051bacea..579a2d98d7fa 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -269,16 +269,18 @@ public: { mpGraphics->performFlush(); Stop(); - // tdf#163945 Lower priority of Skia flush timer - // Commit f4c2c7c79cfe4464ac596afda37b8904d06969db fixed tdf#157312 - // by lowering the timer priority to TaskPriority::POST_PAINT. But - // it caused tdf#163734 so it was reverted to TaskPriority::HIGHEST - // in commit 5a38e4f9798c5ff247aa57581adf2671485627fd. - // While reverting to TaskPriority::HIGHEST did not cause tdf#157312 - // to reoccur, it did cause tdf#163945 so set the timer priority to - // TaskPriority::HIGH_IDLE. This priority appears to be low enough to - // fix tdf#16394 without causing tdf#163734 to reoccur. - SetPriority(TaskPriority::HIGH_IDLE); +#ifdef MACOSX + // tdf#157312 and tdf#163945 Lower Skia flush timer priority on macOS + // On macOS, flushing with Skia/Metal is noticeably slower than + // with Skia/Raster. So lower the flush timer priority to + // TaskPriority::POST_PAINT so that the flush timer runs less + // frequently but each pass copies a more up-to-date offscreen + // surface. + // TODO: fix tdf#163734 on macOS + SetPriority(TaskPriority::POST_PAINT); +#else + SetPriority(TaskPriority::HIGHEST); +#endif } }; @@ -301,8 +303,6 @@ SkiaSalGraphicsImpl::~SkiaSalGraphicsImpl() assert(!mWindowContext); } -void SkiaSalGraphicsImpl::Init() {} - void SkiaSalGraphicsImpl::createSurface() { SkiaZone zone; @@ -1597,12 +1597,6 @@ void SkiaSalGraphicsImpl::invert(sal_uInt32 nPoints, const Point* pPointArray, S invert(aPolygon, eFlags); } -bool SkiaSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, - sal_uInt32) -{ - return false; -} - // Create SkImage from a bitmap and possibly an alpha mask (the usual VCL one-minus-alpha), // with the given target size. Result will be possibly cached, unless disabled. // Especially in raster mode scaling and alpha blending may be expensive if done repeatedly. @@ -2269,16 +2263,7 @@ void SkiaSalGraphicsImpl::drawGenericLayout(const GenericSalLayout& layout, Colo postDraw(); } -bool SkiaSalGraphicsImpl::supportsOperation(OutDevSupportType eType) const -{ - switch (eType) - { - case OutDevSupportType::TransparentRect: - return true; - default: - return false; - } -} +bool SkiaSalGraphicsImpl::supportsOperation(OutDevSupportType /*eType*/) const { return false; } static int getScaling() { diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx index 4874b056dad7..7fa95e8d9fab 100644 --- a/vcl/skia/osx/gdiimpl.cxx +++ b/vcl/skia/osx/gdiimpl.cxx @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -59,7 +60,6 @@ AquaSkiaSalGraphicsImpl::AquaSkiaSalGraphicsImpl(AquaSalGraphics& rParent, : SkiaSalGraphicsImpl(rParent, rShared.mpFrame) , AquaGraphicsBackendBase(rShared, this) { - Init(); // mac code doesn't call Init() } AquaSkiaSalGraphicsImpl::~AquaSkiaSalGraphicsImpl() @@ -250,28 +250,51 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n return false; // rControlRegion is not the whole area that the control should be painted to (e.g. highlight - // around focused lineedit is outside of it). Since we draw to a temporary bitmap, we need tofind out - // the real size. Using getNativeControlRegion() might seem like the function to call, but we need - // the other direction - what is called rControlRegion here is rNativeContentRegion in that function - // what's called rControlRegion there is what we need here. Moreover getNativeControlRegion() - // in some cases returns a fixed size that does not depend on its input, so we have no way to - // actually find out what the original size was (or maybe the function is kind of broken, I don't know). - // So, add a generous margin and hope it's enough. + // around focused lineedit is outside of it). Since we draw to a temporary bitmap, we need to find out + // the real size. + // Related tdf#163945 Reduce the size of the temporary bitmap + // Previously, the temporary bitmap was set to the control region + // expanded by 50 * mScaling (e.g. both width and height were + // increased by 200 pixels when running on a Retina display). This + // caused temporary bitmaps to be up to several times larger than + // needed. Also, drawing NSBox objects to a CGBitmapContext is + // noticeably slow so filling all that unneeded temporary bitmap + // area can slow down performance when a large number of NSBox + // objects like the status bar are redrawn in quick succession. + // Using getNativeControlRegion() isn't perfect, but it does try to + // account for the focus ring as well as the minimum width and/or + // height of the native control so union the two regions set by + // getNativeControlRegion() and add double the focus ring width on + // each side just to be safe. In most cases, this should ensure + // that the temporary bitmap is large enough to draw the entire + // native control and a focus ring. tools::Rectangle boundingRegion(rControlRegion); - boundingRegion.expand(50 * mScaling); + tools::Rectangle rNativeBoundingRegion; + tools::Rectangle rNativeContentRegion; + AquaSalGraphics* pGraphics = mrShared.mpFrame->mpGraphics; + if (pGraphics + && pGraphics->getNativeControlRegion(nType, nPart, rControlRegion, nState, aValue, + OUString(), rNativeBoundingRegion, + rNativeContentRegion)) + { + boundingRegion.Union(rNativeBoundingRegion); + boundingRegion.Union(rNativeContentRegion); + } + boundingRegion.expand(2 * FOCUS_RING_WIDTH * mScaling); + // Do a scaled bitmap in HiDPI in order not to lose precision. const tools::Long width = boundingRegion.GetWidth() * mScaling; const tools::Long height = boundingRegion.GetHeight() * mScaling; const size_t bytes = width * height * 4; - sal_uInt8* data = new sal_uInt8[bytes]; - memset(data, 0, bytes); + // Let Skia own the CGBitmapContext's buffer so that an SkImage + // can be created without Skia making a copy of the buffer + sk_sp data = SkData::MakeZeroInitialized(bytes); CGContextRef context = CGBitmapContextCreate( - data, width, height, 8, width * 4, GetSalData()->mxRGBSpace, + data->writable_data(), width, height, 8, width * 4, GetSalData()->mxRGBSpace, SkiaToCGBitmapType(mSurface->imageInfo().colorType(), kPremul_SkAlphaType)); if (!context) { SAL_WARN("vcl.skia", "drawNativeControl(): Failed to allocate bitmap context"); - delete[] data; return false; } // Setup context state for drawing (performDrawNativeControl() e.g. fills background in some cases). @@ -303,14 +326,6 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n CGContextRelease(context); if (bOK) { - // Let SkBitmap determine when it is safe to delete the pixel buffer - SkBitmap bitmap; - if (!bitmap.installPixels(SkImageInfo::Make(width, height, - mSurface->imageInfo().colorType(), - kPremul_SkAlphaType), - data, width * 4, nullptr, nullptr)) - abort(); - preDraw(); SAL_INFO("vcl.skia.trace", "drawnativecontrol(" << this << "): " << rControlRegion << ":" << int(nType) << "/" << int(nPart)); @@ -323,23 +338,19 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n updateRect.GetWidth(), updateRect.GetHeight())); SkRect drawRect = SkRect::MakeXYWH(boundingRegion.getX(), boundingRegion.getY(), boundingRegion.GetWidth(), boundingRegion.GetHeight()); - assert(drawRect.width() * mScaling == bitmap.width()); // no scaling should be needed - getDrawCanvas()->drawImageRect(bitmap.asImage(), drawRect, SkSamplingOptions()); + sk_sp image = SkImages::RasterFromData( + SkImageInfo::Make(width, height, mSurface->imageInfo().colorType(), + kPremul_SkAlphaType), + data, width * 4); + assert(image + && drawRect.width() * mScaling == image->width()); // no scaling should be needed + getDrawCanvas()->drawImageRect(image, drawRect, SkSamplingOptions()); // Related: tdf#156881 flush the canvas after drawing the pixel buffer if (auto dContext = GrAsDirectContext(getDrawCanvas()->recordingContext())) dContext->flushAndSubmit(); ++pendingOperationsToFlush; // tdf#136369 postDraw(); } - // Related: tdf#159529 eliminate possible memory leak - // Despite confirming that the release function passed to - // SkBitmap.bitmap.installPixels() does get called for every - // data array that has been allocated, Apple's Instruments - // indicates that the data is leaking. While it is likely a - // false positive, it makes leak analysis difficult so leave - // the bitmap mutable. That causes SkBitmap.asImage() to make - // a copy of the data and the data can be safely deleted here. - delete[] data; return bOK; } diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx index ffad26bd9b1f..34df45fa7d09 100644 --- a/vcl/skia/x11/gdiimpl.cxx +++ b/vcl/skia/x11/gdiimpl.cxx @@ -35,11 +35,10 @@ X11SkiaSalGraphicsImpl::X11SkiaSalGraphicsImpl(X11SalGraphics& rParent) { } -void X11SkiaSalGraphicsImpl::Init() +void X11SkiaSalGraphicsImpl::UpdateX11GeometryProvider() { // The m_pFrame and m_pVDev pointers are updated late in X11 setProvider(mX11Parent.GetGeometryProvider()); - SkiaSalGraphicsImpl::Init(); } void X11SkiaSalGraphicsImpl::createWindowSurfaceInternal(bool forceRaster) diff --git a/vcl/skia/x11/salvd.cxx b/vcl/skia/x11/salvd.cxx index 464793305896..8979f36d32b3 100644 --- a/vcl/skia/x11/salvd.cxx +++ b/vcl/skia/x11/salvd.cxx @@ -26,7 +26,7 @@ void X11SalGraphics::Init(X11SkiaSalVirtualDevice* pDevice) m_pVDev = pDevice; m_pFrame = nullptr; - mxImpl->Init(); + mxImpl->UpdateX11GeometryProvider(); } X11SkiaSalVirtualDevice::X11SkiaSalVirtualDevice(const SalGraphics& rGraphics, tools::Long nDX, diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 77d856b60a66..4f2928e53747 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1627,18 +1627,6 @@ AbsoluteScreenPixelRectangle SalInstanceWindow::get_monitor_workarea() const return m_xWindow->GetDesktopRectPixel(); } -void SalInstanceWindow::set_centered_on_parent(bool /*bTrackGeometryRequests*/) -{ - if (vcl::Window* pParent = m_xWidget->GetParent()) - { - Size aParentGeometry(pParent->GetSizePixel()); - Size aGeometry(m_xWidget->get_preferred_size()); - auto nX = (aParentGeometry.Width() - aGeometry.Width()) / 2; - auto nY = (aParentGeometry.Height() - aGeometry.Height()) / 2; - m_xWidget->SetPosPixel(Point(nX, nY)); - } -} - bool SalInstanceWindow::get_resizable() const { return m_xWindow->GetStyle() & WB_SIZEABLE; } bool SalInstanceWindow::has_toplevel_focus() const { return m_xWindow->HasChildPathFocus(); } @@ -1936,6 +1924,18 @@ void SalInstanceDialog::set_modal(bool bModal) bool SalInstanceDialog::get_modal() const { return m_xDialog->IsModalInputMode(); } +void SalInstanceDialog::set_centered_on_parent(bool /*bTrackGeometryRequests*/) +{ + if (vcl::Window* pParent = m_xWidget->GetParent()) + { + Size aParentGeometry(pParent->GetSizePixel()); + Size aGeometry(m_xWidget->get_preferred_size()); + auto nX = (aParentGeometry.Width() - aGeometry.Width()) / 2; + auto nY = (aParentGeometry.Height() - aGeometry.Height()) / 2; + m_xWidget->SetPosPixel(Point(nX, nY)); + } +} + void SalInstanceDialog::set_default_response(int nResponse) { m_xDialog->set_default_response(nResponse); @@ -2945,13 +2945,13 @@ IMPL_LINK(SalInstanceButton, ClickHdl, ::Button*, pButton, void) signal_clicked(); } -weld::Button* SalInstanceDialog::weld_widget_for_response(int nResponse) +std::unique_ptr SalInstanceDialog::weld_button_for_response(int nResponse) { PushButton* pButton = dynamic_cast(m_xDialog->get_widget_for_response(nResponse)); - return pButton ? new SalInstanceButton(pButton, nullptr, false) : nullptr; + return pButton ? std::make_unique(pButton, nullptr, false) : nullptr; } -weld::Button* SalInstanceAssistant::weld_widget_for_response(int nResponse) +std::unique_ptr SalInstanceAssistant::weld_button_for_response(int nResponse) { PushButton* pButton = nullptr; if (nResponse == RET_YES) @@ -2965,7 +2965,7 @@ weld::Button* SalInstanceAssistant::weld_widget_for_response(int nResponse) else if (nResponse == RET_HELP) pButton = m_xWizard->m_pHelp; if (pButton) - return new SalInstanceButton(pButton, nullptr, false); + return std::make_unique(pButton, nullptr, false); return nullptr; } @@ -6961,9 +6961,12 @@ IMPL_LINK(SalInstanceEntryTreeView, KeyPressListener, VclWindowEvent&, rEvent, v if (rEvent.GetId() != VclEventId::WindowKeyInput) return; const KeyEvent& rKeyEvent = *static_cast(rEvent.GetData()); + if (rKeyEvent.GetKeyCode().GetModifier()) // tdf#163777 ignore when modifier held + return; sal_uInt16 nKeyCode = rKeyEvent.GetKeyCode().GetCode(); - if (!(nKeyCode == KEY_UP || nKeyCode == KEY_DOWN || nKeyCode == KEY_PAGEUP - || nKeyCode == KEY_PAGEDOWN)) + const bool bNavigation = nKeyCode == KEY_UP || nKeyCode == KEY_DOWN || nKeyCode == KEY_PAGEUP + || nKeyCode == KEY_PAGEDOWN; + if (!bNavigation) return; m_pTreeView->disable_notify_events(); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 518402fda580..ad15bd3e68a3 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2709,7 +2709,7 @@ bool MiscSettings::GetEnableATToolSupport() { static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED"); if (pEnv && *pEnv) - return true; + return pEnv[0] != '0'; ImplSVData* pSVData = ImplGetSVData(); return pSVData->mxAccessBridge.is(); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index fa80f3dbf127..f767c2483925 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -140,13 +140,26 @@ namespace void endUsage(basegfx::SystemDependentData_SharedPtr& rData) override { - std::unique_lock aGuard(m_aMutex); - EntryMap::iterator aFound(maEntries.find(rData)); + // tdf#163428 prepare space for entry to hold to avoid early deletion + basegfx::SystemDependentData_SharedPtr aToBeDeletedEntry; - if(aFound != maEntries.end()) { - maEntries.erase(aFound); + // lock m_aMutex in own scope + std::unique_lock aGuard(m_aMutex); + EntryMap::iterator aFound(maEntries.find(rData)); + + if(aFound != maEntries.end()) + { + // tdf#163428 ensure to hold/not delete entry while m_aMutex is locked + aToBeDeletedEntry = aFound->first; + + // remove from list + maEntries.erase(aFound); + } } + + // tdf#163428 aToBeDeletedEntry will be destructed, thus the + // entry referenced by SharedPtr may be deleted now } void touchUsage(basegfx::SystemDependentData_SharedPtr& rData) override @@ -176,24 +189,55 @@ namespace IMPL_LINK_NOARG(SystemDependentDataBuffer, implTimeoutHdl, Timer *, void) { - std::unique_lock aGuard(m_aMutex); - EntryMap::iterator aIter(maEntries.begin()); + // tdf#163428 prepare a temporary list for SystemDependentData_SharedPtr + // entries that need to be removed from the unordered_map, but do not need + // locking m_aMutex + ::std::vector aToBeDeletedEntries; - while(aIter != maEntries.end()) { - if(aIter->second) + // lock m_aMutex in own scope + std::unique_lock aGuard(m_aMutex); + EntryMap::iterator aIter(maEntries.begin()); + + while(aIter != maEntries.end()) { - aIter->second--; - ++aIter; - } - else - { - aIter = maEntries.erase(aIter); + if(aIter->second) + { + aIter->second--; + ++aIter; + } + else + { + // tdf#163428 Do not potentially directly delete SystemDependentData_SharedPtr + // entries in the unordered_map (maEntries). That can/would happen when the shared_ptr + // has only one reference left. This can cause problems, e.g. we have + // BufferedData_ModifiedBitmapEx which can contain a Bitmap with added + // DataBuffers itself, thus deleting this here *directly* would trigger e.g. + // endUsage above. That would then block when we would still hold m_aMutex. + // This can potentially be the case with other derivations of + // basegfx::SystemDependentData, too. + // To avoid this, protect the part that needs protection by the m_aMutex, that + // is the modification of the unordered_map itself. Cleaning up the list entries can be + // done after this, without holding the lock. + // Thus, remember the SystemDependentData_SharedPtr in a temporary list by adding + // a reference/shared_ptr to it to guarantee it gets not deleted when it gets removed + // from the unordered_map. + // Anyways, only locking while manipulating the list is better, destruction of + // objects may be expensive and hold m_aMutex longer than necessary. + aToBeDeletedEntries.push_back(aIter->first); + + // remove from list. This decrements the shared_ptr, but delete is avoided + aIter = maEntries.erase(aIter); + } } + + if (maEntries.empty()) + maTimer->Stop(); } - if (maEntries.empty()) - maTimer->Stop(); + // tdf#163428 here aToBeDeletedEntries will be destroyed, the entries will be + // decremented and potentially deleted. These are of type SystemDependentData_SharedPtr, + // so we do not need to do anything explicitly here } } diff --git a/vcl/source/control/PriorityHBox.cxx b/vcl/source/control/PriorityHBox.cxx index c893cc8332eb..5b4b19660c4c 100644 --- a/vcl/source/control/PriorityHBox.cxx +++ b/vcl/source/control/PriorityHBox.cxx @@ -45,17 +45,6 @@ void PriorityHBox::Initialize() SetSizeFromParent(); } -int PriorityHBox::GetHiddenCount() const -{ - int nCount = 0; - - for (auto pWindow : m_aSortedChildren) - if (pWindow->IsHidden()) - nCount++; - - return nCount; -} - void PriorityHBox::SetSizeFromParent() { vcl::Window* pParent = GetParent(); diff --git a/vcl/source/control/PriorityMergedHBox.cxx b/vcl/source/control/PriorityMergedHBox.cxx index fd5aa5814dac..64fad5acb488 100644 --- a/vcl/source/control/PriorityMergedHBox.cxx +++ b/vcl/source/control/PriorityMergedHBox.cxx @@ -106,7 +106,7 @@ void PriorityMergedHBox::Resize() VclHBox::Resize(); - if (GetHiddenCount()) + if (HasHiddenChildren()) m_pButton->Show(); else m_pButton->Hide(); @@ -120,18 +120,16 @@ void PriorityMergedHBox::dispose() PriorityHBox::dispose(); } -int PriorityMergedHBox::GetHiddenCount() const +bool PriorityMergedHBox::HasHiddenChildren() const { - int nCount = 0; - for (int i = GetChildCount() - 1; i >= 0; i--) { vcl::Window* pWindow = GetChild(i); if (pWindow && pWindow->GetParent() == this && !pWindow->IsVisible()) - nCount++; + return true; } - return nCount; + return false; } Size PriorityMergedHBox::calculateRequisition() const diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index 058fa113bba9..901a53000e0f 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -954,7 +954,6 @@ void Calendar::ImplTracking( const Point& rPos, bool bRepeat ) void Calendar::ImplEndTracking( bool bCancel ) { - bool bSelection = false; bool bSpinDown = mbSpinDown; mbDrag = false; @@ -1003,7 +1002,7 @@ void Calendar::ImplEndTracking( bool bCancel ) if ( !bCancel && ((maCurDate != maOldCurDate) || (*mpOldSelectTable != *mpSelectTable)) ) Select(); - if ( !bSelection && (mnWinStyle & WB_TABSTOP) && !bCancel ) + if ( (mnWinStyle & WB_TABSTOP) && !bCancel ) GrabFocus(); mpOldSelectTable.reset(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 5e4c874d53bc..5aa5c831617c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2275,42 +2275,37 @@ void NotebookbarTabControlBase::SetIconClickHdl( Link aHdl ) m_aIconClickHdl = aHdl; } -static bool lcl_isValidPage(const ImplTabItem& rItem, bool& bFound) +static bool lcl_isValidPage(const ImplTabItem& rItem) { - if (rItem.m_bVisible && rItem.m_bEnabled) - bFound = true; - return bFound; + return rItem.m_bVisible && rItem.m_bEnabled; } void NotebookbarTabControlBase::ImplActivateTabPage( bool bNext ) { - const sal_uInt16 nOldPos = GetPagePos(GetCurPageId()); - bool bFound = false; - sal_Int32 nCurPos = nOldPos; + sal_Int32 nCurPos = GetPagePos(GetCurPageId()); if (bNext) { - for (nCurPos++; nCurPos < GetPageCount(); nCurPos++) - if (lcl_isValidPage(mpTabCtrlData->maItemList[nCurPos], bFound)) + for (sal_Int32 nPos = nCurPos + 1; nPos < GetPageCount(); nPos++) + if (lcl_isValidPage(mpTabCtrlData->maItemList[nPos])) + { + nCurPos = nPos; break; + } } else { - for (nCurPos--; nCurPos >= 0; nCurPos--) - if (lcl_isValidPage(mpTabCtrlData->maItemList[nCurPos], bFound)) + for (sal_Int32 nPos = nCurPos - 1; nPos >= 0; nPos--) + if (lcl_isValidPage(mpTabCtrlData->maItemList[nPos])) + { + nCurPos = nPos; break; + } } - if (!bFound) - nCurPos = nOldPos; SelectTabPage( TabControl::GetPageId( nCurPos ) ); } -sal_uInt16 NotebookbarTabControlBase::GetHeaderHeight() -{ - return m_nHeaderHeight; -} - bool NotebookbarTabControlBase::ImplPlaceTabs( tools::Long nWidth ) { if ( nWidth <= 0 ) diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index d9f125e33014..45d42fc21e68 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -806,11 +806,11 @@ namespace vcl , m_pCurTabPage(nullptr) , m_nCurState(0) , m_pFirstPage(nullptr) - , m_xFinish(m_xAssistant->weld_widget_for_response(RET_OK)) - , m_xCancel(m_xAssistant->weld_widget_for_response(RET_CANCEL)) - , m_xNextPage(m_xAssistant->weld_widget_for_response(RET_YES)) - , m_xPrevPage(m_xAssistant->weld_widget_for_response(RET_NO)) - , m_xHelp(m_xAssistant->weld_widget_for_response(RET_HELP)) + , m_xFinish(m_xAssistant->weld_button_for_response(RET_OK)) + , m_xCancel(m_xAssistant->weld_button_for_response(RET_CANCEL)) + , m_xNextPage(m_xAssistant->weld_button_for_response(RET_YES)) + , m_xPrevPage(m_xAssistant->weld_button_for_response(RET_NO)) + , m_xHelp(m_xAssistant->weld_button_for_response(RET_HELP)) , m_pImpl(new WizardMachineImplData) { implConstruct(nButtonFlags); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 8bb18818e6cb..159695e5cd7a 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1159,7 +1159,7 @@ Size VclMultiLineEdit::CalcMinimumSize() const Size aSz = pImpVclMEdit->CalcMinimumSize(); sal_Int32 nLeft, nTop, nRight, nBottom; - static_cast(const_cast(this))->GetBorder( nLeft, nTop, nRight, nBottom ); + GetBorder(nLeft, nTop, nRight, nBottom); aSz.AdjustWidth(nLeft+nRight ); aSz.AdjustHeight(nTop+nBottom ); @@ -1170,7 +1170,7 @@ Size VclMultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; sal_Int32 nLeft, nTop, nRight, nBottom; - static_cast(const_cast(this))->GetBorder( nLeft, nTop, nRight, nBottom ); + GetBorder(nLeft, nTop, nRight, nBottom); // center vertically for whole lines @@ -1191,7 +1191,7 @@ Size VclMultiLineEdit::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) c Size aSz = pImpVclMEdit->CalcBlockSize( nColumns, nLines ); sal_Int32 nLeft, nTop, nRight, nBottom; - static_cast(const_cast(this))->GetBorder( nLeft, nTop, nRight, nBottom ); + GetBorder(nLeft, nTop, nRight, nBottom); aSz.AdjustWidth(nLeft+nRight ); aSz.AdjustHeight(nTop+nBottom ); return aSz; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index c265c16866af..af9b2b774b4b 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -446,10 +446,16 @@ ErrCode GraphicFilter::CanImportGraphic( std::u16string_view rMainUrl, SvStream& ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags ) { - ErrCode nRetValue = ERRCODE_GRFILTER_FORMATERROR; SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl.filter", "GraphicFilter::ImportGraphic() : ProtType == INetProtocol::NotValid" ); OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); + if (rPath.IsExoticProtocol()) + { + SAL_WARN("vcl.filter", "GraphicFilter::ImportGraphic(), ignore exotic protocol: " << aMainUrl); + return ERRCODE_GRFILTER_FORMATERROR; + } + + ErrCode nRetValue = ERRCODE_GRFILTER_FORMATERROR; std::unique_ptr xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE )); if (xStream) { diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 999e8a7b708e..ee762e2fca47 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -469,11 +469,9 @@ std::set< PDFWriter::ErrorCode > const & PDFWriter::GetErrors() const } css::uno::Reference< css::beans::XMaterialHolder > -PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, - const OUString& i_rUserPassword - ) +PDFWriter::InitEncryption(const OUString& i_rOwnerPassword, const OUString& i_rUserPassword) { - return PDFWriterImpl::initEncryption( i_rOwnerPassword, i_rUserPassword ); + return PDFEncryptor::initEncryption(i_rOwnerPassword, i_rUserPassword); } void PDFWriter::PlayMetafile( const GDIMetaFile& i_rMTF, const vcl::PDFWriter::PlayMetafileContext& i_rPlayContext, PDFExtOutDevData* i_pData ) diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 88a9853ca392..b7ccf81df469 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -277,15 +277,6 @@ void appendDestinationName( const OUString& rString, OStringBuffer& rBuffer ) } } // end anonymous namespace -namespace vcl::pdf -{ -const sal_uInt8 PDFEncryptor::s_nPadString[32] = -{ - 0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08, - 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A -}; -} - namespace vcl { @@ -362,14 +353,6 @@ public: maLine.append(value); } - void writeString(std::string_view key, char* pString, sal_Int32 nSize) - { - maLine.append(key); - maLine.append(" ("); - appendLiteralString(pString, nSize, maLine); - maLine.append(")"); - } - void writeUnicodeEncrypt(std::string_view key, OUString const& rString, sal_Int32 nObject) { maLine.append(key); @@ -381,6 +364,17 @@ public: maLine.append(key); mrWriterImpl.appendLiteralStringEncrypt(value, nObject, maLine); } + + void writeHexArray(std::string_view key, sal_uInt8* pData, size_t nSize) + { + maLine.append(key); + maLine.append(" <"); + for (size_t i = 0; i < nSize; i++) + { + appendHex(sal_Int8(pData[i]), maLine); + } + maLine.append(">"); + } }; } // end anonymous namespace @@ -726,7 +720,106 @@ const char* getPDFVersionStr(PDFWriter::PDFVersion ePDFVersion) } } -} // end namespace +void computeDocumentIdentifier(std::vector& o_rIdentifier, + const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, + const OString& i_rCString1, + const css::util::DateTime& rCreationMetaDate, OString& o_rCString2) +{ + o_rIdentifier.clear(); + + //build the document id + OString aInfoValuesOut; + OStringBuffer aID(1024); + if (!i_rDocInfo.Title.isEmpty()) + PDFWriter::AppendUnicodeTextString(i_rDocInfo.Title, aID); + if (!i_rDocInfo.Author.isEmpty()) + PDFWriter::AppendUnicodeTextString(i_rDocInfo.Author, aID); + if (!i_rDocInfo.Subject.isEmpty()) + PDFWriter::AppendUnicodeTextString(i_rDocInfo.Subject, aID); + if (!i_rDocInfo.Keywords.isEmpty()) + PDFWriter::AppendUnicodeTextString(i_rDocInfo.Keywords, aID); + if (!i_rDocInfo.Creator.isEmpty()) + PDFWriter::AppendUnicodeTextString(i_rDocInfo.Creator, aID); + if (!i_rDocInfo.Producer.isEmpty()) + PDFWriter::AppendUnicodeTextString(i_rDocInfo.Producer, aID); + + TimeValue aTVal, aGMT; + oslDateTime aDT; + aDT.NanoSeconds = rCreationMetaDate.NanoSeconds; + aDT.Seconds = rCreationMetaDate.Seconds; + aDT.Minutes = rCreationMetaDate.Minutes; + aDT.Hours = rCreationMetaDate.Hours; + aDT.Day = rCreationMetaDate.Day; + aDT.Month = rCreationMetaDate.Month; + aDT.Year = rCreationMetaDate.Year; + + osl_getSystemTime(&aGMT); + osl_getLocalTimeFromSystemTime(&aGMT, &aTVal); + OStringBuffer aCreationMetaDateString(64); + + // i59651: we fill the Metadata date string as well, if PDF/A is requested + // according to ISO 19005-1:2005 6.7.3 the date is corrected for + // local time zone offset UTC only, whereas Acrobat 8 seems + // to use the localtime notation only + // according to a recommendation in XMP Specification (Jan 2004, page 75) + // the Acrobat way seems the right approach + aCreationMetaDateString.append(char('0' + ((aDT.Year / 1000) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Year / 100) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Year / 10) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Year) % 10))); + aCreationMetaDateString.append("-"); + aCreationMetaDateString.append(char('0' + ((aDT.Month / 10) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Month) % 10))); + aCreationMetaDateString.append("-"); + aCreationMetaDateString.append(char('0' + ((aDT.Day / 10) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Day) % 10))); + aCreationMetaDateString.append("T"); + aCreationMetaDateString.append(char('0' + ((aDT.Hours / 10) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Hours) % 10))); + aCreationMetaDateString.append(":"); + aCreationMetaDateString.append(char('0' + ((aDT.Minutes / 10) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Minutes) % 10))); + aCreationMetaDateString.append(":"); + aCreationMetaDateString.append(char('0' + ((aDT.Seconds / 10) % 10))); + aCreationMetaDateString.append(char('0' + ((aDT.Seconds) % 10))); + + sal_uInt32 nDelta = 0; + if (aGMT.Seconds > aTVal.Seconds) + { + nDelta = aGMT.Seconds - aTVal.Seconds; + aCreationMetaDateString.append("-"); + } + else if (aGMT.Seconds < aTVal.Seconds) + { + nDelta = aTVal.Seconds - aGMT.Seconds; + aCreationMetaDateString.append("+"); + } + else + { + aCreationMetaDateString.append("Z"); + } + if (nDelta) + { + aCreationMetaDateString.append(char('0' + ((nDelta / 36000) % 10))); + aCreationMetaDateString.append(char('0' + ((nDelta / 3600) % 10))); + aCreationMetaDateString.append(":"); + aCreationMetaDateString.append(char('0' + ((nDelta / 600) % 6))); + aCreationMetaDateString.append(char('0' + ((nDelta / 60) % 10))); + } + aID.append(i_rCString1.getStr(), i_rCString1.getLength()); + + aInfoValuesOut = aID.makeStringAndClear(); + o_rCString2 = aCreationMetaDateString.makeStringAndClear(); + + ::comphelper::Hash aDigest(::comphelper::HashType::MD5); + aDigest.update(reinterpret_cast(&aGMT), sizeof(aGMT)); + aDigest.update(reinterpret_cast(aInfoValuesOut.getStr()), + aInfoValuesOut.getLength()); + //the binary form of the doc id is needed for encryption stuff + o_rIdentifier = aDigest.finalize(); +} + +} // end anonymous namespace PDFPage::PDFPage( PDFWriterImpl* pWriter, double nPageWidth, double nPageHeight, PDFWriter::Orientation eOrientation ) : @@ -1306,7 +1399,7 @@ double PDFPage::getHeight() const } PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, - const css::uno::Reference< css::beans::XMaterialHolder >& xEnc, + const css::uno::Reference< css::beans::XMaterialHolder >& xEncryptionMaterialHolder, PDFWriter& i_rOuterFace) : VirtualDevice(Application::GetDefaultDevice(), DeviceFormat::WITHOUT_ALPHA, OUTDEV_PDF), m_aMapMode( MapUnit::MapPoint, Point(), Fraction( 1, pointToPixel(1) ), Fraction( 1, pointToPixel(1) ) ), @@ -1327,7 +1420,6 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, m_aFile(m_aContext.URL), m_bOpen(false), m_DocDigest(::comphelper::HashType::MD5), - m_nAccessPermissions(0), m_rOuterFace( i_rOuterFace ) { m_aStructure.emplace_back( ); @@ -1363,25 +1455,15 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, // setup DocInfo setupDocInfo(); - if( xEnc.is() ) - prepareEncryption( xEnc ); - - if( m_aContext.Encryption.Encrypt() ) + if (xEncryptionMaterialHolder.is()) { - // sanity check - if( m_aContext.Encryption.OValue.size() != ENCRYPTED_PWD_SIZE || - m_aContext.Encryption.UValue.size() != ENCRYPTED_PWD_SIZE || - m_aContext.Encryption.EncryptionKey.size() != MAXIMUM_RC4_KEY_LENGTH - ) - { - // the field lengths are invalid ? This was not setup by initEncryption. - // do not encrypt after all - m_aContext.Encryption.OValue.clear(); - m_aContext.Encryption.UValue.clear(); - OSL_ENSURE( false, "encryption data failed sanity check, encryption disabled" ); - } - else // setup key lengths - m_nAccessPermissions = computeAccessPermissions(m_aContext.Encryption, m_aPDFEncryptor.m_nKeyLength, m_aPDFEncryptor.m_nRC4KeyLength); + m_pPDFEncryptor.reset(new PDFEncryptor); + m_pPDFEncryptor->prepareEncryption(xEncryptionMaterialHolder, m_aContext.Encryption); + } + + if (m_pPDFEncryptor && m_aContext.Encryption.Encrypt()) + { + m_pPDFEncryptor->setupKeysAndCheck(m_aContext.Encryption); } // write header @@ -1469,7 +1551,7 @@ void PDFWriterImpl::setupDocInfo() { std::vector< sal_uInt8 > aId; m_aCreationDateString = PDFWriter::GetDateTime(); - computeDocumentIdentifier( aId, m_aContext.DocumentInfo, m_aCreationDateString, m_aContext.DocumentInfo.ModificationDate, m_aCreationMetaDateString ); + computeDocumentIdentifier(aId, m_aContext.DocumentInfo, m_aCreationDateString, m_aContext.DocumentInfo.ModificationDate, m_aCreationMetaDateString); if( m_aContext.Encryption.DocumentIdentifier.empty() ) m_aContext.Encryption.DocumentIdentifier = std::move(aId); } @@ -1515,7 +1597,7 @@ append the string as unicode hex, encrypted if needed inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "<" ); - if( m_aContext.Encryption.Encrypt() ) + if (m_aContext.Encryption.Encrypt()) { const sal_Unicode* pStr = rInString.getStr(); sal_Int32 nLen = rInString.getLength(); @@ -1534,7 +1616,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt *pCopy++ = static_cast( aUnChar & 255 ); } //encrypt in place - rtl_cipher_encodeARCFOUR( m_aPDFEncryptor.m_aCipher, m_vEncryptionBuffer.data(), nChars, m_vEncryptionBuffer.data(), nChars); + m_pPDFEncryptor->encrypt(m_vEncryptionBuffer.data(), nChars, m_vEncryptionBuffer.data(), nChars); //now append, hexadecimal (appendHex), the encrypted result for(int i = 0; i < nChars; i++) appendHex( m_vEncryptionBuffer[i], rOutBuffer ); @@ -1549,12 +1631,12 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( std::string_view rInStrin rOutBuffer.append( "(" ); sal_Int32 nChars = rInString.size(); //check for encryption, if ok, encrypt the string, then convert with appndLiteralString - if( m_aContext.Encryption.Encrypt() ) + if (m_aContext.Encryption.Encrypt()) { m_vEncryptionBuffer.resize(nChars); //encrypt the string in a buffer, then append it - enableStringEncryption( nInObjectNumber ); - rtl_cipher_encodeARCFOUR(m_aPDFEncryptor.m_aCipher, rInString.data(), nChars, m_vEncryptionBuffer.data(), nChars); + enableStringEncryption(nInObjectNumber); + m_pPDFEncryptor->encrypt(rInString.data(), nChars, m_vEncryptionBuffer.data(), nChars); appendLiteralString( reinterpret_cast(m_vEncryptionBuffer.data()), nChars, rOutBuffer ); } else @@ -1661,16 +1743,14 @@ bool PDFWriterImpl::writeBufferBytes( const void* pBuffer, sal_uInt64 nBytes ) } else { - bool buffOK = true; - if (m_aPDFEncryptor.m_bEncryptThisStream) + bool bStreamEncryption = m_pPDFEncryptor && m_pPDFEncryptor->isStreamEncryptionEnabled(); + if (bStreamEncryption) { - /* implement the encryption part of the PDF spec encryption algorithm 3.1 */ m_vEncryptionBuffer.resize(nBytes); - if (buffOK) - rtl_cipher_encodeARCFOUR(m_aPDFEncryptor.m_aCipher, pBuffer, static_cast(nBytes), m_vEncryptionBuffer.data(), static_cast(nBytes)); + m_pPDFEncryptor->encrypt(pBuffer, nBytes, m_vEncryptionBuffer.data(), nBytes); } - const void* pWriteBuffer = (m_aPDFEncryptor.m_bEncryptThisStream && buffOK) ? m_vEncryptionBuffer.data() : pBuffer; + const void* pWriteBuffer = bStreamEncryption ? m_vEncryptionBuffer.data() : pBuffer; m_DocDigest.update(static_cast(pWriteBuffer), static_cast(nBytes)); if (m_aFile.write(pWriteBuffer, nBytes, nWritten) != osl::File::E_None) @@ -6066,6 +6146,7 @@ sal_Int32 PDFWriterImpl::emitEncrypt() if (updateObject(nObject)) { + PDFEncryptionProperties& rProperties = m_aContext.Encryption; PDFStructureWriter aWriter(*this); aWriter.startObject(nObject); aWriter.startDict(); @@ -6074,9 +6155,9 @@ sal_Int32 PDFWriterImpl::emitEncrypt() aWriter.write("/Length", 128); aWriter.write("/R", 3); // emit the owner password, must not be encrypted - aWriter.writeString("/O", reinterpret_cast(m_aContext.Encryption.OValue.data()), sal_Int32(m_aContext.Encryption.OValue.size())); - aWriter.writeString("/U", reinterpret_cast(m_aContext.Encryption.UValue.data()), sal_Int32(m_aContext.Encryption.UValue.size())); - aWriter.write("/P", m_nAccessPermissions); + aWriter.writeHexArray("/O", rProperties.OValue.data(), rProperties.OValue.size()); + aWriter.writeHexArray("/U", rProperties.UValue.data(), rProperties.UValue.size()); + aWriter.write("/P", m_pPDFEncryptor->getAccessPermissions()); aWriter.endDict(); aWriter.endObject(); @@ -9657,37 +9738,6 @@ bool PDFWriterImpl::writeBitmapObject( const BitmapEmit& rObject, bool bMask ) aLine.append( "/ColorSpace" ); if( bTrueColor ) aLine.append( "/DeviceRGB\n" ); - else if( aBitmap.HasGreyPaletteAny() ) - { - aLine.append( "/DeviceGray\n" ); - if (aBitmap.getPixelFormat() == vcl::PixelFormat::N8_BPP) - { - // #i47395# 1 bit bitmaps occasionally have an inverted grey palette - sal_uInt16 nBlackIndex = pAccess->GetBestPaletteIndex( BitmapColor( COL_BLACK ) ); - assert( nBlackIndex == 0 || nBlackIndex == 1); - sal_uInt16 nWhiteIndex = pAccess->GetBestPaletteIndex( BitmapColor( COL_WHITE ) ); - if( pAccess->GetPalette()[nBlackIndex] == BitmapColor( COL_BLACK ) && - pAccess->GetPalette()[nWhiteIndex] == BitmapColor( COL_WHITE ) ) - { - // It is black and white - if( nBlackIndex == 1 ) - aLine.append( "/Decode[1 0]\n" ); - } - else - { - // It is two levels of grey - aLine.append( "/Decode[" ); - assert( pAccess->GetPalette()[0].GetRed() == pAccess->GetPalette()[0].GetGreen() && - pAccess->GetPalette()[0].GetRed() == pAccess->GetPalette()[0].GetBlue() && - pAccess->GetPalette()[1].GetRed() == pAccess->GetPalette()[1].GetGreen() && - pAccess->GetPalette()[1].GetRed() == pAccess->GetPalette()[1].GetBlue() ); - aLine.append( pAccess->GetPalette()[0].GetRed() / 255.0 ); - aLine.append( " " ); - aLine.append( pAccess->GetPalette()[1].GetRed() / 255.0 ); - aLine.append( "]\n" ); - } - } - } else { aLine.append( "[ /Indexed/DeviceRGB " ); @@ -9695,7 +9745,7 @@ bool PDFWriterImpl::writeBitmapObject( const BitmapEmit& rObject, bool bMask ) aLine.append( "\n<" ); if( m_aContext.Encryption.Encrypt() ) { - enableStringEncryption( rObject.m_nObject ); + enableStringEncryption(rObject.m_nObject); //check encryption buffer size m_vEncryptionBuffer.resize(pAccess->GetPaletteEntryCount()*3); int nChar = 0; @@ -9708,7 +9758,7 @@ bool PDFWriterImpl::writeBitmapObject( const BitmapEmit& rObject, bool bMask ) m_vEncryptionBuffer[nChar++] = rColor.GetBlue(); } //encrypt the colorspace lookup table - rtl_cipher_encodeARCFOUR(m_aPDFEncryptor.m_aCipher, m_vEncryptionBuffer.data(), nChar, m_vEncryptionBuffer.data(), nChar); + m_pPDFEncryptor->encrypt(m_vEncryptionBuffer.data(), nChar, m_vEncryptionBuffer.data(), nChar); //now queue the data for output nChar = 0; for( sal_uInt16 i = 0; i < pAccess->GetPaletteEntryCount(); i++ ) @@ -11876,7 +11926,6 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa if( nPageNr < 0 || o3tl::make_unsigned(nPageNr) >= m_aPages.size() ) return -1; - bool sigHidden(true); sal_Int32 nNewWidget = m_aWidgets.size(); m_aWidgets.emplace_back( ); @@ -12049,8 +12098,6 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa #if HAVE_FEATURE_NSS else if( rControl.getType() == PDFWriter::Signature) { - sigHidden = true; - rNewWidget.m_aRect = tools::Rectangle(0, 0, 0, 0); m_nSignatureObject = createObject(); @@ -12061,9 +12108,9 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa } #endif - // if control is a hidden signature, do not convert coordinates since we + // if control is a signature, do not convert coordinates since we // need /Rect [ 0 0 0 0 ] - if ( ! ( ( rControl.getType() == PDFWriter::Signature ) && sigHidden ) ) + if ( rControl.getType() != PDFWriter::Signature ) { // convert to default user space now, since the mapmode may change // note: create default appearances before m_aRect gets transformed diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 06bdee0ce538..3efc67a32b61 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1077,96 +1077,27 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa // Encryption methods -void PDFWriterImpl::checkAndEnableStreamEncryption( sal_Int32 nObject ) +void PDFWriterImpl::checkAndEnableStreamEncryption(sal_Int32 nObject) { - if( !m_aContext.Encryption.Encrypt() ) + if (!m_aContext.Encryption.Encrypt() || !m_pPDFEncryptor) return; - m_aPDFEncryptor.m_bEncryptThisStream = true; - sal_Int32 i = m_aPDFEncryptor.m_nKeyLength; - m_aContext.Encryption.EncryptionKey[i++] = static_cast(nObject); - m_aContext.Encryption.EncryptionKey[i++] = static_cast( nObject >> 8 ); - m_aContext.Encryption.EncryptionKey[i++] = static_cast( nObject >> 16 ); - // the other location of m_nEncryptionKey is already set to 0, our fixed generation number - // do the MD5 hash - ::std::vector const nMD5Sum(::comphelper::Hash::calculateHash( - m_aContext.Encryption.EncryptionKey.data(), i+2, ::comphelper::HashType::MD5)); - // the i+2 to take into account the generation number, always zero - // initialize the RC4 with the key - // key length: see algorithm 3.1, step 4: (N+5) max 16 - rtl_cipher_initARCFOUR(m_aPDFEncryptor.m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum.data(), m_aPDFEncryptor.m_nRC4KeyLength, nullptr, 0); + m_pPDFEncryptor->enableStreamEncryption(); + m_pPDFEncryptor->setupEncryption(m_aContext.Encryption.EncryptionKey, nObject); } -void PDFWriterImpl::enableStringEncryption( sal_Int32 nObject ) +void PDFWriterImpl::disableStreamEncryption() { - if( !m_aContext.Encryption.Encrypt() ) + if (m_pPDFEncryptor) + m_pPDFEncryptor->disableStreamEncryption(); +} + +void PDFWriterImpl::enableStringEncryption(sal_Int32 nObject) +{ + if (!m_aContext.Encryption.Encrypt() || !m_pPDFEncryptor) return; - sal_Int32 i = m_aPDFEncryptor.m_nKeyLength; - m_aContext.Encryption.EncryptionKey[i++] = static_cast(nObject); - m_aContext.Encryption.EncryptionKey[i++] = static_cast( nObject >> 8 ); - m_aContext.Encryption.EncryptionKey[i++] = static_cast( nObject >> 16 ); - // the other location of m_nEncryptionKey is already set to 0, our fixed generation number - // do the MD5 hash - // the i+2 to take into account the generation number, always zero - ::std::vector const nMD5Sum(::comphelper::Hash::calculateHash( - m_aContext.Encryption.EncryptionKey.data(), i+2, ::comphelper::HashType::MD5)); - // initialize the RC4 with the key - // key length: see algorithm 3.1, step 4: (N+5) max 16 - rtl_cipher_initARCFOUR(m_aPDFEncryptor.m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum.data(), m_aPDFEncryptor.m_nRC4KeyLength, nullptr, 0); -} - -/* init the encryption engine -1. init the document id, used both for building the document id and for building the encryption key(s) -2. build the encryption key following algorithms described in the PDF specification - */ -uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const OUString& i_rOwnerPassword, - const OUString& i_rUserPassword - ) -{ - uno::Reference< beans::XMaterialHolder > xResult; - if( !i_rOwnerPassword.isEmpty() || !i_rUserPassword.isEmpty() ) - { - rtl::Reference pTransporter = new EncryptionHashTransporter; - xResult = pTransporter; - - // get padded passwords - sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE]; - padPassword( i_rOwnerPassword.isEmpty() ? i_rUserPassword : i_rOwnerPassword, aPadOPW ); - padPassword( i_rUserPassword, aPadUPW ); - - if( computeODictionaryValue( aPadOPW, aPadUPW, pTransporter->getOValue(), SECUR_128BIT_KEY ) ) - { - pTransporter->getUDigest()->update(aPadUPW, ENCRYPTED_PWD_SIZE); - } - else - xResult.clear(); - - // trash temporary padded cleartext PWDs - rtl_secureZeroMemory (aPadOPW, sizeof(aPadOPW)); - rtl_secureZeroMemory (aPadUPW, sizeof(aPadUPW)); - } - return xResult; -} - -bool PDFWriterImpl::prepareEncryption( const uno::Reference< beans::XMaterialHolder >& xEnc ) -{ - bool bSuccess = false; - EncryptionHashTransporter* pTransporter = EncryptionHashTransporter::getEncHashTransporter( xEnc ); - if( pTransporter ) - { - sal_Int32 nKeyLength = 0, nRC4KeyLength = 0; - sal_Int32 nAccessPermissions = computeAccessPermissions( m_aContext.Encryption, nKeyLength, nRC4KeyLength ); - m_aContext.Encryption.OValue = pTransporter->getOValue(); - bSuccess = computeUDictionaryValue( pTransporter, m_aContext.Encryption, nKeyLength, nAccessPermissions ); - } - if( ! bSuccess ) - { - m_aContext.Encryption.OValue.clear(); - m_aContext.Encryption.UValue.clear(); - m_aContext.Encryption.EncryptionKey.clear(); - } - return bSuccess; + m_pPDFEncryptor->setupEncryption(m_aContext.Encryption.EncryptionKey, nObject); } const tools::Long unsetRun[256] = diff --git a/vcl/source/pdf/PDFEncryptor.cxx b/vcl/source/pdf/PDFEncryptor.cxx index dc309fbbe59e..16b88ec160b0 100644 --- a/vcl/source/pdf/PDFEncryptor.cxx +++ b/vcl/source/pdf/PDFEncryptor.cxx @@ -10,16 +10,38 @@ #include #include -#include +#include +#include #include +#include +#include +#include + +using namespace css; namespace vcl::pdf { -/************************************************************* -begin i12626 methods +namespace +{ +// the maximum password length +constexpr sal_Int32 MD5_DIGEST_SIZE = 16; -Implements Algorithm 3.2, step 1 only -*/ +// security 128 bit +constexpr sal_Int32 SECUR_128BIT_KEY = 16; + +// maximum length of MD5 digest input, in step 2 of algorithm 3.1 +// PDF spec ver. 1.4: see there for details +constexpr sal_Int32 MAXIMUM_RC4_KEY_LENGTH = SECUR_128BIT_KEY + 3 + 2; + +constexpr sal_Int32 ENCRYPTED_PWD_SIZE = 32; + +/* pad string used for password in Standard security handler */ +constexpr const std::array s_nPadString + = { 0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, + 0x56, 0xFF, 0xFA, 0x01, 0x08, 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, + 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A }; + +/** Implements Algorithm 3.2, step 1 only */ void padPassword(std::u16string_view i_rPassword, sal_uInt8* o_pPaddedPW) { // get ansi-1252 version of the password string CHECKIT ! i12626 @@ -36,21 +58,19 @@ void padPassword(std::u16string_view i_rPassword, sal_uInt8* o_pPaddedPW) //pad it with standard byte string sal_Int32 i, y; for (i = nCurrentChar, y = 0; i < ENCRYPTED_PWD_SIZE; i++, y++) - o_pPaddedPW[i] = PDFEncryptor::s_nPadString[y]; + o_pPaddedPW[i] = s_nPadString[y]; } -/********************************** -Algorithm 3.2 Compute the encryption key used - -step 1 should already be done before calling, the paThePaddedPassword parameter should contain -the padded password and must be 32 byte long, the encryption key is returned into the paEncryptionKey parameter, -it will be 16 byte long for 128 bit security; for 40 bit security only the first 5 bytes are used - -TODO: in pdf ver 1.5 and 1.6 the step 6 is different, should be implemented. See spec. - -*/ +/** Algorithm 3.2 Compute the encryption key used + * Step 1 should already be done before calling, the paThePaddedPassword parameter should contain + * the padded password and must be 32 byte long, the encryption key is returned into the + * paEncryptionKey parameter, it will be 16 byte long for 128 bit security; for 40 bit security + * only the first 5 bytes are used + * + * TODO: in pdf ver 1.5 and 1.6 the step 6 is different, should be implemented. See spec. + */ bool computeEncryptionKey(EncryptionHashTransporter* i_pTransporter, - vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, + vcl::PDFEncryptionProperties& io_rProperties, sal_Int32 i_nAccessPermissions) { bool bSuccess = true; @@ -106,10 +126,10 @@ bool computeEncryptionKey(EncryptionHashTransporter* i_pTransporter, return bSuccess; } -/********************************** -Algorithm 3.3 Compute the encryption dictionary /O value, save into the class data member -the step numbers down here correspond to the ones in PDF v.1.4 specification -*/ +/** Algorithm 3.3 + * Compute the encryption dictionary /O value, save into the class data member the step + * numbers down here correspond to the ones in PDF v.1.4 specification + */ bool computeODictionaryValue(const sal_uInt8* i_pPaddedOwnerPassword, const sal_uInt8* i_pPaddedUserPassword, std::vector& io_rOValue, sal_Int32 i_nKeyLength) @@ -170,10 +190,8 @@ bool computeODictionaryValue(const sal_uInt8* i_pPaddedOwnerPassword, rtl_cipher_encodeARCFOUR( aCipher, io_rOValue.data(), sal_Int32(io_rOValue.size()), // the data to be encrypted - io_rOValue.data(), - sal_Int32( - io_rOValue - .size())); // encrypted data, can be the same as the input, encrypt "in place" + io_rOValue.data(), sal_Int32(io_rOValue.size())); + // encrypted data, can be the same as the input, encrypt "in place" //step 8, store in class data member } } @@ -192,12 +210,14 @@ bool computeODictionaryValue(const sal_uInt8* i_pPaddedOwnerPassword, return bSuccess; } -/********************************** -Algorithms 3.4 and 3.5 Compute the encryption dictionary /U value, save into the class data member, revision 2 (40 bit) or 3 (128 bit) -*/ +/** Algorithms 3.4 and 3.5 + * + * Compute the encryption dictionary /U value, save into the class data member, + * revision 2 (40 bit) or 3 (128 bit) + */ bool computeUDictionaryValue(EncryptionHashTransporter* i_pTransporter, - vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, - sal_Int32 i_nKeyLength, sal_Int32 i_nAccessPermissions) + vcl::PDFEncryptionProperties& io_rProperties, sal_Int32 i_nKeyLength, + sal_Int32 i_nAccessPermissions) { bool bSuccess = true; @@ -219,7 +239,7 @@ bool computeUDictionaryValue(EncryptionHashTransporter* i_pTransporter, for (sal_uInt32 i = MD5_DIGEST_SIZE; i < sal_uInt32(io_rProperties.UValue.size()); i++) io_rProperties.UValue[i] = 0; //steps 2 and 3 - aDigest.update(PDFEncryptor::s_nPadString, sizeof(PDFEncryptor::s_nPadString)); + aDigest.update(s_nPadString.data(), sizeof(s_nPadString)); aDigest.update(io_rProperties.DocumentIdentifier.data(), io_rProperties.DocumentIdentifier.size()); @@ -266,102 +286,7 @@ bool computeUDictionaryValue(EncryptionHashTransporter* i_pTransporter, return bSuccess; } -void computeDocumentIdentifier(std::vector& o_rIdentifier, - const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - const OString& i_rCString1, - const css::util::DateTime& rCreationMetaDate, OString& o_rCString2) -{ - o_rIdentifier.clear(); - - //build the document id - OString aInfoValuesOut; - OStringBuffer aID(1024); - if (!i_rDocInfo.Title.isEmpty()) - PDFWriter::AppendUnicodeTextString(i_rDocInfo.Title, aID); - if (!i_rDocInfo.Author.isEmpty()) - PDFWriter::AppendUnicodeTextString(i_rDocInfo.Author, aID); - if (!i_rDocInfo.Subject.isEmpty()) - PDFWriter::AppendUnicodeTextString(i_rDocInfo.Subject, aID); - if (!i_rDocInfo.Keywords.isEmpty()) - PDFWriter::AppendUnicodeTextString(i_rDocInfo.Keywords, aID); - if (!i_rDocInfo.Creator.isEmpty()) - PDFWriter::AppendUnicodeTextString(i_rDocInfo.Creator, aID); - if (!i_rDocInfo.Producer.isEmpty()) - PDFWriter::AppendUnicodeTextString(i_rDocInfo.Producer, aID); - - TimeValue aTVal, aGMT; - oslDateTime aDT; - aDT.NanoSeconds = rCreationMetaDate.NanoSeconds; - aDT.Seconds = rCreationMetaDate.Seconds; - aDT.Minutes = rCreationMetaDate.Minutes; - aDT.Hours = rCreationMetaDate.Hours; - aDT.Day = rCreationMetaDate.Day; - aDT.Month = rCreationMetaDate.Month; - aDT.Year = rCreationMetaDate.Year; - - osl_getSystemTime(&aGMT); - osl_getLocalTimeFromSystemTime(&aGMT, &aTVal); - OStringBuffer aCreationMetaDateString(64); - - // i59651: we fill the Metadata date string as well, if PDF/A is requested - // according to ISO 19005-1:2005 6.7.3 the date is corrected for - // local time zone offset UTC only, whereas Acrobat 8 seems - // to use the localtime notation only - // according to a recommendation in XMP Specification (Jan 2004, page 75) - // the Acrobat way seems the right approach - aCreationMetaDateString.append(OStringChar(static_cast('0' + ((aDT.Year / 1000) % 10))) - + OStringChar(static_cast('0' + ((aDT.Year / 100) % 10))) - + OStringChar(static_cast('0' + ((aDT.Year / 10) % 10))) - + OStringChar(static_cast('0' + ((aDT.Year) % 10))) + "-" - + OStringChar(static_cast('0' + ((aDT.Month / 10) % 10))) - + OStringChar(static_cast('0' + ((aDT.Month) % 10))) + "-" - + OStringChar(static_cast('0' + ((aDT.Day / 10) % 10))) - + OStringChar(static_cast('0' + ((aDT.Day) % 10))) + "T" - + OStringChar(static_cast('0' + ((aDT.Hours / 10) % 10))) - + OStringChar(static_cast('0' + ((aDT.Hours) % 10))) + ":" - + OStringChar(static_cast('0' + ((aDT.Minutes / 10) % 10))) - + OStringChar(static_cast('0' + ((aDT.Minutes) % 10))) - + ":" - + OStringChar(static_cast('0' + ((aDT.Seconds / 10) % 10))) - + OStringChar(static_cast('0' + ((aDT.Seconds) % 10)))); - - sal_uInt32 nDelta = 0; - if (aGMT.Seconds > aTVal.Seconds) - { - nDelta = aGMT.Seconds - aTVal.Seconds; - aCreationMetaDateString.append("-"); - } - else if (aGMT.Seconds < aTVal.Seconds) - { - nDelta = aTVal.Seconds - aGMT.Seconds; - aCreationMetaDateString.append("+"); - } - else - { - aCreationMetaDateString.append("Z"); - } - if (nDelta) - { - aCreationMetaDateString.append( - OStringChar(static_cast('0' + ((nDelta / 36000) % 10))) - + OStringChar(static_cast('0' + ((nDelta / 3600) % 10))) + ":" - + OStringChar(static_cast('0' + ((nDelta / 600) % 6))) - + OStringChar(static_cast('0' + ((nDelta / 60) % 10)))); - } - aID.append(i_rCString1.getStr(), i_rCString1.getLength()); - - aInfoValuesOut = aID.makeStringAndClear(); - o_rCString2 = aCreationMetaDateString.makeStringAndClear(); - - ::comphelper::Hash aDigest(::comphelper::HashType::MD5); - aDigest.update(reinterpret_cast(&aGMT), sizeof(aGMT)); - aDigest.update(reinterpret_cast(aInfoValuesOut.getStr()), - aInfoValuesOut.getLength()); - //the binary form of the doc id is needed for encryption stuff - o_rIdentifier = aDigest.finalize(); -} - -sal_Int32 computeAccessPermissions(const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, +sal_Int32 computeAccessPermissions(const vcl::PDFEncryptionProperties& i_rProperties, sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength) { /* @@ -388,6 +313,125 @@ sal_Int32 computeAccessPermissions(const vcl::PDFWriter::PDFEncryptionProperties return nAccessPermissions; } +} // end anonymous namespace + +PDFEncryptor::PDFEncryptor() +{ + /* prepare the cypher engine */ + m_aCipher = rtl_cipher_createARCFOUR(rtl_Cipher_ModeStream); +} + +PDFEncryptor::~PDFEncryptor() { rtl_cipher_destroyARCFOUR(m_aCipher); } + +/* init the encryption engine +1. init the document id, used both for building the document id and for building the encryption key(s) +2. build the encryption key following algorithms described in the PDF specification + */ +uno::Reference +PDFEncryptor::initEncryption(const OUString& i_rOwnerPassword, const OUString& i_rUserPassword) +{ + uno::Reference xResult; + if (!i_rOwnerPassword.isEmpty() || !i_rUserPassword.isEmpty()) + { + rtl::Reference pTransporter = new EncryptionHashTransporter; + xResult = pTransporter; + + // get padded passwords + sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE]; + padPassword(i_rOwnerPassword.isEmpty() ? i_rUserPassword : i_rOwnerPassword, aPadOPW); + padPassword(i_rUserPassword, aPadUPW); + + if (computeODictionaryValue(aPadOPW, aPadUPW, pTransporter->getOValue(), SECUR_128BIT_KEY)) + { + pTransporter->getUDigest()->update(aPadUPW, ENCRYPTED_PWD_SIZE); + } + else + xResult.clear(); + + // trash temporary padded cleartext PWDs + rtl_secureZeroMemory(aPadOPW, sizeof(aPadOPW)); + rtl_secureZeroMemory(aPadUPW, sizeof(aPadUPW)); + } + return xResult; +} + +bool PDFEncryptor::prepareEncryption( + const uno::Reference& xEncryptionMaterialHolder, + vcl::PDFEncryptionProperties& rProperties) +{ + bool bSuccess = false; + EncryptionHashTransporter* pTransporter + = EncryptionHashTransporter::getEncHashTransporter(xEncryptionMaterialHolder); + if (pTransporter) + { + sal_Int32 nKeyLength = 0, nRC4KeyLength = 0; + sal_Int32 nAccessPermissions + = computeAccessPermissions(rProperties, nKeyLength, nRC4KeyLength); + rProperties.OValue = pTransporter->getOValue(); + bSuccess + = computeUDictionaryValue(pTransporter, rProperties, nKeyLength, nAccessPermissions); + } + if (!bSuccess) + { + rProperties.OValue.clear(); + rProperties.UValue.clear(); + rProperties.EncryptionKey.clear(); + } + return bSuccess; +} + +/* this function implements part of the PDF spec algorithm 3.1 in encryption */ +void PDFEncryptor::setupKeysAndCheck(vcl::PDFEncryptionProperties& rProperties) +{ + // sanity check + if (rProperties.OValue.size() != ENCRYPTED_PWD_SIZE + || rProperties.UValue.size() != ENCRYPTED_PWD_SIZE + || rProperties.EncryptionKey.size() != MAXIMUM_RC4_KEY_LENGTH) + { + // the field lengths are invalid ? This was not setup by initEncryption. + // do not encrypt after all + rProperties.OValue.clear(); + rProperties.UValue.clear(); + OSL_ENSURE(false, "encryption data failed sanity check, encryption disabled"); + } + else // setup key lengths + { + m_nAccessPermissions = computeAccessPermissions(rProperties, m_nKeyLength, m_nRC4KeyLength); + } +} + +void PDFEncryptor::enableStreamEncryption() { m_bEncryptThisStream = true; } + +void PDFEncryptor::disableStreamEncryption() { m_bEncryptThisStream = false; } + +void PDFEncryptor::setupEncryption(std::vector const& rEncryptionKey, sal_Int32 nObject) +{ + std::vector aKey(rEncryptionKey.begin(), rEncryptionKey.begin() + m_nKeyLength); + std::vector aObjectArray{ + sal_uInt8(nObject), sal_uInt8(nObject >> 8), sal_uInt8(nObject >> 16), + 0, // generation number, always zero + 0 // generation number, always zero + }; + aKey.insert(aKey.end(), aObjectArray.begin(), aObjectArray.end()); + + // do the MD5 hash + auto const nMD5Sum + = comphelper::Hash::calculateHash(aKey.data(), aKey.size(), ::comphelper::HashType::MD5); + + // initialize the RC4 with the key + // key length: see algorithm 3.1, step 4: (N+5) max 16 + rtl_cipher_initARCFOUR(m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum.data(), getRC4KeyLength(), + nullptr, 0); +} + +/* implement the encryption part of the PDF spec encryption algorithm 3.1 */ +void PDFEncryptor::encrypt(const void* pInput, sal_uInt64 nInputSize, sal_uInt8* pOutput, + sal_uInt64 nOutputsSize) +{ + rtl_cipher_encodeARCFOUR(m_aCipher, pInput, sal_Size(nInputSize), pOutput, + sal_Size(nOutputsSize)); +} + } // end vcl::pdf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 0a06c388fb67..e22ebf320e15 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2411,8 +2411,9 @@ namespace BuilderUtils } } -VclPtr VclBuilder::insertObject(vcl::Window *pParent, const OUString &rClass, - const OUString &rID, stringmap &rProps, stringmap &rPango, stringmap &rAtk) +VclPtr VclBuilder::insertObject(vcl::Window* pParent, const OUString& rClass, + std::string_view, const OUString& rID, + stringmap& rProps, stringmap& rPango, stringmap& rAtk) { VclPtr pCurrentChild; diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index ac75333d9011..338b676257f6 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -76,7 +76,7 @@ static vcl::Window* ImplGetCurTabWindow(const vcl::Window* pWindow) // Check if the TabPage is a Child of the TabControl and still exists (by // walking all child windows); because it could be that the TabPage has been // destroyed already by a Dialog-Dtor, event that the TabControl still exists. - const TabPage* pTempTabPage = pTabControl->GetTabPage(pTabControl->GetCurPageId()); + TabPage* pTempTabPage = pTabControl->GetTabPage(pTabControl->GetCurPageId()); if (pTempTabPage) { vcl::Window* pTempWindow = pTabControl->GetWindow(GetWindowType::FirstChild); @@ -84,7 +84,7 @@ static vcl::Window* ImplGetCurTabWindow(const vcl::Window* pWindow) { if (pTempWindow->ImplGetWindow() == pTempTabPage) { - return const_cast(pTempTabPage); + return pTempTabPage; } pTempWindow = nextLogicalChildOfParent(pTabControl, pTempWindow); } @@ -324,8 +324,8 @@ vcl::Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, GetDlgWindowType nType } /* namespace vcl */ -vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow, sal_uInt16& rIndex, - sal_uInt16& rFormStart, sal_uInt16& rFormEnd ) +vcl::Window* ImplFindDlgCtrlWindow(vcl::Window* pParent, const vcl::Window* pWindow, + sal_uInt16& rIndex, sal_uInt16& rFormStart, sal_uInt16& rFormEnd) { vcl::Window* pSWindow; vcl::Window* pSecondWindow = nullptr; diff --git a/vcl/source/window/dlgctrl.hxx b/vcl/source/window/dlgctrl.hxx index 94af911c7818..50d7ee1f2bab 100644 --- a/vcl/source/window/dlgctrl.hxx +++ b/vcl/source/window/dlgctrl.hxx @@ -23,8 +23,9 @@ vcl::Window* ImplGetChildWindow( vcl::Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ); -vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow, sal_uInt16& rIndex, - sal_uInt16& rFormStart, sal_uInt16& rFormEnd ); +vcl::Window* ImplFindDlgCtrlWindow(vcl::Window* pParent, const vcl::Window* pWindow, + sal_uInt16& rIndex, sal_uInt16& rFormStart, + sal_uInt16& rFormEnd); vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ); diff --git a/vcl/source/window/legacyaccessibility.cxx b/vcl/source/window/legacyaccessibility.cxx index a0f4aff33919..dc3275ff84ff 100644 --- a/vcl/source/window/legacyaccessibility.cxx +++ b/vcl/source/window/legacyaccessibility.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; -static vcl::Window* ImplGetLabelFor( vcl::Window* pFrameWindow, WindowType nMyType, vcl::Window* pLabel, sal_Unicode nAccel ) +static vcl::Window* ImplGetLabelFor(vcl::Window* pFrameWindow, WindowType nMyType, const vcl::Window* pLabel, sal_Unicode nAccel) { vcl::Window* pWindow = nullptr; @@ -100,13 +100,13 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const sal_Unicode nAccel = getAccel( GetText() ); - Window* pWindow = ImplGetLabelFor( pFrameWindow, GetType(), const_cast(this), nAccel ); + Window* pWindow = ImplGetLabelFor(pFrameWindow, GetType(), this, nAccel); if( ! pWindow && mpWindowImpl->mpRealParent ) - pWindow = ImplGetLabelFor( mpWindowImpl->mpRealParent, GetType(), const_cast(this), nAccel ); + pWindow = ImplGetLabelFor(mpWindowImpl->mpRealParent, GetType(), this, nAccel); return pWindow; } -static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Window* pLabeled ) +static Window* ImplGetLabeledBy(Window* pFrameWindow, WindowType nMyType, const Window* pLabeled) { Window* pWindow = nullptr; if (pFrameWindow && nMyType != WindowType::GROUPBOX && nMyType != WindowType::FIXEDLINE) @@ -175,9 +175,9 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabeledBy() const // #i100833# MT 2010/02: Group box and fixed lines can also label a fixed text. // See tools/options/print for example. - Window* pWindow = ImplGetLabeledBy( pFrameWindow, GetType(), const_cast(this) ); + Window* pWindow = ImplGetLabeledBy(pFrameWindow, GetType(), this); if( ! pWindow && mpWindowImpl->mpRealParent ) - pWindow = ImplGetLabeledBy( mpWindowImpl->mpRealParent, GetType(), const_cast(this) ); + pWindow = ImplGetLabeledBy(mpWindowImpl->mpRealParent, GetType(), this); return pWindow; } @@ -200,11 +200,8 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const // is directly before the control // get form start and form end and index of this control sal_uInt16 nIndex, nFormStart, nFormEnd; - Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow, - const_cast(this), - nIndex, - nFormStart, - nFormEnd ); + Window* pSWindow + = ::ImplFindDlgCtrlWindow(pFrameWindow, this, nIndex, nFormStart, nFormEnd); if( pSWindow && nIndex != nFormStart ) { if( GetType() == WindowType::PUSHBUTTON || diff --git a/vcl/uiconfig/ui/openlockedquerybox.ui b/vcl/uiconfig/ui/openlockedquerybox.ui index 680698d2ecef..0b3942112b6d 100644 --- a/vcl/uiconfig/ui/openlockedquerybox.ui +++ b/vcl/uiconfig/ui/openlockedquerybox.ui @@ -133,73 +133,6 @@ receive a notification if ready. 1 - - - True - False - You can open a copy on your -local system. - 0 - - - static - - - - - 0 - 2 - - - - - True - True - True - - - True - False - 10 - 0 - - - static - - - - - - - True - False - _More Details - True - - - - - - - - 0 - 3 - 2 - - - - - Open Co_py - True - True - True - True - - - 1 - 2 - - True @@ -241,6 +174,73 @@ local system. 1 + + + True + False + You can open a copy on your +local system. + 0 + + + static + + + + + 0 + 2 + + + + + Open Co_py + True + True + True + True + + + 1 + 2 + + + + + True + True + True + + + True + False + 10 + 0 + + + static + + + + + + + True + False + _More Details + True + + + + + + + + 0 + 3 + 2 + + True diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx index 4ec2b453a622..9e822047f14e 100644 --- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx +++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx @@ -128,11 +128,6 @@ void X11CairoSalGraphicsImpl::invert(sal_uInt32 nPoints, const Point* pPtAry, Sa mrCairoCommon.invert(nPoints, pPtAry, nFlags, getAntiAlias()); } -bool X11CairoSalGraphicsImpl::hasFastDrawTransformedBitmap() const -{ - return CairoCommon::hasFastDrawTransformedBitmap(); -} - bool X11CairoSalGraphicsImpl::supportsOperation(OutDevSupportType eType) const { return CairoCommon::supportsOperation(eType); @@ -196,8 +191,6 @@ std::shared_ptr X11CairoSalGraphicsImpl::getBitmap(tools::Long nX, to return mrCairoCommon.getBitmap(nX, nY, nWidth, nHeight); } -void X11CairoSalGraphicsImpl::Init() {} - bool X11CairoSalGraphicsImpl::drawPolyLineBezier(sal_uInt32, const Point*, const PolyFlags*) { return false; @@ -214,12 +207,6 @@ bool X11CairoSalGraphicsImpl::drawPolyPolygonBezier(sal_uInt32, const sal_uInt32 return false; } -bool X11CairoSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, - sal_uInt32) -{ - return false; -} - bool X11CairoSalGraphicsImpl::blendBitmap(const SalTwoRect&, const SalBitmap&) { return false; } bool X11CairoSalGraphicsImpl::blendAlphaBitmap(const SalTwoRect&, const SalBitmap&, diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx index 607809d1421f..3a8948eedafe 100644 --- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx +++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx @@ -33,8 +33,6 @@ private: public: X11CairoSalGraphicsImpl(X11SalGraphics& rParent, CairoCommon& rCairoCommon); - void Init() override; - OUString getRenderBackendName() const override { return u"gen"_ustr; } // get the depth of the device @@ -163,11 +161,6 @@ public: const Point* const* pPtAry, const PolyFlags* const* pFlgAry) override; - bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) override; - - bool hasFastDrawTransformedBitmap() const override; - /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the coordinate system */ bool drawTransformedBitmap(const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index e765919d6528..a9f0a3c0cbb8 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -143,7 +143,7 @@ void X11SalGraphics::Init( X11SalFrame& rFrame, Drawable aTarget, m_pVDev = nullptr; SetDrawable(aTarget, rFrame.GetSurface(), nXScreen); - mxImpl->Init(); + mxImpl->UpdateX11GeometryProvider(); } void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // const diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index e0a9d33f6e87..33ba19c95d59 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -79,7 +79,7 @@ void X11SalGraphics::Init(X11SalVirtualDevice *pDevice, SalColormap* pColormap, m_pFrame = nullptr; SetDrawable(pDevice->GetDrawable(), pDevice->GetSurface(), m_nXScreen); - mxImpl->Init(); + mxImpl->UpdateX11GeometryProvider(); } X11SalVirtualDevice::X11SalVirtualDevice(const SalGraphics& rGraphics, tools::Long &nDX, tools::Long &nDY, diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx index 4cff5dd6c176..317c8290f461 100644 --- a/vcl/unx/gtk3/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx @@ -674,6 +674,9 @@ atk_object_wrapper_finalize (GObject *obj) atk_object_wrapper_dispose( pWrap ); + if (pWrap->mpOrig) + g_object_unref(pWrap->mpOrig); + parent_class->finalize( obj ); } @@ -811,61 +814,61 @@ static bool isTableCell(uno::XInterface* pInterface) extern "C" { typedef GType (* GetGIfaceType ) (); } -const struct { - const char *name; +constexpr struct { + OString sName; GInterfaceInitFunc const aInit; GetGIfaceType const aGetGIfaceType; const uno::Type & (*aGetUnoType) (); } aTypeTable[] = { // re-location heaven: { - "Comp", componentIfaceInit, + "Comp"_ostr, componentIfaceInit, atk_component_get_type, cppu::UnoType::get }, { - "Act", actionIfaceInit, + "Act"_ostr, actionIfaceInit, atk_action_get_type, cppu::UnoType::get }, { - "Txt", textIfaceInit, + "Txt"_ostr, textIfaceInit, atk_text_get_type, cppu::UnoType::get }, { - "Val", valueIfaceInit, + "Val"_ostr, valueIfaceInit, atk_value_get_type, cppu::UnoType::get }, { - "Tab", tableIfaceInit, + "Tab"_ostr, tableIfaceInit, atk_table_get_type, cppu::UnoType::get }, { - "Cell", tablecellIfaceInit, + "Cell"_ostr, tablecellIfaceInit, atk_table_cell_get_type, // there is no UNO a11y interface for table cells, so this case is handled separately below nullptr }, { - "Edt", editableTextIfaceInit, + "Edt"_ostr, editableTextIfaceInit, atk_editable_text_get_type, cppu::UnoType::get }, { - "Img", imageIfaceInit, + "Img"_ostr, imageIfaceInit, atk_image_get_type, cppu::UnoType::get }, { - "Hyp", hypertextIfaceInit, + "Hyp"_ostr, hypertextIfaceInit, atk_hypertext_get_type, cppu::UnoType::get }, { - "Sel", selectionIfaceInit, + "Sel"_ostr, selectionIfaceInit, atk_selection_get_type, cppu::UnoType::get } @@ -884,19 +887,19 @@ ensureTypeFor( uno::XInterface *pAccessible ) for( i = 0; i < aTypeTableSize; i++ ) { - if(!g_strcmp0(aTypeTable[i].name, "Cell")) + if (aTypeTable[i].sName == "Cell") { // there is no UNO interface for table cells, but AtkTableCell can be supported // for table cells via the methods of the parent that is a table if (isTableCell(pAccessible)) { - aTypeNameBuf.append(aTypeTable[i].name); + aTypeNameBuf.append(aTypeTable[i].sName); bTypes[i] = true; } } else if (isOfType( pAccessible, aTypeTable[i].aGetUnoType() ) ) { - aTypeNameBuf.append(aTypeTable[i].name); + aTypeNameBuf.append(aTypeTable[i].sName); bTypes[i] = true; } } @@ -969,6 +972,8 @@ atk_object_wrapper_new( const css::uno::Reference< css::accessibility::XAccessib pWrap->mpContext = xContext; pWrap->mpOrig = orig; + if (pWrap->mpOrig) + g_object_ref(pWrap->mpOrig); AtkObject* atk_obj = ATK_OBJECT(pWrap); atk_obj->role = mapToAtkRole(xContext->getAccessibleRole(), xContext->getAccessibleStateSet()); diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 42243c60e965..f101834627c5 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -3132,13 +3132,6 @@ void GtkSalFrame::SetModal(bool bModal) gtk_window_set_modal(GTK_WINDOW(m_pWindow), bModal); } -bool GtkSalFrame::GetModal() const -{ - if (!m_pWindow) - return false; - return gtk_window_get_modal(GTK_WINDOW(m_pWindow)); -} - gboolean GtkSalFrame::signalTooltipQuery(GtkWidget*, gint /*x*/, gint /*y*/, gboolean /*keyboard_mode*/, GtkTooltip *tooltip, gpointer frame) diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index c3205805cada..834984642a1e 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -6421,18 +6421,6 @@ public: return ::get_monitor_workarea(GTK_WIDGET(m_pWindow)); } - virtual void set_centered_on_parent(bool bTrackGeometryRequests) override - { -#if !GTK_CHECK_VERSION(4, 0, 0) - if (bTrackGeometryRequests) - gtk_window_set_position(m_pWindow, GTK_WIN_POS_CENTER_ALWAYS); - else - gtk_window_set_position(m_pWindow, GTK_WIN_POS_CENTER_ON_PARENT); -#else - (void)bTrackGeometryRequests; -#endif - } - virtual bool get_resizable() const override { return gtk_window_get_resizable(m_pWindow); @@ -7163,6 +7151,18 @@ public: return gtk_window_get_modal(m_pDialog); } + virtual void set_centered_on_parent(bool bTrackGeometryRequests) override + { +#if !GTK_CHECK_VERSION(4, 0, 0) + if (bTrackGeometryRequests) + gtk_window_set_position(m_pDialog, GTK_WIN_POS_CENTER_ALWAYS); + else + gtk_window_set_position(m_pDialog, GTK_WIN_POS_CENTER_ON_PARENT); +#else + (void)bTrackGeometryRequests; +#endif + } + virtual void response(int nResponse) override; virtual void add_button(const OUString& rText, int nResponse, const OUString& rHelpId) override @@ -7182,7 +7182,7 @@ public: return GTK_BUTTON(gtk_dialog_get_widget_for_response(GTK_DIALOG(m_pDialog), nGtkResponse)); } - virtual weld::Button* weld_widget_for_response(int nVclResponse) override; + virtual std::unique_ptr weld_button_for_response(int nVclResponse) override; virtual std::unique_ptr weld_content_area() override { @@ -10083,12 +10083,12 @@ int GtkInstanceDialog::run() return GtkToVcl(ret); } -weld::Button* GtkInstanceDialog::weld_widget_for_response(int nVclResponse) +std::unique_ptr GtkInstanceDialog::weld_button_for_response(int nVclResponse) { GtkButton* pButton = get_widget_for_response(VclToGtk(nVclResponse)); if (!pButton) return nullptr; - return new GtkInstanceButton(pButton, m_pBuilder, false); + return std::make_unique(pButton, m_pBuilder, false); } void GtkInstanceDialog::response(int nResponse) @@ -16014,7 +16014,7 @@ public: { GtkTreeModel* pModel; GList* pList = gtk_tree_selection_get_selected_rows(gtk_tree_view_get_selection(m_pTreeView), &pModel); - for (GList* pItem = g_list_first(pList); pItem; pItem = g_list_next(pItem)) + if (GList* pItem = g_list_first(pList)) { if (pIter) { @@ -16022,7 +16022,6 @@ public: gtk_tree_model_get_iter(pModel, pIter, path); } bRet = true; - break; } g_list_free_full(pList, reinterpret_cast(gtk_tree_path_free)); } @@ -17131,7 +17130,7 @@ private: { GtkTreeModel* pModel = GTK_TREE_MODEL(m_pTreeStore); GList* pList = gtk_icon_view_get_selected_items(m_pIconView); - for (GList* pItem = g_list_first(pList); pItem; pItem = g_list_next(pItem)) + if (GList* pItem = g_list_first(pList)) { if (pIter) { @@ -17139,7 +17138,6 @@ private: gtk_tree_model_get_iter(pModel, pIter, path); } bRet = true; - break; } g_list_free_full(pList, reinterpret_cast(gtk_tree_path_free)); } @@ -18839,11 +18837,9 @@ public: virtual AbsoluteScreenPixelPoint get_accessible_location_on_screen() override { -#if !GTK_CHECK_VERSION(4, 0, 0) - AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget); -#endif gint x(0), y(0); #if !GTK_CHECK_VERSION(4, 0, 0) + AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget); if (pAtkObject && ATK_IS_COMPONENT(pAtkObject)) atk_component_get_extents(ATK_COMPONENT(pAtkObject), &x, &y, nullptr, nullptr, ATK_XY_SCREEN); #endif diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx index a95d80a8c0ed..efe4da3dde44 100644 --- a/vcl/unx/gtk3/gtksalmenu.cxx +++ b/vcl/unx/gtk3/gtksalmenu.cxx @@ -28,15 +28,15 @@ static bool bUnityMode = false; /* * This function generates a unique command name for each menu item */ -static gchar* GetCommandForItem(GtkSalMenu* pParentMenu, sal_uInt16 nItemId) +static OString GetCommandForItem(GtkSalMenu* pParentMenu, sal_uInt16 nItemId) { OString aCommand = "window-" + OString::number(reinterpret_cast(pParentMenu)) + "-" + OString::number(nItemId); - return g_strdup(aCommand.getStr()); + return aCommand; } -static gchar* GetCommandForItem(GtkSalMenuItem* pSalMenuItem) +static OString GetCommandForItem(GtkSalMenuItem* pSalMenuItem) { return GetCommandForItem(pSalMenuItem->mpParentMenu, pSalMenuItem->mnId); @@ -297,20 +297,20 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries) pOldCommandList = g_list_append( pOldCommandList, aCurrentCommand ); // Get the new command for the item. - gchar* aNativeCommand = GetCommandForItem(pSalMenuItem); + OString sNativeCommand = GetCommandForItem(pSalMenuItem); // Force updating of native menu labels. - if ( g_strcmp0( aNativeCommand, "" ) != 0 && pSalMenuItem->mpSubMenu == nullptr ) + if (!sNativeCommand.isEmpty() && pSalMenuItem->mpSubMenu == nullptr) { NativeSetItemText( nSection, nItemPos, aText, false ); NativeSetItemIcon( nSection, nItemPos, aImage ); NativeSetAccelerator(nSection, nItemPos, nAccelKey, nAccelKey.GetName()); - NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, bChecked, false ); + NativeSetItemCommand(nSection, nItemPos, nId, sNativeCommand.getStr(), itemBits, bChecked, false); NativeCheckItem( nSection, nItemPos, itemBits, bChecked ); - NativeSetEnableItem( aNativeCommand, bEnabled ); + NativeSetEnableItem(sNativeCommand, bEnabled); - pNewCommandList = g_list_append( pNewCommandList, g_strdup( aNativeCommand ) ); + pNewCommandList = g_list_append(pNewCommandList, g_strdup(sNativeCommand.getStr())); } else { @@ -323,8 +323,8 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries) if ( pSubmenu && pSubmenu->GetMenu() ) { - bool bNonMenuChangedToMenu = NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, false, true ); - pNewCommandList = g_list_append( pNewCommandList, g_strdup( aNativeCommand ) ); + bool bNonMenuChangedToMenu = NativeSetItemCommand(nSection, nItemPos, nId, sNativeCommand.getStr(), itemBits, false, true); + pNewCommandList = g_list_append(pNewCommandList, g_strdup(sNativeCommand.getStr())); GLOMenu* pSubMenuModel = g_lo_menu_get_submenu_from_item_in_section( pLOMenu, nSection, nItemPos ); @@ -347,8 +347,6 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries) g_object_unref( pSubMenuModel ); } - g_free( aNativeCommand ); - ++nItemPos; ++validItems; } @@ -380,13 +378,12 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries) } if (!nItemsCount) { - gchar* aNativeCommand = GetCommandForItem(this, 0xFFFF); + OString sNativeCommand = GetCommandForItem(this, 0xFFFF); OUString aPlaceholderText(VclResId(SV_RESID_STRING_NOSELECTIONPOSSIBLE)); g_lo_menu_insert_in_section(pLOMenu, nSection-1, 0, OUStringToOString(aPlaceholderText, RTL_TEXTENCODING_UTF8).getStr()); - NativeSetItemCommand(nSection-1, 0, 0xFFFF, aNativeCommand, MenuItemBits::NONE, false, false); - NativeSetEnableItem(aNativeCommand, false); - g_free(aNativeCommand); + NativeSetItemCommand(nSection - 1, 0, 0xFFFF, sNativeCommand.getStr(), MenuItemBits::NONE, false, false); + NativeSetEnableItem(sNativeCommand, false); } } @@ -689,9 +686,8 @@ void GtkSalMenu::RemoveItem( unsigned nPos ) if (mpActionGroup) { GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP(mpActionGroup); - gchar* pCommand = GetCommandForItem(maItems[nPos]); - g_lo_action_group_remove(pActionGroup, pCommand); - g_free(pCommand); + OString sCommand = GetCommandForItem(maItems[nPos]); + g_lo_action_group_remove(pActionGroup, sCommand.getStr()); } maItems.erase( maItems.begin() + nPos ); @@ -1231,13 +1227,13 @@ void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItem g_free( aCommand ); } -void GtkSalMenu::NativeSetEnableItem( gchar const * aCommand, gboolean bEnable ) +void GtkSalMenu::NativeSetEnableItem(const OString& sCommand, gboolean bEnable) { SolarMutexGuard aGuard; GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup ); - if ( g_action_group_get_action_enabled( G_ACTION_GROUP( pActionGroup ), aCommand ) != bEnable ) - g_lo_action_group_set_action_enabled( pActionGroup, aCommand, bEnable ); + if (g_action_group_get_action_enabled(G_ACTION_GROUP(pActionGroup), sCommand.getStr()) != bEnable) + g_lo_action_group_set_action_enabled(pActionGroup, sCommand.getStr(), bEnable); } void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText, bool bFireEvent ) @@ -1574,9 +1570,8 @@ void GtkSalMenu::EnableItem( unsigned nPos, bool bEnable ) SolarMutexGuard aGuard; if ( bUnityMode && !mbInActivateCallback && !mbNeedsUpdate && GetTopLevel()->mbMenuBar && ( nPos < maItems.size() ) ) { - gchar* pCommand = GetCommandForItem( GetItemAtPos( nPos ) ); - NativeSetEnableItem( pCommand, bEnable ); - g_free( pCommand ); + OString sCommand = GetCommandForItem(GetItemAtPos(nPos)); + NativeSetEnableItem(sCommand, bEnable); } } @@ -1597,7 +1592,7 @@ void GtkSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU if ( !bUnityMode || mbInActivateCallback || mbNeedsUpdate || !GetTopLevel()->mbMenuBar || ( nPos >= maItems.size() ) ) return; - gchar* pCommand = GetCommandForItem( static_cast< GtkSalMenuItem* >( pSalMenuItem ) ); + OString sCommand = GetCommandForItem(static_cast(pSalMenuItem)); gint nSectionsCount = g_menu_model_get_n_items( mpMenuModel ); for ( gint nSection = 0; nSection < nSectionsCount; ++nSection ) @@ -1607,19 +1602,16 @@ void GtkSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU { gchar* pCommandFromModel = g_lo_menu_get_command_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItem ); - if ( !g_strcmp0( pCommandFromModel, pCommand ) ) + if (pCommandFromModel == sCommand) { NativeSetItemText( nSection, nItem, rText ); g_free( pCommandFromModel ); - g_free( pCommand ); return; } g_free( pCommandFromModel ); } } - - g_free( pCommand ); } void GtkSalMenu::SetItemImage( unsigned, SalMenuItem*, const Image& ) diff --git a/vcl/unx/gtk4/gtkaccessibleregistry.cxx b/vcl/unx/gtk4/gtkaccessibleregistry.cxx index c8086ec4b13e..357df91d0160 100644 --- a/vcl/unx/gtk4/gtkaccessibleregistry.cxx +++ b/vcl/unx/gtk4/gtkaccessibleregistry.cxx @@ -14,9 +14,9 @@ std::map GtkAccessibleRegistry::m_aMapping = {}; -LoAccessible* -GtkAccessibleRegistry::getLOAccessible(css::uno::Reference xAcc, - GdkDisplay* pDisplay, GtkAccessible* pParent) +LoAccessible* GtkAccessibleRegistry::getLOAccessible( + css::uno::Reference const& xAcc, GdkDisplay* pDisplay, + GtkAccessible* pParent) { if (!xAcc.is()) return nullptr; @@ -48,7 +48,7 @@ GtkAccessibleRegistry::getLOAccessible(css::uno::Reference xAcc) +void GtkAccessibleRegistry::remove(css::uno::Reference const& xAcc) { assert(xAcc.is()); m_aMapping.erase(xAcc.get()); diff --git a/vcl/unx/gtk4/gtkaccessibleregistry.hxx b/vcl/unx/gtk4/gtkaccessibleregistry.hxx index e2ad1588e8db..fb57ff9be4b1 100644 --- a/vcl/unx/gtk4/gtkaccessibleregistry.hxx +++ b/vcl/unx/gtk4/gtkaccessibleregistry.hxx @@ -23,10 +23,11 @@ private: public: /** Returns the related LoAccessible* for the XAccessible. Creates a new one if none exists yet. */ - static LoAccessible* getLOAccessible(css::uno::Reference xAcc, - GdkDisplay* pDisplay, GtkAccessible* pParent = nullptr); + static LoAccessible* + getLOAccessible(css::uno::Reference const& xAcc, + GdkDisplay* pDisplay, GtkAccessible* pParent = nullptr); /** Removes the entry for the given XAccessible. */ - static void remove(css::uno::Reference xAcc); + static void remove(css::uno::Reference const& xAcc); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/dtrans/WinClipboard.hxx b/vcl/win/dtrans/WinClipboard.hxx index aba9689cb7a0..098f0816c557 100644 --- a/vcl/win/dtrans/WinClipboard.hxx +++ b/vcl/win/dtrans/WinClipboard.hxx @@ -52,7 +52,7 @@ class CWinClipboard final css::datatransfer::clipboard::XFlushableClipboard, css::lang::XServiceInfo> { - friend STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release(); + friend CXNotifyingDataObject::~CXNotifyingDataObject(); css::uno::Reference m_xContext; const OUString m_itsName; diff --git a/vcl/win/dtrans/XNotifyingDataObject.cxx b/vcl/win/dtrans/XNotifyingDataObject.cxx index 9d7c563a5a28..cee9e63879ed 100644 --- a/vcl/win/dtrans/XNotifyingDataObject.cxx +++ b/vcl/win/dtrans/XNotifyingDataObject.cxx @@ -40,6 +40,12 @@ CXNotifyingDataObject::CXNotifyingDataObject( { } +CXNotifyingDataObject::~CXNotifyingDataObject() +{ + if (auto pWinClipImpl = m_pWinClipImpl.get()) + pWinClipImpl->onReleaseDataObject(*this); +} + STDMETHODIMP CXNotifyingDataObject::QueryInterface( REFIID iid, void** ppvObject ) { if ( nullptr == ppvObject ) @@ -64,6 +70,17 @@ STDMETHODIMP_(ULONG) CXNotifyingDataObject::AddRef( ) return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) ); } +namespace +{ +// delete CXNotifyingDataObject is a dedicated thread. It calls CWinClipboard::onReleaseDataObject, +// which may lock solar mutex, and if called in CMtaOleClipboard::run() thread, may deadlock. +unsigned __stdcall releaseAsyncProc(void* p) +{ + delete static_cast(p); + return 0; +} +} + STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release( ) { ULONG nRefCnt = @@ -71,10 +88,9 @@ STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release( ) if ( 0 == nRefCnt ) { - if (auto pWinClipImpl = m_pWinClipImpl.get()) - pWinClipImpl->onReleaseDataObject(*this); - - delete this; + auto handle = _beginthreadex(nullptr, 0, releaseAsyncProc, this, 0, nullptr); + assert(handle); + CloseHandle(reinterpret_cast(handle)); } return nRefCnt; diff --git a/vcl/win/dtrans/XNotifyingDataObject.hxx b/vcl/win/dtrans/XNotifyingDataObject.hxx index 04fb5b93d49f..ba15b143cbf5 100644 --- a/vcl/win/dtrans/XNotifyingDataObject.hxx +++ b/vcl/win/dtrans/XNotifyingDataObject.hxx @@ -48,7 +48,7 @@ public: const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& aXClipOwner, CWinClipboard* const theWinClipoard); - virtual ~CXNotifyingDataObject() {} + virtual ~CXNotifyingDataObject(); // ole interface implementation diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx index 8a3ade545e36..06f927b725a6 100644 --- a/vcl/win/gdi/DWriteTextRenderer.cxx +++ b/vcl/win/gdi/DWriteTextRenderer.cxx @@ -101,7 +101,8 @@ D2DWriteTextOutRenderer::MODE D2DWriteTextOutRenderer::GetMode(bool bRenderingMo { D2D1_TEXT_ANTIALIAS_MODE eTextMode; if (!Application::GetSettings().GetStyleSettings().GetUseFontAAFromSystem()) - eTextMode = bAntiAlias ? lclGetSystemTextAntiAliasType() : D2D1_TEXT_ANTIALIAS_MODE_ALIASED; + // Currently only for file output - see GraphicExporter::filter + eTextMode = bAntiAlias ? D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE : D2D1_TEXT_ANTIALIAS_MODE_ALIASED; else if (BOOL bSmoothing; SystemParametersInfoW(SPI_GETFONTSMOOTHING, 0, &bSmoothing, 0)) eTextMode = bSmoothing ? lclGetSystemTextAntiAliasType() : D2D1_TEXT_ANTIALIAS_MODE_ALIASED; else diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index ca222660e458..beb3834459ec 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -235,15 +235,6 @@ WinSalGraphicsImpl::~WinSalGraphicsImpl() } } -void WinSalGraphicsImpl::Init() -{ -} - -bool WinSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, sal_uInt32) -{ - return false; -} - void WinSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) { HDC hSrcDC; @@ -2711,19 +2702,9 @@ bool WinSalGraphicsImpl::implDrawGradient(basegfx::B2DPolyPolygon const & /*rPol return false; } -bool WinSalGraphicsImpl::supportsOperation(OutDevSupportType eType) const +bool WinSalGraphicsImpl::supportsOperation(OutDevSupportType /*eType*/) const { - bool bRet = false; - - switch (eType) - { - case OutDevSupportType::TransparentRect: - bRet = mrParent.mbVirDev || mrParent.mbWindow; - break; - default: - break; - } - return bRet; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx index 15f1a20b5881..da0aa7672b73 100644 --- a/vcl/win/gdi/gdiimpl.hxx +++ b/vcl/win/gdi/gdiimpl.hxx @@ -66,8 +66,6 @@ public: virtual ~WinSalGraphicsImpl() override; - virtual void Init() override; - virtual OUString getRenderBackendName() const override { return "gdi"; } virtual void setClipRegion( const vcl::Region& ) override; @@ -184,12 +182,6 @@ public: virtual void invert( sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags ) override; - virtual bool drawEPS( - tools::Long nX, tools::Long nY, - tools::Long nWidth, tools::Long nHeight, - void* pPtr, - sal_uInt32 nSize ) override; - virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override; diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx index 8da350105afd..1040810975c6 100644 --- a/vcl/win/gdi/salgdi.cxx +++ b/vcl/win/gdi/salgdi.cxx @@ -464,8 +464,6 @@ void WinSalGraphics::InitGraphics() ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP ); ::SetBkMode( getHDC(), TRANSPARENT ); ::SetROP2( getHDC(), R2_COPYPEN ); - - mpImpl->Init(); } void WinSalGraphics::DeInitGraphics() diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx index 53f835fbdd8a..02248127ed09 100644 --- a/vcl/win/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/gdi/salnativewidgets-luna.cxx @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -434,6 +435,211 @@ bool UseDarkMode() return bRet; } +static bool drawThemedControl(HDC hDC, ControlType nType, int iPart, int iState, RECT rc) +{ + if (nType == ControlType::Scrollbar) + { + if (iPart == SBP_ARROWBTN) + { + const Color& rBackColor = ThemeColors::GetThemeColors().GetWindowColor(); + const Color& rArrowFillColor = ThemeColors::GetThemeColors().GetBaseColor(); + + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(rBackColor.GetRed(), + rBackColor.GetGreen(), + rBackColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + + bool bDrawArrow = false; + POINT aArrowPoints[3]; + + if (iState == ABS_UPHOT || iState == ABS_UPPRESSED) + { + aArrowPoints[0] = { rc.left + (rc.right - rc.left) / 4, rc.bottom - (rc.bottom - rc.top) / 4 }; + aArrowPoints[1] = { rc.right - (rc.right - rc.left) / 4, rc.bottom - (rc.bottom - rc.top) / 4 }; + aArrowPoints[2] = { rc.left + (rc.right - rc.left) / 2, rc.top + (rc.bottom - rc.top) / 4 }; + bDrawArrow = true; + } + else if (iState == ABS_DOWNHOT || iState == ABS_DOWNPRESSED) + { + aArrowPoints[0] = { rc.left + (rc.right - rc.left) / 4, rc.top + (rc.bottom - rc.top) / 4 }; + aArrowPoints[1] = { rc.right - (rc.right - rc.left) / 4, rc.top + (rc.bottom - rc.top) / 4 }; + aArrowPoints[2] = { rc.left + (rc.right - rc.left) / 2, rc.bottom - (rc.bottom - rc.top) / 4 }; + bDrawArrow = true; + } + else if (iState == ABS_RIGHTHOT || iState == ABS_RIGHTPRESSED) + { + aArrowPoints[0] = { rc.left + (rc.right - rc.left) / 4, rc.top + (rc.bottom - rc.top) / 4 }; + aArrowPoints[1] = { rc.right - (rc.right - rc.left) / 4, rc.top + (rc.bottom - rc.top) / 2 }; + aArrowPoints[2] = { rc.left + (rc.right - rc.left) / 4, rc.bottom - (rc.bottom - rc.top) / 4 }; + bDrawArrow = true; + } + else if (iState == ABS_LEFTHOT || iState == ABS_LEFTPRESSED) + { + aArrowPoints[0] = { rc.right - (rc.right - rc.left) / 4, rc.top + (rc.bottom - rc.top) / 4 }; + aArrowPoints[1] = { rc.right - (rc.right - rc.left) / 4, rc.bottom - (rc.bottom - rc.top) / 4 }; + aArrowPoints[2] = { rc.left + (rc.right - rc.left) / 4, rc.top + (rc.bottom - rc.top) / 2 }; + bDrawArrow = true; + } + + if (bDrawArrow) + { + ScopedHPEN hpen(CreatePen(PS_SOLID, 1, RGB(0, 0, 0))); + ScopedHBRUSH hbrushArrow(CreateSolidBrush(RGB(rArrowFillColor.GetRed(), + rArrowFillColor.GetGreen(), + rArrowFillColor.GetBlue()))); + SelectObject(hDC, hpen.get()); + SelectObject(hDC, hbrushArrow.get()); + Polygon(hDC, aArrowPoints, ARRAYSIZE(aArrowPoints)); + } + return true; + } + else if (iPart == SBP_THUMBBTNHORZ || iPart == SBP_THUMBBTNVERT) + { + Color aScrollBarThumbColor = ThemeColors::GetThemeColors().GetBaseColor(); + const Color& rBackgroundColor = ThemeColors::GetThemeColors().GetWindowColor(); + + if (iState == SCRBS_PRESSED) + aScrollBarThumbColor.IncreaseLuminance(60); + else if (iState = SCRBS_HOT) + aScrollBarThumbColor.IncreaseLuminance(30); + + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(rBackgroundColor.GetRed(), + rBackgroundColor.GetGreen(), + rBackgroundColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + + RECT thumb = rc; + if (iPart == SBP_THUMBBTNHORZ) + { + thumb.top += 3; + thumb.bottom -= 3; + } + else + { + thumb.left += 3; + thumb.right -= 3; + } + + hbrush = ScopedHBRUSH(CreateSolidBrush(RGB(aScrollBarThumbColor.GetRed(), + aScrollBarThumbColor.GetGreen(), + aScrollBarThumbColor.GetBlue()))); + FillRect(hDC, &thumb, hbrush.get()); + return true; + } + else if (iPart == SBP_UPPERTRACKHORZ || iPart == SBP_LOWERTRACKHORZ + || iPart == SBP_UPPERTRACKVERT || iPart == SBP_LOWERTRACKVERT) + { + const Color& rWindowColor = ThemeColors::GetThemeColors().GetWindowColor(); + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(rWindowColor.GetRed(), + rWindowColor.GetGreen(), + rWindowColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + FrameRect(hDC, &rc, hbrush.get()); + return true; + } + } + else if (nType == ControlType::Pushbutton) + { + if (iPart == BP_PUSHBUTTON) + { + Color aButtonColor = ThemeColors::GetThemeColors().GetButtonColor(); + const Color& rButtonRectColor = ThemeColors::GetThemeColors().GetDisabledColor(); + + if (iState == PBS_PRESSED) + aButtonColor.Merge(rButtonRectColor, 230); + else if (iState == PBS_DISABLED) + aButtonColor = ThemeColors::GetThemeColors().GetDisabledColor(); + else if (iState == PBS_HOT) + aButtonColor.Merge(rButtonRectColor, 170); + else if (iState == PBS_DEFAULTED) + aButtonColor.Merge(rButtonRectColor, 150); + + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aButtonColor.GetRed(), + aButtonColor.GetGreen(), + aButtonColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + + hbrush = ScopedHBRUSH(CreateSolidBrush(RGB(rButtonRectColor.GetRed(), + rButtonRectColor.GetGreen(), + rButtonRectColor.GetBlue()))); + FrameRect(hDC, &rc, hbrush.get()); + return true; + } + } + else if (nType == ControlType::Editbox) + { + if (iPart == EP_EDITBORDER_NOSCROLL) + { + const Color& rColor = ThemeColors::GetThemeColors().GetSeparatorColor(); + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(rColor.GetRed(), + rColor.GetGreen(), + rColor.GetBlue()))); + FrameRect(hDC, &rc, hbrush.get()); + return true; + } + } + else if (nType == ControlType::Toolbar) + { + if (iPart == TP_BUTTON) + { + Color aButtonColor = ThemeColors::GetThemeColors().GetAccentColor(); + const Color& rWindowColor = ThemeColors::GetThemeColors().GetWindowColor(); + Color aFrameOutline = aButtonColor; + + if (iState == TS_PRESSED) + aButtonColor.Merge(rWindowColor, 100); + else if (iState == TS_HOTCHECKED || iState == TS_HOT) + aButtonColor.Merge(rWindowColor, 60); + else if (iState == TS_CHECKED || iState == TS_NORMAL) + aButtonColor.Merge(rWindowColor, 100); + + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aButtonColor.GetRed(), + aButtonColor.GetGreen(), + aButtonColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + + hbrush = ScopedHBRUSH(CreateSolidBrush(RGB(aFrameOutline.GetRed(), + aFrameOutline.GetGreen(), + aFrameOutline.GetBlue()))); + FrameRect(hDC, &rc, hbrush.get()); + return true; + } + } + else if (nType == ControlType::MenuPopup) + { + if (iPart == MENU_POPUPBACKGROUND) + { + Color aColor(ThemeColors::GetThemeColors().GetMenuColor()); + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aColor.GetRed(), + aColor.GetGreen(), + aColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + + aColor = ThemeColors::GetThemeColors().GetMenuBorderColor(); + hbrush = ScopedHBRUSH(CreateSolidBrush( RGB(aColor.GetRed(), + aColor.GetGreen(), + aColor.GetBlue()))); + FrameRect(hDC, &rc, hbrush.get()); + return true; + } + else if (iPart == MENU_POPUPITEM) + { + Color aBackgroundColor; + if (iState == MPI_HOT || iState == MPI_NORMAL) + aBackgroundColor = ThemeColors::GetThemeColors().GetMenuHighlightColor(); + else if (iState == MPI_DISABLEDHOT || MPI_DISABLED) + aBackgroundColor = ThemeColors::GetThemeColors().GetDisabledColor(); + + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aBackgroundColor.GetRed(), + aBackgroundColor.GetGreen(), + aBackgroundColor.GetBlue()))); + FillRect(hDC, &rc, hbrush.get()); + return true; + } + } + return false; +} + static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, ControlType nType, ControlPart nPart, @@ -457,6 +663,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( nPart == ControlPart::Entire ) nType = ControlType::Editbox; + bool bThemeLoaded = ThemeColors::IsThemeLoaded(); int iPart(0), iState(0); if( nType == ControlType::Scrollbar ) { @@ -472,6 +679,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, iState = ABS_UPHOT; else iState = ABS_UPNORMAL; + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + hr = DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, nullptr); return (hr == S_OK); } @@ -486,6 +697,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, iState = ABS_DOWNHOT; else iState = ABS_DOWNNORMAL; + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + hr = DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, nullptr); return (hr == S_OK); } @@ -500,6 +715,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, iState = ABS_LEFTHOT; else iState = ABS_LEFTNORMAL; + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + hr = DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, nullptr); return (hr == S_OK); } @@ -514,6 +733,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, iState = ABS_RIGHTHOT; else iState = ABS_RIGHTNORMAL; + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + hr = DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, nullptr); return (hr == S_OK); } @@ -534,6 +757,9 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, GetThemePartSize(hTheme, hDC, iPart, iState, nullptr, TS_TRUE, &sz); GetThemePartSize(hTheme, hDC, iPart, iState, nullptr, TS_DRAW, &sz); + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + hr = DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, nullptr); // paint gripper on thumb if enough space if( ( (nPart == ControlPart::ThumbVert) && (rc.bottom-rc.top > 12) ) || @@ -564,6 +790,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, iState = SCRBS_HOT; else iState = SCRBS_NORMAL; + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + hr = DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, nullptr); return (hr == S_OK); } @@ -692,6 +922,9 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, else iState = PBS_NORMAL; + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption); } @@ -755,6 +988,9 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, else iState = EPSN_NORMAL; + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption); } @@ -786,7 +1022,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, { // tabpane in tabcontrols gets drawn in "darkmode" as if it was a // a "light" theme, so bodge this by drawing a frame directly - if (bUseDarkMode) + if (bThemeLoaded || bUseDarkMode) { Color aColor(Application::GetSettings().GetStyleSettings().GetDisableColor()); ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aColor.GetRed(), @@ -802,7 +1038,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( nType == ControlType::TabBody ) { // tabbody in main window gets drawn in white in "darkmode", so bodge this here - if (bUseDarkMode) + if (bThemeLoaded || bUseDarkMode) { Color aColor(Application::GetSettings().GetStyleSettings().GetWindowColor()); ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aColor.GetRed(), @@ -862,7 +1098,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, // tabitem in tabcontrols gets drawn in "darkmode" as if it was a // a "light" theme, so bodge this by drawing with a button instead - if (bUseDarkMode) + if (bThemeLoaded || bUseDarkMode) { Color aColor; if (iState == TILES_SELECTED) @@ -912,6 +1148,9 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, else iState = bChecked ? TS_CHECKED : TS_NORMAL; + if (bThemeLoaded) + return drawThemedControl(hDC, nType, iPart, iState, rc); + if (bUseDarkMode && (bChecked || (nState & (ControlState::PRESSED) || (nState & ControlState::ROLLOVER)))) { const WinOSVersionInfo aVersion = WinSalInstance::getWinOSVersionInfo(); @@ -954,7 +1193,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, } // toolbar in main window gets drawn in white in "darkmode", so bodge this here - if (bUseDarkMode) + if (bThemeLoaded || bUseDarkMode) { Color aColor(Application::GetSettings().GetStyleSettings().GetWindowColor()); ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aColor.GetRed(), @@ -986,9 +1225,12 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, rc.bottom += pValue->maTopDockingAreaHeight; // extend potential gradient to cover docking area as well // menubar in main window gets drawn in white in "darkmode", so bodge this here - if (bUseDarkMode) + if (bThemeLoaded || bUseDarkMode) { - Color aColor(Application::GetSettings().GetStyleSettings().GetWindowColor()); + Color aColor + = bThemeLoaded + ? ThemeColors::GetThemeColors().GetMenuBarColor() + : Application::GetSettings().GetStyleSettings().GetWindowColor(); ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue()))); @@ -1017,13 +1259,18 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, else iState = MBI_NORMAL; - if(GetSalData()->mbThemeMenuSupport && Application::GetSettings().GetStyleSettings().GetHighContrastMode() - && ( nState & (ControlState::SELECTED | nState & ControlState::ROLLOVER ))) + if (bThemeLoaded + || (GetSalData()->mbThemeMenuSupport + && Application::GetSettings().GetStyleSettings().GetHighContrastMode() + && (nState & (ControlState::SELECTED | nState & ControlState::ROLLOVER)))) { - Color aColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()); + Color aColor = bThemeLoaded + ? ThemeColors::GetThemeColors().GetMenuBarHighlightColor() + : Application::GetSettings().GetStyleSettings().GetHighlightColor(); + ScopedHBRUSH hbrush(CreateSolidBrush(RGB(aColor.GetRed(), - aColor.GetGreen(), - aColor.GetBlue()))); + aColor.GetGreen(), + aColor.GetBlue()))); FillRect(hDC, &rc, hbrush.get()); return true; } @@ -1161,6 +1408,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, aGutterRC.left += aValue.getNumericVal(); aGutterRC.right = aGutterRC.left+3; } + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, MENU_POPUPBACKGROUND, iState, rc); + return ImplDrawTheme( hTheme, hDC, MENU_POPUPBACKGROUND, 0, rc, aCaption ) && ImplDrawTheme( hTheme, hDC, MENU_POPUPGUTTER, 0, aGutterRC, aCaption ) @@ -1172,6 +1423,10 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, iState = (nState & ControlState::SELECTED) ? MPI_HOT : MPI_NORMAL; else iState = (nState & ControlState::SELECTED) ? MPI_DISABLEDHOT : MPI_DISABLED; + + if (bThemeLoaded) + return drawThemedControl(hDC, nType, MENU_POPUPITEM, iState, rc); + return ImplDrawTheme( hTheme, hDC, MENU_POPUPITEM, iState, rc, aCaption ); } else if( nPart == ControlPart::MenuItemCheckMark || nPart == ControlPart::MenuItemRadioMark ) @@ -1642,11 +1897,17 @@ void WinSalGraphics::updateSettingsNative( AllSettings& rSettings ) Color aMenuBarTextColor = aStyleSettings.GetPersonaMenuBarTextColor().value_or( aStyleSettings.GetMenuTextColor() ); // in aero menuitem highlight text is drawn in the same color as normal // high contrast highlight color is not related to persona and not apply blur or transparency - if( !aStyleSettings.GetHighContrastMode() ) + bool bThemeLoaded = ThemeColors::IsThemeLoaded(); + if( bThemeLoaded || !aStyleSettings.GetHighContrastMode() ) { - aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetMenuTextColor() ); - aStyleSettings.SetMenuBarRolloverTextColor( aMenuBarTextColor ); - aStyleSettings.SetMenuBarHighlightTextColor( aMenuBarTextColor ); + const ThemeColors& rThemeColors = ThemeColors::GetThemeColors(); + aStyleSettings.SetMenuHighlightTextColor(bThemeLoaded + ? rThemeColors.GetMenuHighlightTextColor() + : aStyleSettings.GetMenuTextColor()); + aStyleSettings.SetMenuBarRolloverTextColor( + bThemeLoaded ? rThemeColors.GetMenuBarHighlightTextColor() : aMenuBarTextColor); + aStyleSettings.SetMenuBarHighlightTextColor( + bThemeLoaded ? rThemeColors.GetMenuBarHighlightTextColor() : aMenuBarTextColor); } pSVData->maNWFData.mnMenuFormatBorderX = 2; diff --git a/vcl/win/gdi/salvd.cxx b/vcl/win/gdi/salvd.cxx index 7b3e7e11fc5c..2f6d3456a748 100644 --- a/vcl/win/gdi/salvd.cxx +++ b/vcl/win/gdi/salvd.cxx @@ -214,9 +214,6 @@ bool WinSalVirtualDevice::SetSize( tools::Long nDX, tools::Long nDY ) SelectBitmap(getHDC(), hNewBmp); mhBmp.reset(hNewBmp); - if (mpGraphics) - mpGraphics->GetImpl()->Init(); - return true; } diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 09018fdf8c6b..751e85012bff 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -2610,6 +2612,72 @@ static tools::Long ImplW2I( const wchar_t* pStr ) return n; } +static void lcl_LoadColorsFromTheme(StyleSettings& rStyleSet) +{ + const ThemeColors& rThemeColors = ThemeColors::GetThemeColors(); + + rStyleSet.SetWindowColor(rThemeColors.GetWindowColor()); + rStyleSet.BatchSetBackgrounds(rThemeColors.GetWindowColor()); + + rStyleSet.SetActiveTabColor(rThemeColors.GetWindowColor()); + rStyleSet.SetInactiveTabColor(rThemeColors.GetBaseColor()); + rStyleSet.SetDisableColor(rThemeColors.GetDisabledColor()); // tab outline + + // Highlight related colors + rStyleSet.SetAccentColor(rThemeColors.GetAccentColor()); + rStyleSet.SetHighlightColor(rThemeColors.GetAccentColor()); + + rStyleSet.SetListBoxWindowHighlightColor(rThemeColors.GetAccentColor()); + rStyleSet.SetListBoxWindowTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetListBoxWindowBackgroundColor(rThemeColors.GetBaseColor()); + rStyleSet.SetListBoxWindowHighlightTextColor(rThemeColors.GetMenuHighlightTextColor()); + rStyleSet.SetWindowTextColor(rThemeColors.GetWindowTextColor()); // Treeview Lists + + rStyleSet.SetRadioCheckTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetLabelTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetFieldTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetTabTextColor(rThemeColors.GetWindowTextColor()); + rStyleSet.SetFieldColor(rThemeColors.GetBaseColor()); + rStyleSet.SetMenuBarTextColor(rThemeColors.GetMenuBarTextColor()); + rStyleSet.SetMenuTextColor(rThemeColors.GetMenuTextColor()); + + rStyleSet.SetDefaultActionButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetActionButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetShadowColor(rThemeColors.GetShadeColor()); + + rStyleSet.SetDefaultButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + + rStyleSet.SetFlatButtonTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFlatButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFlatButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + + rStyleSet.SetButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultActionButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetDefaultActionButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetActionButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetActionButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetFieldRolloverTextColor(rThemeColors.GetButtonTextColor()); + + rStyleSet.SetButtonRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetButtonPressedRolloverTextColor(rThemeColors.GetButtonTextColor()); + rStyleSet.SetHelpColor(rThemeColors.GetWindowColor()); + rStyleSet.SetHelpTextColor(rThemeColors.GetWindowTextColor()); + + // rStyleSet.SetHighlightTextColor(aThemeColors.GetActiveTextColor()); + // rStyleSet.SetActiveColor(aThemeColors.GetActiveColor()); + rStyleSet.SetActiveTextColor(rThemeColors.GetWindowTextColor()); + + // rStyleSet.SetLinkColor(aThemeColors.GetAccentColor()); + // Color aVisitedLinkColor = aThemeColors.GetActiveColor(); + // aVisitedLinkColor.Merge(aThemeColors.GetWindowColor(), 100); + // rStyleSet.SetVisitedLinkColor(aVisitedLinkColor); + // rStyleSet.SetToolTextColor(Color(255, 0, 0)); + + rStyleSet.SetTabRolloverTextColor(rThemeColors.GetMenuBarHighlightTextColor()); +} + void WinSalFrame::UpdateSettings( AllSettings& rSettings ) { MouseSettings aMouseSettings = rSettings.GetMouseSettings(); @@ -2690,9 +2758,16 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) } const bool bUseDarkMode(UseDarkMode()); - - OUString sThemeName(!bUseDarkMode ? u"colibre" : u"colibre_dark"); - aStyleSettings.SetPreferredIconTheme(sThemeName, bUseDarkMode); + if (!ThemeColors::IsThemeLoaded()) + { + OUString sThemeName(!bUseDarkMode ? u"colibre" : u"colibre_dark"); + aStyleSettings.SetPreferredIconTheme(sThemeName, bUseDarkMode); + } + else + { + aStyleSettings.SetPreferredIconTheme(vcl::IconThemeSelector::GetIconThemeForDesktopEnvironment( + Application::GetDesktopEnvironment(), ThemeColors::GetThemeColors().GetWindowColor().IsDark())); + } if (bUseDarkMode) { @@ -2930,6 +3005,11 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) } } + // otherwise, menu shows up as white in dark mode + aStyleSettings.SetMenuColor(aStyleSettings.GetWindowColor()); + if (ThemeColors::IsThemeLoaded()) + lcl_LoadColorsFromTheme(aStyleSettings); + rSettings.SetMouseSettings( aMouseSettings ); rSettings.SetStyleSettings( aStyleSettings ); @@ -5612,6 +5692,13 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) static bool ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) { + static const bool disable = [] + { + const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED"); + return pEnv && pEnv[0] == '0'; + }(); + if (disable) + return false; uno::Reference xMSAA; if (ImplSalYieldMutexTryToAcquire()) { diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx index 8f47e328ff44..dd48cb11ff63 100644 --- a/xmloff/inc/xmlprop.hxx +++ b/xmloff/inc/xmlprop.hxx @@ -595,6 +595,7 @@ inline constexpr OUString PROP_Speed = u"Speed"_ustr; inline constexpr OUString PROP_SplineOrder = u"SplineOrder"_ustr; inline constexpr OUString PROP_SplineResolution = u"SplineResolution"_ustr; inline constexpr OUString PROP_SplineType = u"SplineType"_ustr; +inline constexpr OUString PROP_SplitPos = u"SplitPos"_ustr; inline constexpr OUString PROP_Stacked = u"Stacked"_ustr; inline constexpr OUString PROP_StackedBarsConnected = u"StackedBarsConnected"_ustr; inline constexpr OUString PROP_StackedText = u"StackedText"_ustr; diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index c79071dac166..fbf06985cc93 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -232,7 +232,8 @@ SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper, mbRowHasLabels( false ), meDataRowSource( chart::ChartDataRowSource_COLUMNS ), mbIsStockChart( false ), - mPieSubType(css::chart2::PieChartSubType_NONE) + mPieSubType(css::chart2::PieChartSubType_NONE), + mfPieSplitPos(2.0) { } @@ -400,6 +401,9 @@ void SchXMLChartContext::startFastElement( sal_Int32 /*nElement*/, mPieSubType = css::chart2::PieChartSubType_PIE; } break; + case XML_ELEMENT(LO_EXT, XML_SPLIT_POSITION): + mfPieSplitPos = aIter.toDouble(); + break; default: XMLOFF_WARN_UNKNOWN("xmloff", aIter); } @@ -748,12 +752,13 @@ void SchXMLChartContext::endFastElement(sal_Int32 ) // cleanup: remove empty chart type groups lcl_removeEmptyChartTypeGroups( xNewDoc ); - // Handle sub-pie type. Is this the right place to do this? + // Handle of-pie parameters. Is this the right place to do this? if (maChartTypeServiceName == "com.sun.star.chart2.PieChartType") { Reference< chart2::XDiagram> xDia(xNewDoc->getFirstDiagram()); uno::Reference< beans::XPropertySet > xDiaProp( xDia, uno::UNO_QUERY ); if( xDiaProp.is()) { xDiaProp->setPropertyValue(u"SubPieType"_ustr, uno::Any(mPieSubType)); + xDiaProp->setPropertyValue(u"SplitPos"_ustr, uno::Any(mfPieSplitPos)); } } diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index b7f94fa6c986..563ae2ebe8e1 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -101,6 +101,7 @@ private: css::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; css::chart2::PieChartSubType mPieSubType; + double mfPieSplitPos; OUString msCategoriesAddress; OUString msChartAddress; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index a1fac7424cf2..91b203bc2d42 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -114,7 +114,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::std::vector; - namespace { /** @@ -1287,15 +1286,53 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument > XML_NAMESPACE_CHART, GetXMLToken(eXMLChartType )) ); } + bool bIsOfPie = false; // Handle subtype for of-pie charts if (sChartType == u"com.sun.star.chart.BarOfPieDiagram") { mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_SUB_BAR, OUString::boolean(true)); + bIsOfPie = true; } else if (sChartType == u"com.sun.star.chart.PieOfPieDiagram") { mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_SUB_PIE, OUString::boolean(true)); + bIsOfPie = true; } + if (bIsOfPie) { + + // Find the split position. We have to dig deep into the + // structure tree to get it, which is awkward. Part of the + // problem is that the split position is sort of a series-level + // parameter, but is generally handled at the chart level since + // of-pie charts have only a single series. + double fSplitPos = 2.0; + + Reference< chart2::XCoordinateSystemContainer > xBCooSysCnt( xNewDiagram, uno::UNO_QUERY ); + if (xBCooSysCnt.is()) { + const Sequence< Reference< chart2::XCoordinateSystem > > + aCooSysSeq( xBCooSysCnt->getCoordinateSystems()); + for (const auto& rCooSys : aCooSysSeq ) { + Reference< chart2::XChartTypeContainer > xCTCnt( rCooSys, uno::UNO_QUERY ); + if( ! xCTCnt.is()) + continue; + const Sequence< Reference< chart2::XChartType > > aCTSeq( xCTCnt->getChartTypes()); + for (const auto& rChartType : aCTSeq ) { + Reference< beans::XPropertySet > xCTProp( rChartType, uno::UNO_QUERY ); + + if (xCTProp.is()) { + xCTProp->getPropertyValue(u"SplitPos"_ustr) >>= fSplitPos; + } + } + } + } + + // Insert split position for of-pie chart + mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_SPLIT_POSITION, + OUString::number(fSplitPos)); + } + + // The attribute table:cell-range-address was removed from the standard in ODF 1.4. + // The associated attributes chart:column-mapping and chart:row-mapping are deprecated. //column-mapping or row-mapping - if( maSequenceMapping.hasElements() ) + if( maSequenceMapping.hasElements() && nCurrentODFVersion < SvtSaveOptions::ODFSVER_014) { enum XMLTokenEnum eTransToken = ::xmloff::token::XML_ROW_MAPPING; if( mbRowSourceColumns ) @@ -1946,7 +1983,10 @@ void SchXMLExportHelper_Impl::exportPlotArea( // write style name AddAutoStyleAttribute( aPropertyStates ); - if( !msChartAddress.isEmpty() ) + // The attribute table:cell-range-address was removed from the standard in ODF 1.4. + // The associated attribute chart:data-source-has-labels is deprecated. + const SvtSaveOptions::ODFSaneDefaultVersion nCurrentODFVersion(mrExport.getSaneDefaultVersion()); + if( !msChartAddress.isEmpty() && nCurrentODFVersion < SvtSaveOptions::ODFSVER_014) { if( !bIncludeTable ) mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, msChartAddress ); @@ -3152,53 +3192,44 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( } } - if( !aPropertyStates.empty() || bExportEquation ) + // write element + if( bExportContent ) { - // write element - if( bExportContent ) + // add style name attribute + AddAutoStyleAttribute( aPropertyStates ); + + SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, true, true ); + if( bExportEquation ) { - // add style name attribute - if( !aPropertyStates.empty()) + mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, (bShowEquation ? XML_TRUE : XML_FALSE) ); + mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, (bShowRSquared ? XML_TRUE : XML_FALSE) ); + + // export position + chart2::RelativePosition aRelativePosition; + if( xEquationProperties->getPropertyValue( u"RelativePosition"_ustr ) >>= aRelativePosition ) { - AddAutoStyleAttribute( aPropertyStates ); + double fX = aRelativePosition.Primary * rPageSize.Width; + double fY = aRelativePosition.Secondary * rPageSize.Height; + awt::Point aPos; + aPos.X = static_cast< sal_Int32 >( ::rtl::math::round( fX )); + aPos.Y = static_cast< sal_Int32 >( ::rtl::math::round( fY )); + addPosition( aPos ); } - SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, true, true ); - if( bExportEquation ) + if( !aEquationPropertyStates.empty()) { - mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, (bShowEquation ? XML_TRUE : XML_FALSE) ); - mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, (bShowRSquared ? XML_TRUE : XML_FALSE) ); - - // export position - chart2::RelativePosition aRelativePosition; - if( xEquationProperties->getPropertyValue( u"RelativePosition"_ustr ) >>= aRelativePosition ) - { - double fX = aRelativePosition.Primary * rPageSize.Width; - double fY = aRelativePosition.Secondary * rPageSize.Height; - awt::Point aPos; - aPos.X = static_cast< sal_Int32 >( ::rtl::math::round( fX )); - aPos.Y = static_cast< sal_Int32 >( ::rtl::math::round( fY )); - addPosition( aPos ); - } - - if( !aEquationPropertyStates.empty()) - { - AddAutoStyleAttribute( aEquationPropertyStates ); - } - - SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_EQUATION, true, true ); + AddAutoStyleAttribute( aEquationPropertyStates ); } + + SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_EQUATION, true, true ); } - else // autostyles + } + else // autostyles + { + CollectAutoStyle( std::move(aPropertyStates) ); + if( bExportEquation && !aEquationPropertyStates.empty()) { - if( !aPropertyStates.empty()) - { - CollectAutoStyle( std::move(aPropertyStates) ); - } - if( bExportEquation && !aEquationPropertyStates.empty()) - { - CollectAutoStyle( std::move(aEquationPropertyStates) ); - } + CollectAutoStyle( std::move(aEquationPropertyStates) ); } } } diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index c585946e217a..c3d8608a9c52 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -104,50 +104,13 @@ void SchXMLParagraphContext::characters( const OUString& rChars ) SchXMLTitleParaContext::SchXMLTitleParaContext( SvXMLImport& rImport, std::vector>& rParaText) : SvXMLImportContext( rImport ), - mrParaText( rParaText ), - mpId( nullptr ) + mrParaText( rParaText ) { } SchXMLTitleParaContext::~SchXMLTitleParaContext() {} -void SchXMLTitleParaContext::startFastElement( - sal_Int32 /*nElement*/, - const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) -{ - // remember the id. It is used for storing the original cell range string in - // a local table (cached data) - if( !mpId ) - return; - - bool bHaveXmlId( false ); - - for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) ) - { - switch(aIter.getToken()) - { - case XML_ELEMENT(TEXT, XML_STYLE_NAME): - maStyleName = aIter.toString(); - break; - case XML_ELEMENT(XML, XML_ID): - (*mpId) = aIter.toString(); - bHaveXmlId = true; - break; - case XML_ELEMENT(TEXT, XML_ID): - { // text:id shall be ignored if xml:id exists - if (!bHaveXmlId) - { - (*mpId) = aIter.toString(); - } - break; - } - default: - XMLOFF_WARN_UNKNOWN("xmloff", aIter); - } - } -} - void SchXMLTitleParaContext::endFastElement(sal_Int32 ) { if (!maBuffer.isEmpty()) diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index 4f344e5793f8..f0e06893b8ce 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -54,7 +54,6 @@ class SchXMLTitleParaContext : public SvXMLImportContext { private: std::vector>& mrParaText; - OUString* mpId; OUStringBuffer maBuffer; OUString maStyleName; @@ -63,9 +62,6 @@ public: std::vector>& rParaText); virtual ~SchXMLTitleParaContext() override; - virtual void SAL_CALL startFastElement( - sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual void SAL_CALL characters( const OUString& rChars ) override; diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index a73147ec09f1..fc9605bd8651 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -19,6 +19,7 @@ #include "XMLFootnoteImportContext.hxx" +#include #include #include #include @@ -102,7 +103,16 @@ void XMLFootnoteImportContext::startFastElement( // save old cursor and install new one xOldCursor = rHelper.GetCursor(); Reference xText(xTextContent, UNO_QUERY); - rHelper.SetCursor(xText->createTextCursor()); + try + { + // May fail e.g. for a nested footnote, which is formally a valid ODF, but is not supported + rHelper.SetCursor(xText->createTextCursor()); + } + catch (css::uno::RuntimeException&) + { + TOOLS_WARN_EXCEPTION("xmloff.text", "skipping the footnote: caught"); + mbIsValid = false; + } // remember old list item and block (#89891#) and reset them // for the footnote @@ -132,6 +142,8 @@ void XMLFootnoteImportContext::endFastElement(sal_Int32 ) css::uno::Reference< css::xml::sax::XFastContextHandler > XMLFootnoteImportContext::createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) { + if (!mbIsValid) + return {}; SvXMLImportContextRef xContext; switch(nElement) diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index d05b7b631c22..8321639bbd1a 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -42,6 +42,7 @@ class XMLFootnoteImportContext : public SvXMLImportContext /// old list item and block (#89891#) bool mbListContextPushed; + bool mbIsValid = true; /// text import helper; holds current XTextCursor (and XText) XMLTextImportHelper& rHelper; diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index e3908fc5ee76..ca4446bdf740 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -371,7 +371,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream( sal_Int64 nSize = 0; uno::Reference xPropertySet(xInputStream, uno::UNO_QUERY); xPropertySet->getPropertyValue(u"Size"_ustr) >>= nSize; - if (nSize >= 0 || nSize < SAL_MAX_INT32) + if (nSize >= 0 && nSize < SAL_MAX_INT32) { uno::Sequence aData; xInputStream->readBytes(aData, nSize);