[Libreoffice-commits] core.git: 19 commits - include/vcl README.md sfx2/source sw/inc sw/Library_sw.mk sw/source vcl/generic vcl/inc vcl/source vcl/win
Michael Stahl
mstahl at redhat.com
Tue Mar 31 11:24:21 PDT 2015
README.md | 22 +-
include/vcl/outdev.hxx | 20 +-
sfx2/source/appl/appbaslib.cxx | 14 +
sfx2/source/inc/appbaslib.hxx | 4
sw/Library_sw.mk | 1
sw/inc/docsh.hxx | 47 ++---
sw/inc/drawdoc.hxx | 8
sw/inc/editsh.hxx | 8
sw/inc/fesh.hxx | 11 -
sw/inc/pagedesc.hxx | 197 ++++++++++++------------
sw/inc/swcli.hxx | 8
sw/inc/wdocsh.hxx | 9 -
sw/source/core/bastyp/init.cxx | 2
sw/source/core/doc/docdesc.cxx | 19 +-
sw/source/core/draw/drawdoc.cxx | 23 +-
sw/source/core/edit/autofmt.cxx | 8
sw/source/core/edit/edws.cxx | 12 -
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/frmedt/feshview.cxx | 29 +--
sw/source/core/frmedt/fews.cxx | 10 -
sw/source/core/inc/drawfont.hxx | 16 +
sw/source/core/layout/pagedesc.cxx | 231 ++++++++++++++--------------
sw/source/core/text/guess.cxx | 7
sw/source/core/text/inftxt.cxx | 35 +++-
sw/source/core/text/inftxt.hxx | 25 ++-
sw/source/core/text/porfld.cxx | 4
sw/source/core/text/pormulti.cxx | 3
sw/source/core/txtnode/fntcache.cxx | 7
sw/source/core/undo/SwUndoPageDesc.cxx | 18 +-
sw/source/uibase/app/docsh.cxx | 268 ++++++++++++++++-----------------
sw/source/uibase/app/docsh2.cxx | 149 +++++++++---------
sw/source/uibase/app/docshini.cxx | 237 ++++++++++++++---------------
sw/source/uibase/app/docst.cxx | 94 +++++------
sw/source/uibase/uiview/swcli.cxx | 9 -
sw/source/uibase/uno/unotxdoc.cxx | 19 --
sw/source/uibase/web/wdocsh.cxx | 6
sw/source/uibase/wrtsh/docsh.cxx | 19 --
vcl/generic/glyphs/gcach_layout.cxx | 64 ++++++-
vcl/inc/generic/glyphcache.hxx | 3
vcl/inc/sallayout.hxx | 12 +
vcl/source/gdi/sallayout.cxx | 10 +
vcl/source/outdev/text.cxx | 53 +++++-
vcl/win/source/gdi/winlayout.cxx | 4
43 files changed, 964 insertions(+), 783 deletions(-)
New commits:
commit fae6699c2ec8d68766bb8d5f71483d4b65792327
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 19:01:25 2015 +0200
sfx2: fix VBA crash when disposing SfxBaseModel
Crash on WNT in CppunitTest_sw_globalfilter testSkipImages()
SfxBaseModel::dispose() calls some event listener that deletes the
BasicManager instance; unfortunately SfxObjectShell_Impl has a
SfxBasicHolder member that still refers to the deleted BasicManager
and then something calls vba::getVBAServiceFactory()...
Try to fix that by clearing the SfxBasicHolder member via SfxListener.
Change-Id: I65f2ec8e9eb598be218136c06ed8de35a464a971
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 980f2db..e220917 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -43,6 +43,19 @@ SfxBasicManagerHolder::SfxBasicManagerHolder()
{
}
+void SfxBasicManagerHolder::Notify(SfxBroadcaster& rBC, SfxHint const& rHint)
+{
+ if (!mpBasicManager || &rBC != mpBasicManager)
+ return;
+ SfxSimpleHint const*const pSimpleHint(dynamic_cast<SfxSimpleHint const*>(&rHint));
+ if (pSimpleHint && SFX_HINT_DYING == pSimpleHint->GetId())
+ {
+ mpBasicManager = nullptr;
+ mxBasicContainer.clear();
+ mxDialogContainer.clear();
+ }
+}
+
void SfxBasicManagerHolder::reset( BasicManager* _pBasicManager )
{
impl_releaseContainers();
@@ -59,6 +72,7 @@ void SfxBasicManagerHolder::reset( BasicManager* _pBasicManager )
if ( mpBasicManager )
{
+ StartListening(*mpBasicManager);
try
{
mxBasicContainer.set( mpBasicManager->GetScriptLibraryContainer(), UNO_QUERY_THROW );
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index 5810afd..8e0d5f8 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
#define INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
+#include <svl/lstner.hxx>
+
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
#include <com/sun/star/embed/XStorage.hpp>
@@ -29,6 +31,7 @@ class BasicManager;
/** helper class which holds and manipulates a BasicManager
*/
class SfxBasicManagerHolder
+ : public SfxListener
{
private:
BasicManager* mpBasicManager;
@@ -84,6 +87,7 @@ public:
*/
bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules );
+ virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) SAL_OVERRIDE;
private:
void impl_releaseContainers();
commit d360477d8740f29e2c2bc5f7bbd667df7cd26ee9
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 15:35:36 2015 +0200
sw: fix obscure crash in SwXTextDocument::getSomething()
xNumFmtAgg may be null if you directly call global ServiceManager's
createInstanceWithContext("com.sun.star.text.TextDocument")
Change-Id: Id619a3f5c9e3f8281f9ef72db132c64287e027c4
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 02c603c..f580db2 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -266,19 +266,16 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
}
sal_Int64 nRet = SfxBaseModel::getSomething( rId );
- if ( nRet )
+ if (nRet)
return nRet;
- else
- {
- GetNumberFormatter();
- Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
- Reference<XUnoTunnel> xNumTunnel;
- aNumTunnel >>= xNumTunnel;
- if(xNumTunnel.is())
- return xNumTunnel->getSomething(rId);
- }
- return SfxBaseModel::getSomething( rId );
+ GetNumberFormatter();
+ if (!xNumFmtAgg.is()) // may happen if not valid or no SwDoc
+ return 0;
+ Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
+ Reference<XUnoTunnel> xNumTunnel;
+ aNumTunnel >>= xNumTunnel;
+ return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0;
}
Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException, std::exception)
commit deec9bd9b0ce663d1100cdef402a9d4d18e1cc72
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 14:55:56 2015 +0200
README.md: framework is not a wrapper around sfx2
Change-Id: I1af3c4bdabe4dd9578ddf04c621358b08f6866ae
diff --git a/README.md b/README.md
index e362798..501c4a0 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,11 @@ A quick overview of the LibreOffice code structure.
You can develop for LibreOffice in one of two ways, one
recommended and one much less so. First the somewhat less recommended
-way: it is possible to use the SDK, for which you can read the API
-docs [here](http://api.libreoffice.org/). This re-uses the (extremely
-generic) APIs we provide for macro scripting in StarBasic.
+way: it is possible to use the SDK to develop an extension,
+for which you can read the API docs [here](http://api.libreoffice.org/)
+and [here](http://wiki.services.openoffice.org/wiki/Documentation/DevGuide).
+This re-uses the (extremely generic) UNO APIs that are also used by
+macro scripting in StarBasic.
The best way to add a generally useful feature to LibreOffice
is to work on the code base however. Overall this way makes it easier
@@ -33,18 +35,18 @@ Module | Description
sal/ | this provides a simple System Abstraction Layer
tools/ | this provides basic internal types: 'Rectangle', 'Color' etc.
vcl/ | this is the widget toolkit library and one rendering abstraction
-svx/ | graphics related helper code, including much of 'draw' / 'impress'
-sfx2/ | core framework: document model / load/save / signals for actions etc.
-framework | UNO wrappers around the core framework, responsible for building toolbars, menus, status bars, and the chrome around the document using widgets from VCL, and XML descriptions from */uiconfig/ files
+framework | UNO framework, responsible for building toolbars, menus, status bars, and the chrome around the document using widgets from VCL, and XML descriptions from */uiconfig/* files
+sfx2/ | legacy core framework used by Writer/Calc/Draw: document model / load/save / signals for actions etc.
+svx/ | drawing model related helper code, including much of Draw/Impress
Then applications
Module | Description
----------|-------------------------------------------------
desktop/ | this is where the 'main' for the application lives, init / bootstrap. the name dates back to an ancient StarOffice that also drew a desktop
-sw/ | writer.
-sc/ | calc
-sd/ | draw / impress
+sw/ | Writer
+sc/ | Calc
+sd/ | Draw / Impress
There are several other libraries that are helpful from a graphical perspective:
@@ -54,7 +56,7 @@ basebmp/ | enables a VCL compatible rendering API to render to bitmaps, as used
basegfx/ | algorithms and data-types for graphics as used in the canvas
canvas/ | new (UNO) canvas rendering model with various backends
cppcanvas/ | C++ helper classes for using the UNO canvas
-drawinglayer/ | code to render and manage document drawing shapes and break them down into primitives we can render more easily.
+drawinglayer/ | View code to render drawable objects and break them down into primitives we can render more easily.
## Finding out more
commit aec3466c3e3d257a8e6d4af81b634a6addbc87bd
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 14:25:58 2015 +0200
sw: remove pointless wrtsh/docsh.cxx file
SwDocShell already has 4 or 5 other cxx files.
Change-Id: I591d6e5d7ebf5727b4a760add2eeea04c3ca5abe
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d27dbf6..ceaf6eb 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -747,7 +747,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/web/wtextsh \
sw/source/uibase/web/wview \
sw/source/uibase/wrtsh/delete \
- sw/source/uibase/wrtsh/docsh \
sw/source/uibase/wrtsh/move \
sw/source/uibase/wrtsh/navmgr \
sw/source/uibase/wrtsh/select \
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 0150587..75f8fcb 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1112,6 +1112,11 @@ void SwDocShell::CancelTransfers()
SfxObjectShell::CancelTransfers();
}
+SwEditShell * SwDocShell::GetEditShell()
+{
+ return m_pWrtShell;
+}
+
SwFEShell* SwDocShell::GetFEShell()
{
return m_pWrtShell;
diff --git a/sw/source/uibase/wrtsh/docsh.cxx b/sw/source/uibase/wrtsh/docsh.cxx
deleted file mode 100644
index f5e871c..0000000
--- a/sw/source/uibase/wrtsh/docsh.cxx
+++ /dev/null
@@ -1,19 +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/.
- */
-
-#include <sal/config.h>
-
-#include <docsh.hxx>
-#include <wrtsh.hxx>
-
-SwEditShell * SwDocShell::GetEditShell() {
- return m_pWrtShell;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5db69fcd9d236756c6588cb327510679cd41e9bf
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 14:22:00 2015 +0200
sw: prefix members of SwOleClient
Change-Id: I60fe718c489fc47d667534560241a8b3eb5f20a6
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index a8eb9f9..90b384e 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -29,8 +29,8 @@ class SwEditWin;
class SwOleClient : public SfxInPlaceClient
{
- bool bInDoVerb;
- bool bOldCheckForOLEInCaption;
+ bool m_IsInDoVerb;
+ bool m_IsOldCheckForOLEInCaption;
virtual void ObjectAreaChanged() SAL_OVERRIDE;
virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE;
@@ -40,9 +40,9 @@ class SwOleClient : public SfxInPlaceClient
public:
SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& );
- void SetInDoVerb( bool bFlag ) { bInDoVerb = bFlag; }
+ void SetInDoVerb(bool const bFlag) { m_IsInDoVerb = bFlag; }
- bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; }
+ bool IsCheckForOLEInCaption() const { return m_IsOldCheckForOLEInCaption; }
virtual void FormatChanged() SAL_OVERRIDE;
};
diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx
index f47b011..5ce19ed 100644
--- a/sw/source/uibase/uiview/swcli.cxx
+++ b/sw/source/uibase/uiview/swcli.cxx
@@ -32,9 +32,10 @@
using namespace com::sun::star;
-SwOleClient::SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& xObj ) :
- SfxInPlaceClient( pView, pWin, xObj.GetViewAspect() ), bInDoVerb( false ),
- bOldCheckForOLEInCaption( pView->GetWrtShell().IsCheckForOLEInCaption() )
+SwOleClient::SwOleClient(SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& xObj)
+ : SfxInPlaceClient( pView, pWin, xObj.GetViewAspect() )
+ , m_IsInDoVerb(false)
+ , m_IsOldCheckForOLEInCaption(pView->GetWrtShell().IsCheckForOLEInCaption())
{
SetObject( xObj.GetObject() );
}
@@ -93,7 +94,7 @@ void SwOleClient::ObjectAreaChanged()
void SwOleClient::ViewChanged()
{
- if ( bInDoVerb )
+ if (m_IsInDoVerb)
return;
if ( GetAspect() == embed::Aspects::MSOLE_ICON )
commit 41b72adab4da7ad793e60a6959e48a8dd42dbde4
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 14:05:47 2015 +0200
sw: no need to handle a null SwDoc in SwDrawModel ctor
Change-Id: I9ac596ade8b42979ee3fc944af878c702a7e223b
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 0c7cc1b..6c7a0b1 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -59,10 +59,10 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc)
// use common InitDrawModelAndDocShell which will set the associations as needed,
// including SvxColorTableItem with WhichID SID_COLOR_TABLE
- InitDrawModelAndDocShell(m_pDoc ? m_pDoc->GetDocShell() : 0, this);
+ InitDrawModelAndDocShell(m_pDoc->GetDocShell(), this);
// copy all the default values to the SdrModel
- SfxItemPool* pSdrPool = pDoc->GetAttrPool().GetSecondaryPool();
+ SfxItemPool* pSdrPool = m_pDoc->GetAttrPool().GetSecondaryPool();
if( pSdrPool )
{
const sal_uInt16 aWhichRanges[] =
@@ -72,7 +72,7 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc)
0
};
- SfxItemPool& rDocPool = pDoc->GetAttrPool();
+ SfxItemPool& rDocPool = m_pDoc->GetAttrPool();
sal_uInt16 nEdtWhich, nSlotId;
const SfxPoolItem* pItem;
for( const sal_uInt16* pRangeArr = aWhichRanges;
@@ -92,10 +92,10 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc)
}
}
- SetForbiddenCharsTable( pDoc->GetDocumentSettingManager().getForbiddenCharacterTable() );
+ SetForbiddenCharsTable(m_pDoc->GetDocumentSettingManager().getForbiddenCharacterTable());
// Implementation for asian compression
SetCharCompressType( static_cast<sal_uInt16>(
- pDoc->GetDocumentSettingManager().getCharacterCompressionType()));
+ m_pDoc->GetDocumentSettingManager().getCharacterCompressionType()));
}
// Destructor
commit 17757784c02a28ca2c3f70c64ae29f2c61c58249
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 14:04:47 2015 +0200
sw: prefix members of SwDrawModel
Change-Id: Ica69a3c94e674c12619ec0f5c849b8e82dff6090
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index 6afd3fd..0e4ea36 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -26,13 +26,15 @@ class SwDocShell;
class SwDrawModel : public FmFormModel
{
- SwDoc* pDoc;
+private:
+ SwDoc* m_pDoc;
+
public:
SwDrawModel( SwDoc* pDoc );
virtual ~SwDrawModel();
- const SwDoc& GetDoc() const { return *pDoc; }
- SwDoc& GetDoc() { return *pDoc; }
+ const SwDoc& GetDoc() const { return *m_pDoc; }
+ SwDoc& GetDoc() { return *m_pDoc; }
virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE;
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 149408b..0c7cc1b 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -49,20 +49,20 @@ const OUString GetPalettePath()
return aPathOpt.GetPalettePath();
}
-SwDrawModel::SwDrawModel( SwDoc* pD ) :
- FmFormModel( ::GetPalettePath(), &pD->GetAttrPool(),
- pD->GetDocShell(), true ),
- pDoc( pD )
+SwDrawModel::SwDrawModel(SwDoc *const pDoc)
+ : FmFormModel( ::GetPalettePath(), &pDoc->GetAttrPool(),
+ pDoc->GetDocShell(), true )
+ , m_pDoc( pDoc )
{
SetScaleUnit( MAP_TWIP );
SetSwapGraphics( true );
// use common InitDrawModelAndDocShell which will set the associations as needed,
// including SvxColorTableItem with WhichID SID_COLOR_TABLE
- InitDrawModelAndDocShell(pDoc ? pDoc->GetDocShell() : 0, this);
+ InitDrawModelAndDocShell(m_pDoc ? m_pDoc->GetDocShell() : 0, this);
// copy all the default values to the SdrModel
- SfxItemPool* pSdrPool = pD->GetAttrPool().GetSecondaryPool();
+ SfxItemPool* pSdrPool = pDoc->GetAttrPool().GetSecondaryPool();
if( pSdrPool )
{
const sal_uInt16 aWhichRanges[] =
@@ -72,7 +72,7 @@ SwDrawModel::SwDrawModel( SwDoc* pD ) :
0
};
- SfxItemPool& rDocPool = pD->GetAttrPool();
+ SfxItemPool& rDocPool = pDoc->GetAttrPool();
sal_uInt16 nEdtWhich, nSlotId;
const SfxPoolItem* pItem;
for( const sal_uInt16* pRangeArr = aWhichRanges;
@@ -92,9 +92,10 @@ SwDrawModel::SwDrawModel( SwDoc* pD ) :
}
}
- SetForbiddenCharsTable( pD->GetDocumentSettingManager().getForbiddenCharacterTable() );
+ SetForbiddenCharsTable( pDoc->GetDocumentSettingManager().getForbiddenCharacterTable() );
// Implementation for asian compression
- SetCharCompressType( static_cast<sal_uInt16>(pD->GetDocumentSettingManager().getCharacterCompressionType() ));
+ SetCharCompressType( static_cast<sal_uInt16>(
+ pDoc->GetDocumentSettingManager().getCharacterCompressionType()));
}
// Destructor
@@ -122,13 +123,13 @@ SdrPage* SwDrawModel::AllocPage(bool bMasterPage)
uno::Reference<embed::XStorage> SwDrawModel::GetDocumentStorage() const
{
- return pDoc->GetDocStorage();
+ return m_pDoc->GetDocStorage();
}
SdrLayerID SwDrawModel::GetControlExportLayerId( const SdrObject & ) const
{
//for versions < 5.0, there was only Hell and Heaven
- return (SdrLayerID)pDoc->getIDocumentDrawModelAccess().GetHeavenId();
+ return static_cast<SdrLayerID>(m_pDoc->getIDocumentDrawModelAccess().GetHeavenId());
}
uno::Reference< uno::XInterface > SwDrawModel::createUnoModel()
commit d1e63af0fb5c9aa344baae0c34d069385b8f0736
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 13:40:10 2015 +0200
sw: clean up odd formatting
Change-Id: I0e84e3dce84096a9085c911e6b82f5a4ee90d903
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 18147a2..3ef0eae 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -475,19 +475,24 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
// If UseOn or the Follow change, the paragraphs need to know about it.
bool bUseOn = false;
bool bFollow = false;
- if ( rDesc.GetUseOn() != rChged.GetUseOn() )
- { rDesc.SetUseOn( rChged.GetUseOn() );
+ if (rDesc.GetUseOn() != rChged.GetUseOn())
+ {
+ rDesc.SetUseOn( rChged.GetUseOn() );
bUseOn = true;
}
- if ( rDesc.GetFollow() != rChged.GetFollow() )
- { if ( rChged.GetFollow() == &rChged )
- { if ( rDesc.GetFollow() != &rDesc )
- { rDesc.SetFollow( &rDesc );
+ if (rDesc.GetFollow() != rChged.GetFollow())
+ {
+ if (rChged.GetFollow() == &rChged)
+ {
+ if (rDesc.GetFollow() != &rDesc)
+ {
+ rDesc.SetFollow( &rDesc );
bFollow = true;
}
}
else
- { rDesc.SetFollow( rChged.m_pFollow );
+ {
+ rDesc.SetFollow( rChged.m_pFollow );
bFollow = true;
}
}
commit f3bb701223953df02f005b98d2eee13e82016bd7
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 13:37:32 2015 +0200
sw: prefix members of SwPageDesc
Change-Id: I252c2f84a3edc83f069d5983e3fa5f479c289e42
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index ecb91ef..b25e9af 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -79,29 +79,29 @@ public:
};
/*
- * Use of UseOnPage (eUse) and of FrmFmts
+ * Use of UseOnPage (m_eUse) and of FrmFmts
*
- * RIGHT - aMaster only for right hand (odd) pages, left hand (even) pages
+ * RIGHT - m_Master only for right hand (odd) pages, left hand (even) pages
* always empty.
- * LEFT - aLeft for left-hand pages, right-hand pages always empty.
- * aLeft is a copy of master.
- * ALL - aMaster for right hand pages, aLeft for left hand pages.
- * - aLeft is a copy of master.
- * MIRROR - aMaster for right hand pages, aLeft for left hand pagers.
- * aLeft is a copy of master, margins are mirrored.
+ * LEFT - m_Left for left-hand pages, right-hand pages always empty.
+ * m_Left is a copy of master.
+ * ALL - m_Master for right hand pages, m_Left for left hand pages.
+ * - m_Left is a copy of master.
+ * MIRROR - m_Master for right hand pages, m_Left for left hand pagers.
+ * m_Left is a copy of master, margins are mirrored.
*
- * UI works exclusively on master! aLeft is adjusted on Chg at document
- * according to eUse.
+ * UI works exclusively on master! m_Left is adjusted on Chg at document
+ * according to m_eUse.
*
* In order to simplify the work of the filters some more values are placed
- * into eUse:
+ * into m_eUse:
*
* HEADERSHARE - Content of header is equal on left and right hand pages.
* FOOTERSHARE - Content of footer is equal on left and right hand pages.
*
* The values are masked out in the respective getter and setter methods.
- * Access to complete eUse including the information on header and footer
- * via ReadUseOn(), WriteUseOn() (fuer Filter und CopyCTor)!
+ * Access to complete m_eUse including the information on header and footer
+ * via ReadUseOn(), WriteUseOn() (for Filter and CopyCTor)!
*
* The Frmformats for header/footer are adjusted by the UI according to
* the attributes for header and footer at master (height, margin, back-
@@ -132,23 +132,23 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
{
friend class SwDoc;
- OUString aDescName;
- SvxNumberType aNumType;
- SwFrmFmt aMaster;
- SwFrmFmt aLeft;
+ OUString m_StyleName;
+ SvxNumberType m_NumType;
+ SwFrmFmt m_Master;
+ SwFrmFmt m_Left;
// FIXME epicycles growing here - page margins need to be stored differently
SwFrmFmt m_FirstMaster;
SwFrmFmt m_FirstLeft;
- SwDepend aDepend; ///< Because of grid alignment (Registerhaltigkeit).
- SwPageDesc *pFollow;
- sal_uInt16 nRegHeight; ///< Sentence spacing and fontascent of style.
- sal_uInt16 nRegAscent; ///< For grid alignment (Registerhaltigkeit).
- UseOnPage eUse;
- bool bLandscape;
- bool bHidden;
+ SwDepend m_Depend; ///< Because of grid alignment (Registerhaltigkeit).
+ SwPageDesc *m_pFollow;
+ sal_uInt16 m_nRegHeight; ///< Sentence spacing and fontascent of style.
+ sal_uInt16 m_nRegAscent; ///< For grid alignment (Registerhaltigkeit).
+ UseOnPage m_eUse;
+ bool m_IsLandscape;
+ bool m_IsHidden;
/// Footnote information.
- SwPageFtnInfo aFtnInfo;
+ SwPageFtnInfo m_IsFtnInfo;
/** Called for mirroring of Chg (doc).
No adjustment at any other place. */
@@ -162,19 +162,19 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
public:
- OUString GetName() const { return aDescName; }
- bool HasName( const OUString& rThisName ) const { return aDescName == rThisName; }
- void SetName( const OUString& rNewName ) { aDescName = rNewName; }
+ OUString GetName() const { return m_StyleName; }
+ bool HasName(const OUString& rThisName) const { return m_StyleName == rThisName; }
+ void SetName(const OUString& rNewName) { m_StyleName = rNewName; }
- bool GetLandscape() const { return bLandscape; }
- void SetLandscape( bool bNew ) { bLandscape = bNew; }
+ bool GetLandscape() const { return m_IsLandscape; }
+ void SetLandscape( bool bNew ) { m_IsLandscape = bNew; }
- const SvxNumberType &GetNumType() const { return aNumType; }
- void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; }
+ const SvxNumberType &GetNumType() const { return m_NumType; }
+ void SetNumType(const SvxNumberType& rNew) { m_NumType = rNew; }
- const SwPageFtnInfo &GetFtnInfo() const { return aFtnInfo; }
- SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; }
- void SetFtnInfo( const SwPageFtnInfo &rNew ) { aFtnInfo = rNew; }
+ const SwPageFtnInfo &GetFtnInfo() const { return m_IsFtnInfo; }
+ SwPageFtnInfo &GetFtnInfo() { return m_IsFtnInfo; }
+ void SetFtnInfo(const SwPageFtnInfo &rNew) { m_IsFtnInfo = rNew; }
inline bool IsHeaderShared() const;
inline bool IsFooterShared() const;
@@ -183,22 +183,22 @@ public:
bool IsFirstShared() const;
void ChgFirstShare( bool bNew );
- bool IsHidden( ) const { return bHidden; }
- void SetHidden( bool bValue ) { bHidden = bValue; }
+ bool IsHidden() const { return m_IsHidden; }
+ void SetHidden(bool const bValue) { m_IsHidden = bValue; }
inline void SetUseOn( UseOnPage eNew );
inline UseOnPage GetUseOn() const;
- void WriteUseOn( UseOnPage eNew ) { eUse = eNew; }
- UseOnPage ReadUseOn () const { return eUse; }
+ void WriteUseOn(UseOnPage const eNew) { m_eUse = eNew; }
+ UseOnPage ReadUseOn() const { return m_eUse; }
- SwFrmFmt &GetMaster() { return aMaster; }
- SwFrmFmt &GetLeft() { return aLeft; }
- SwFrmFmt &GetFirstMaster() { return m_FirstMaster; }
+ SwFrmFmt &GetMaster() { return m_Master; }
+ SwFrmFmt &GetLeft() { return m_Left; }
+ SwFrmFmt &GetFirstMaster() { return m_FirstMaster; }
SwFrmFmt &GetFirstLeft() { return m_FirstLeft; }
- const SwFrmFmt &GetMaster() const { return aMaster; }
- const SwFrmFmt &GetLeft() const { return aLeft; }
- const SwFrmFmt &GetFirstMaster() const { return m_FirstMaster; }
+ const SwFrmFmt &GetMaster() const { return m_Master; }
+ const SwFrmFmt &GetLeft() const { return m_Left; }
+ const SwFrmFmt &GetFirstMaster() const { return m_FirstMaster; }
const SwFrmFmt &GetFirstLeft() const { return m_FirstLeft; }
/** Reset all attrs of the format but keep the ones a pagedesc
@@ -213,26 +213,26 @@ public:
SwFrmFmt *GetLeftFmt(bool const bFirst = false);
inline const SwFrmFmt *GetLeftFmt(bool const bFirst = false) const;
- sal_uInt16 GetRegHeight() const { return nRegHeight; }
- sal_uInt16 GetRegAscent() const { return nRegAscent; }
- void SetRegHeight( sal_uInt16 nNew ){ nRegHeight = nNew; }
- void SetRegAscent( sal_uInt16 nNew ){ nRegAscent = nNew; }
+ sal_uInt16 GetRegHeight() const { return m_nRegHeight; }
+ sal_uInt16 GetRegAscent() const { return m_nRegAscent; }
+ void SetRegHeight(sal_uInt16 const nNew) { m_nRegHeight = nNew; }
+ void SetRegAscent(sal_uInt16 const nNew) { m_nRegAscent = nNew; }
inline void SetFollow( const SwPageDesc* pNew );
- const SwPageDesc* GetFollow() const { return pFollow; }
- SwPageDesc* GetFollow() { return pFollow; }
+ const SwPageDesc* GetFollow() const { return m_pFollow; }
+ SwPageDesc* GetFollow() { return m_pFollow; }
void SetRegisterFmtColl( const SwTxtFmtColl* rFmt );
const SwTxtFmtColl* GetRegisterFmtColl() const;
void RegisterChange();
/// Query and set PoolFormat-Id.
- sal_uInt16 GetPoolFmtId() const { return aMaster.GetPoolFmtId(); }
- void SetPoolFmtId( sal_uInt16 nId ) { aMaster.SetPoolFmtId( nId ); }
- sal_uInt16 GetPoolHelpId() const { return aMaster.GetPoolHelpId(); }
- void SetPoolHelpId( sal_uInt16 nId ) { aMaster.SetPoolHelpId( nId ); }
- sal_uInt8 GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); }
- void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); }
+ sal_uInt16 GetPoolFmtId() const { return m_Master.GetPoolFmtId(); }
+ void SetPoolFmtId(sal_uInt16 const nId) { m_Master.SetPoolFmtId(nId); }
+ sal_uInt16 GetPoolHelpId() const { return m_Master.GetPoolHelpId(); }
+ void SetPoolHelpId(sal_uInt16 const nId){ m_Master.SetPoolHelpId(nId); }
+ sal_uInt8 GetPoolHlpFileId() const { return m_Master.GetPoolHlpFileId(); }
+ void SetPoolHlpFileId(sal_uInt8 const nId) { m_Master.SetPoolHlpFileId(nId); }
/// Query information from Client.
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -254,46 +254,46 @@ public:
inline void SwPageDesc::SetFollow( const SwPageDesc* pNew )
{
- pFollow = pNew ? const_cast<SwPageDesc*>(pNew) : this;
+ m_pFollow = pNew ? const_cast<SwPageDesc*>(pNew) : this;
}
inline bool SwPageDesc::IsHeaderShared() const
{
- return (eUse & nsUseOnPage::PD_HEADERSHARE) != 0;
+ return (m_eUse & nsUseOnPage::PD_HEADERSHARE) != 0;
}
inline bool SwPageDesc::IsFooterShared() const
{
- return (eUse & nsUseOnPage::PD_FOOTERSHARE) != 0;
+ return (m_eUse & nsUseOnPage::PD_FOOTERSHARE) != 0;
}
inline void SwPageDesc::ChgHeaderShare( bool bNew )
{
if ( bNew )
- eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE);
+ m_eUse = (UseOnPage) (m_eUse | nsUseOnPage::PD_HEADERSHARE);
else
- eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE);
+ m_eUse = (UseOnPage) (m_eUse & nsUseOnPage::PD_NOHEADERSHARE);
}
inline void SwPageDesc::ChgFooterShare( bool bNew )
{
if ( bNew )
- eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE);
+ m_eUse = (UseOnPage) (m_eUse | nsUseOnPage::PD_FOOTERSHARE);
else
- eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOFOOTERSHARE);
+ m_eUse = (UseOnPage) (m_eUse & nsUseOnPage::PD_NOFOOTERSHARE);
}
inline void SwPageDesc::SetUseOn( UseOnPage eNew )
{
UseOnPage eTmp = nsUseOnPage::PD_NONE;
- if ( eUse & nsUseOnPage::PD_HEADERSHARE )
+ if (m_eUse & nsUseOnPage::PD_HEADERSHARE)
eTmp = nsUseOnPage::PD_HEADERSHARE;
- if ( eUse & nsUseOnPage::PD_FOOTERSHARE )
+ if (m_eUse & nsUseOnPage::PD_FOOTERSHARE)
eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE);
- if ( eUse & nsUseOnPage::PD_FIRSTSHARE )
+ if (m_eUse & nsUseOnPage::PD_FIRSTSHARE)
eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FIRSTSHARE);
- eUse = (UseOnPage) (eTmp | eNew);
+ m_eUse = (UseOnPage) (eTmp | eNew);
}
inline UseOnPage SwPageDesc::GetUseOn() const
{
- UseOnPage eRet = eUse;
+ UseOnPage eRet = m_eUse;
eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOHEADERSHARE);
eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFOOTERSHARE);
eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFIRSTSHARE);
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 6cc6943..18147a2 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -487,7 +487,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
}
}
else
- { rDesc.SetFollow( rChged.pFollow );
+ { rDesc.SetFollow( rChged.m_pFollow );
bFollow = true;
}
}
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index e97a3bf..a130835 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -38,61 +38,60 @@
using namespace ::com::sun::star;
-SwPageDesc::SwPageDesc( const OUString& rName, SwFrmFmt *pFmt, SwDoc *pDc ) :
- SwModify( 0 ),
- aDescName( rName ),
- aMaster( pDc->GetAttrPool(), rName, pFmt ),
- aLeft( pDc->GetAttrPool(), rName, pFmt ),
- m_FirstMaster( pDc->GetAttrPool(), rName, pFmt ),
- m_FirstLeft( pDc->GetAttrPool(), rName, pFmt ),
- aDepend( this, 0 ),
- pFollow( this ),
- nRegHeight( 0 ),
- nRegAscent( 0 ),
- eUse( (UseOnPage)(nsUseOnPage::PD_ALL | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE | nsUseOnPage::PD_FIRSTSHARE ) ),
- bLandscape( false ),
- bHidden( false ),
- aFtnInfo()
-{
-}
-
-SwPageDesc::SwPageDesc( const SwPageDesc &rCpy ) :
- SwModify( 0 ),
- aDescName( rCpy.GetName() ),
- aNumType( rCpy.GetNumType() ),
- aMaster( rCpy.GetMaster() ),
- aLeft( rCpy.GetLeft() ),
- m_FirstMaster( rCpy.GetFirstMaster() ),
- m_FirstLeft( rCpy.GetFirstLeft() ),
- aDepend( this, const_cast<SwModify*>(rCpy.aDepend.GetRegisteredIn()) ),
- pFollow( rCpy.pFollow ),
- nRegHeight( rCpy.GetRegHeight() ),
- nRegAscent( rCpy.GetRegAscent() ),
- eUse( rCpy.ReadUseOn() ),
- bLandscape( rCpy.GetLandscape() ),
- bHidden( rCpy.IsHidden() ),
- aFtnInfo( rCpy.GetFtnInfo() )
+SwPageDesc::SwPageDesc(const OUString& rName, SwFrmFmt *pFmt, SwDoc *const pDoc)
+ : SwModify(nullptr)
+ , m_StyleName( rName )
+ , m_Master( pDoc->GetAttrPool(), rName, pFmt )
+ , m_Left( pDoc->GetAttrPool(), rName, pFmt )
+ , m_FirstMaster( pDoc->GetAttrPool(), rName, pFmt )
+ , m_FirstLeft( pDoc->GetAttrPool(), rName, pFmt )
+ , m_Depend( this, 0 )
+ , m_pFollow( this )
+ , m_nRegHeight( 0 )
+ , m_nRegAscent( 0 )
+ , m_eUse( (UseOnPage)(nsUseOnPage::PD_ALL | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE | nsUseOnPage::PD_FIRSTSHARE) )
+ , m_IsLandscape( false )
+ , m_IsHidden( false )
+{
+}
+
+SwPageDesc::SwPageDesc( const SwPageDesc &rCpy )
+ : SwModify(nullptr)
+ , m_StyleName( rCpy.GetName() )
+ , m_NumType( rCpy.GetNumType() )
+ , m_Master( rCpy.GetMaster() )
+ , m_Left( rCpy.GetLeft() )
+ , m_FirstMaster( rCpy.GetFirstMaster() )
+ , m_FirstLeft( rCpy.GetFirstLeft() )
+ , m_Depend( this, const_cast<SwModify*>(rCpy.m_Depend.GetRegisteredIn()) )
+ , m_pFollow( rCpy.m_pFollow )
+ , m_nRegHeight( rCpy.GetRegHeight() )
+ , m_nRegAscent( rCpy.GetRegAscent() )
+ , m_eUse( rCpy.ReadUseOn() )
+ , m_IsLandscape( rCpy.GetLandscape() )
+ , m_IsHidden( rCpy.IsHidden() )
+ , m_IsFtnInfo( rCpy.GetFtnInfo() )
{
}
SwPageDesc & SwPageDesc::operator = (const SwPageDesc & rSrc)
{
- aDescName = rSrc.aDescName;
- aNumType = rSrc.aNumType;
- aMaster = rSrc.aMaster;
- aLeft = rSrc.aLeft;
+ m_StyleName = rSrc.m_StyleName;
+ m_NumType = rSrc.m_NumType;
+ m_Master = rSrc.m_Master;
+ m_Left = rSrc.m_Left;
m_FirstMaster = rSrc.m_FirstMaster;
m_FirstLeft = rSrc.m_FirstLeft;
- if (rSrc.pFollow == &rSrc)
- pFollow = this;
+ if (rSrc.m_pFollow == &rSrc)
+ m_pFollow = this;
else
- pFollow = rSrc.pFollow;
+ m_pFollow = rSrc.m_pFollow;
- nRegHeight = rSrc.nRegHeight;
- nRegAscent = rSrc.nRegAscent;
- eUse = rSrc.eUse;
- bLandscape = rSrc.bLandscape;
+ m_nRegHeight = rSrc.m_nRegHeight;
+ m_nRegAscent = rSrc.m_nRegAscent;
+ m_eUse = rSrc.m_eUse;
+ m_IsLandscape = rSrc.m_IsLandscape;
return *this;
}
@@ -106,22 +105,22 @@ void SwPageDesc::Mirror()
{
//Only the margins are mirrored, all other values are just copied.
SvxLRSpaceItem aLR( RES_LR_SPACE );
- const SvxLRSpaceItem &rLR = aMaster.GetLRSpace();
+ const SvxLRSpaceItem &rLR = m_Master.GetLRSpace();
aLR.SetLeft( rLR.GetRight() );
aLR.SetRight( rLR.GetLeft() );
- SfxItemSet aSet( *aMaster.GetAttrSet().GetPool(),
- aMaster.GetAttrSet().GetRanges() );
+ SfxItemSet aSet( *m_Master.GetAttrSet().GetPool(),
+ m_Master.GetAttrSet().GetRanges() );
aSet.Put( aLR );
- aSet.Put( aMaster.GetFrmSize() );
- aSet.Put( aMaster.GetPaperBin() );
- aSet.Put( aMaster.GetULSpace() );
- aSet.Put( aMaster.GetBox() );
- aSet.Put( aMaster.makeBackgroundBrushItem() );
- aSet.Put( aMaster.GetShadow() );
- aSet.Put( aMaster.GetCol() );
- aSet.Put( aMaster.GetFrmDir() ); // #112217#
- aLeft.SetFmtAttr( aSet );
+ aSet.Put( m_Master.GetFrmSize() );
+ aSet.Put( m_Master.GetPaperBin() );
+ aSet.Put( m_Master.GetULSpace() );
+ aSet.Put( m_Master.GetBox() );
+ aSet.Put( m_Master.makeBackgroundBrushItem() );
+ aSet.Put( m_Master.GetShadow() );
+ aSet.Put( m_Master.GetCol() );
+ aSet.Put( m_Master.GetFrmDir() ); // #112217#
+ m_Left.SetFmtAttr( aSet );
}
void SwPageDesc::ResetAllAttr( bool bLeft )
@@ -136,9 +135,9 @@ void SwPageDesc::ResetAllAttr( bool bLeft )
// gets information from Modify
bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
{
- if( !aMaster.GetInfo( rInfo ) )
+ if (!m_Master.GetInfo(rInfo))
return false; // found
- if ( !aLeft.GetInfo( rInfo ) )
+ if (!m_Left.GetInfo(rInfo))
return false ;
if ( !m_FirstMaster.GetInfo( rInfo ) )
return false;
@@ -151,9 +150,9 @@ void SwPageDesc::SetRegisterFmtColl( const SwTxtFmtColl* pFmt )
if( pFmt != GetRegisterFmtColl() )
{
if( pFmt )
- const_cast<SwTxtFmtColl*>(pFmt)->Add( &aDepend );
+ const_cast<SwTxtFmtColl*>(pFmt)->Add(&m_Depend);
else
- const_cast<SwTxtFmtColl*>(GetRegisterFmtColl())->Remove( &aDepend );
+ const_cast<SwTxtFmtColl*>(GetRegisterFmtColl())->Remove(&m_Depend);
RegisterChange();
}
@@ -162,7 +161,7 @@ void SwPageDesc::SetRegisterFmtColl( const SwTxtFmtColl* pFmt )
/// retrieve the style for the grid alignment
const SwTxtFmtColl* SwPageDesc::GetRegisterFmtColl() const
{
- const SwModify* pReg = aDepend.GetRegisteredIn();
+ const SwModify* pReg = m_Depend.GetRegisteredIn();
return static_cast<const SwTxtFmtColl*>(pReg);
}
@@ -183,7 +182,7 @@ void SwPageDesc::RegisterChange()
return;
}
- nRegHeight = 0;
+ m_nRegHeight = 0;
{
SwIterator<SwFrm,SwFmt> aIter( GetMaster() );
for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
@@ -305,29 +304,29 @@ bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst)
{
- return (nsUseOnPage::PD_LEFT & eUse)
- ? ((bFirst) ? &m_FirstLeft : &aLeft)
+ return (nsUseOnPage::PD_LEFT & m_eUse)
+ ? ((bFirst) ? &m_FirstLeft : &m_Left)
: 0;
}
SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
{
- return (nsUseOnPage::PD_RIGHT & eUse)
- ? ((bFirst) ? &m_FirstMaster : &aMaster)
+ return (nsUseOnPage::PD_RIGHT & m_eUse)
+ ? ((bFirst) ? &m_FirstMaster : &m_Master)
: 0;
}
bool SwPageDesc::IsFirstShared() const
{
- return (eUse & nsUseOnPage::PD_FIRSTSHARE) != 0;
+ return (m_eUse & nsUseOnPage::PD_FIRSTSHARE) != 0;
}
void SwPageDesc::ChgFirstShare( bool bNew )
{
if ( bNew )
- eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FIRSTSHARE);
+ m_eUse = (UseOnPage) (m_eUse | nsUseOnPage::PD_FIRSTSHARE);
else
- eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOFIRSTSHARE);
+ m_eUse = (UseOnPage) (m_eUse & nsUseOnPage::PD_NOFIRSTSHARE);
}
SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
commit 72b39b01572e30c8f05435d140b5400e3e96d314
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 31 13:10:05 2015 +0200
sw: prefix members of SwPageDescExt
Change-Id: Ie45dbf981dd63181450b471408879cf8c01655d1
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 5f122bc..ecb91ef 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -322,12 +322,12 @@ inline const SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) const
class SwPageDescExt
{
public:
- SwPageDesc aPageDesc;
+ SwPageDesc m_PageDesc;
private:
- SwDoc * pDoc;
- OUString sFollow;
+ SwDoc * m_pDoc;
+ OUString m_sFollow;
- void SetPageDesc(const SwPageDesc & aPageDesc);
+ void SetPageDesc(const SwPageDesc & rPageDesc);
public:
SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * pDoc);
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 29dfc8d..e97a3bf 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -405,16 +405,18 @@ bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
&& m_nBottomDist== rCmp.GetBottomDist();
}
-SwPageDescExt::SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * _pDoc)
- : aPageDesc(rPageDesc), pDoc(_pDoc)
+SwPageDescExt::SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc *const pDoc)
+ : m_PageDesc(rPageDesc)
+ , m_pDoc(pDoc)
{
SetPageDesc(rPageDesc);
}
SwPageDescExt::SwPageDescExt(const SwPageDescExt & rSrc)
- : aPageDesc(rSrc.aPageDesc), pDoc(rSrc.pDoc)
+ : m_PageDesc(rSrc.m_PageDesc)
+ , m_pDoc(rSrc.m_pDoc)
{
- SetPageDesc(rSrc.aPageDesc);
+ SetPageDesc(rSrc.m_PageDesc);
}
SwPageDescExt::~SwPageDescExt()
@@ -423,15 +425,15 @@ SwPageDescExt::~SwPageDescExt()
OUString SwPageDescExt::GetName() const
{
- return aPageDesc.GetName();
+ return m_PageDesc.GetName();
}
-void SwPageDescExt::SetPageDesc(const SwPageDesc & _aPageDesc)
+void SwPageDescExt::SetPageDesc(const SwPageDesc & rPageDesc)
{
- aPageDesc = _aPageDesc;
+ m_PageDesc = rPageDesc;
- if (aPageDesc.GetFollow())
- sFollow = aPageDesc.GetFollow()->GetName();
+ if (m_PageDesc.GetFollow())
+ m_sFollow = m_PageDesc.GetFollow()->GetName();
}
SwPageDescExt & SwPageDescExt::operator = (const SwPageDesc & rSrc)
@@ -443,16 +445,16 @@ SwPageDescExt & SwPageDescExt::operator = (const SwPageDesc & rSrc)
SwPageDescExt & SwPageDescExt::operator = (const SwPageDescExt & rSrc)
{
- SetPageDesc(rSrc.aPageDesc);
+ SetPageDesc(rSrc.m_PageDesc);
return *this;
}
SwPageDescExt::operator SwPageDesc() const
{
- SwPageDesc aResult(aPageDesc);
+ SwPageDesc aResult(m_PageDesc);
- SwPageDesc * pPageDesc = pDoc->FindPageDesc(sFollow);
+ SwPageDesc * pPageDesc = m_pDoc->FindPageDesc(m_sFollow);
if ( 0 != pPageDesc )
aResult.SetFollow(pPageDesc);
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index a4cfc01..e5aec0a 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -107,8 +107,8 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
OSL_ENSURE(0 != pDoc, "no document?");
#if OSL_DEBUG_LEVEL > 1
- DebugHeaderFooterContent( aOld.aPageDesc );
- DebugHeaderFooterContent( aNew.aPageDesc );
+ DebugHeaderFooterContent( aOld.m_PageDesc );
+ DebugHeaderFooterContent( aNew.m_PageDesc );
#endif
/*
@@ -118,8 +118,8 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
But this happens, this Undo Ctor will destroy the unnecessary duplicate and manipulate the
content pointer of the both page descriptions.
*/
- SwPageDesc &rOldDesc = aOld.aPageDesc;
- SwPageDesc &rNewDesc = aNew.aPageDesc;
+ SwPageDesc &rOldDesc = aOld.m_PageDesc;
+ SwPageDesc &rNewDesc = aNew.m_PageDesc;
const SwFmtHeader& rOldHead = rOldDesc.GetMaster().GetHeader();
const SwFmtHeader& rNewHead = rNewDesc.GetMaster().GetHeader();
const SwFmtFooter& rOldFoot = rOldDesc.GetMaster().GetFooter();
@@ -182,10 +182,10 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
// After this exchange method the old page description will point to zero,
// the new one will point to the node position of the original content nodes.
- ExchangeContentNodes( aOld.aPageDesc, aNew.aPageDesc );
+ ExchangeContentNodes( aOld.m_PageDesc, aNew.m_PageDesc );
#if OSL_DEBUG_LEVEL > 1
- DebugHeaderFooterContent( aOld.aPageDesc );
- DebugHeaderFooterContent( aNew.aPageDesc );
+ DebugHeaderFooterContent( aOld.m_PageDesc );
+ DebugHeaderFooterContent( aNew.m_PageDesc );
#endif
}
}
@@ -340,7 +340,7 @@ void SwUndoPageDesc::UndoImpl(::sw::UndoRedoContext &)
{
// Move (header/footer)content node responsibility from new page descriptor to old one again.
if( bExchange )
- ExchangeContentNodes( aNew.aPageDesc, aOld.aPageDesc );
+ ExchangeContentNodes( aNew.m_PageDesc, aOld.m_PageDesc );
pDoc->ChgPageDesc(aOld.GetName(), aOld);
}
@@ -348,7 +348,7 @@ void SwUndoPageDesc::RedoImpl(::sw::UndoRedoContext &)
{
// Move (header/footer)content node responsibility from old page descriptor to new one again.
if( bExchange )
- ExchangeContentNodes( aOld.aPageDesc, aNew.aPageDesc );
+ ExchangeContentNodes( aOld.m_PageDesc, aNew.m_PageDesc );
pDoc->ChgPageDesc(aNew.GetName(), aNew);
}
commit 9fe07a3fe60497b0b7df2a484458b395703b4883
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Mar 30 23:58:22 2015 +0200
sw: prefix members of SwPageFtnInfo
Change-Id: I5ccad27938941d5b1311bb4fd15353ea8ea34d77
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index a5bed9c..5f122bc 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -42,33 +42,34 @@ enum SwFtnAdj
/// Footnote information.
class SW_DLLPUBLIC SwPageFtnInfo
{
- SwTwips nMaxHeight; ///< maximum height of the footnote area.
- sal_uLong nLineWidth; ///< width of separator line
- editeng::SvxBorderStyle eLineStyle; ///< Style of the separator line
- Color aLineColor; ///< color of the separator line
- Fraction aWidth; ///< percentage width of the separator line.
- SwFtnAdj eAdj; ///< line adjustment.
- SwTwips nTopDist; ///< distance between body and separator.
- SwTwips nBottomDist; ///< distance between separator and first footnote
+private:
+ SwTwips m_nMaxHeight; ///< maximum height of the footnote area.
+ sal_uLong m_nLineWidth; ///< width of separator line
+ editeng::SvxBorderStyle m_eLineStyle; ///< Style of the separator line
+ Color m_LineColor; ///< color of the separator line
+ Fraction m_Width; ///< percentage width of the separator line.
+ SwFtnAdj m_eAdjust; ///< line adjustment.
+ SwTwips m_nTopDist; ///< distance between body and separator.
+ SwTwips m_nBottomDist; ///< distance between separator and first footnote
public:
- SwTwips GetHeight() const { return nMaxHeight; }
- sal_uLong GetLineWidth() const { return nLineWidth; }
- const Color& GetLineColor() const { return aLineColor;}
- editeng::SvxBorderStyle GetLineStyle() const { return eLineStyle; }
- const Fraction& GetWidth() const { return aWidth; }
- SwFtnAdj GetAdj() const { return eAdj; }
- SwTwips GetTopDist()const { return nTopDist; }
- SwTwips GetBottomDist() const { return nBottomDist; }
-
- void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; }
- void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; }
- void SetLineStyle( editeng::SvxBorderStyle eSet ) { eLineStyle = eSet; }
- void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
- void SetWidth( const Fraction &rNew){ aWidth = rNew; }
- void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; }
- void SetTopDist ( SwTwips nNew ) { nTopDist = nNew; }
- void SetBottomDist( SwTwips nNew ) { nBottomDist = nNew; }
+ SwTwips GetHeight() const { return m_nMaxHeight; }
+ sal_uLong GetLineWidth() const { return m_nLineWidth; }
+ const Color& GetLineColor() const { return m_LineColor;}
+ editeng::SvxBorderStyle GetLineStyle() const { return m_eLineStyle; }
+ const Fraction& GetWidth() const { return m_Width; }
+ SwFtnAdj GetAdj() const { return m_eAdjust; }
+ SwTwips GetTopDist() const { return m_nTopDist; }
+ SwTwips GetBottomDist() const { return m_nBottomDist; }
+
+ void SetHeight(SwTwips const nNew) { m_nMaxHeight = nNew; }
+ void SetLineWidth(sal_uLong const nSet) { m_nLineWidth = nSet; }
+ void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = eSet;}
+ void SetLineColor(const Color& rCol) { m_LineColor = rCol;}
+ void SetWidth(const Fraction & rNew) { m_Width = rNew; }
+ void SetAdj(SwFtnAdj const eNew) { m_eAdjust = eNew; }
+ void SetTopDist (SwTwips const nNew) { m_nTopDist = nNew; }
+ void SetBottomDist(SwTwips const nNew) { m_nBottomDist = nNew; }
SwPageFtnInfo();
SwPageFtnInfo( const SwPageFtnInfo& );
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 0aca15f..29dfc8d 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -355,54 +355,54 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
return 0;
}
-SwPageFtnInfo::SwPageFtnInfo() :
- nMaxHeight( 0 ),
- nLineWidth(10),
- eLineStyle( table::BorderLineStyle::SOLID ),
- aWidth( 25, 100 ),
- nTopDist( 57 ), //1mm
- nBottomDist( 57 )
-{
- eAdj = FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage()) ?
+SwPageFtnInfo::SwPageFtnInfo()
+ : m_nMaxHeight( 0 )
+ , m_nLineWidth(10)
+ , m_eLineStyle( table::BorderLineStyle::SOLID )
+ , m_Width( 25, 100 )
+ , m_nTopDist( 57 ) //1mm
+ , m_nBottomDist( 57 )
+{
+ m_eAdjust = FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage()) ?
FTNADJ_RIGHT :
FTNADJ_LEFT;
}
-SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy ) :
- nMaxHeight( rCpy.GetHeight() ),
- nLineWidth(rCpy.nLineWidth),
- eLineStyle(rCpy.eLineStyle),
- aLineColor(rCpy.aLineColor),
- aWidth( rCpy.GetWidth() ),
- eAdj( rCpy.GetAdj() ),
- nTopDist( rCpy.GetTopDist() ),
- nBottomDist( rCpy.GetBottomDist() )
+SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy )
+ : m_nMaxHeight(rCpy.GetHeight())
+ , m_nLineWidth(rCpy.m_nLineWidth)
+ , m_eLineStyle(rCpy.m_eLineStyle)
+ , m_LineColor(rCpy.m_LineColor)
+ , m_Width(rCpy.GetWidth())
+ , m_eAdjust(rCpy.GetAdj())
+ , m_nTopDist(rCpy.GetTopDist())
+ , m_nBottomDist(rCpy.GetBottomDist())
{
}
SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy )
{
- nMaxHeight = rCpy.GetHeight();
- nLineWidth = rCpy.nLineWidth;
- eLineStyle = rCpy.eLineStyle;
- aLineColor = rCpy.aLineColor;
- aWidth = rCpy.GetWidth();
- eAdj = rCpy.GetAdj();
- nTopDist = rCpy.GetTopDist();
- nBottomDist = rCpy.GetBottomDist();
+ m_nMaxHeight = rCpy.GetHeight();
+ m_nLineWidth = rCpy.m_nLineWidth;
+ m_eLineStyle = rCpy.m_eLineStyle;
+ m_LineColor = rCpy.m_LineColor;
+ m_Width = rCpy.GetWidth();
+ m_eAdjust = rCpy.GetAdj();
+ m_nTopDist = rCpy.GetTopDist();
+ m_nBottomDist = rCpy.GetBottomDist();
return *this;
}
bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
{
- return ( nMaxHeight == rCmp.GetHeight() &&
- nLineWidth == rCmp.nLineWidth &&
- eLineStyle == rCmp.eLineStyle &&
- aLineColor == rCmp.aLineColor &&
- aWidth == rCmp.GetWidth() &&
- eAdj == rCmp.GetAdj() &&
- nTopDist == rCmp.GetTopDist() &&
- nBottomDist== rCmp.GetBottomDist() );
+ return m_nMaxHeight == rCmp.GetHeight()
+ && m_nLineWidth == rCmp.m_nLineWidth
+ && m_eLineStyle == rCmp.m_eLineStyle
+ && m_LineColor == rCmp.m_LineColor
+ && m_Width == rCmp.GetWidth()
+ && m_eAdjust == rCmp.GetAdj()
+ && m_nTopDist == rCmp.GetTopDist()
+ && m_nBottomDist== rCmp.GetBottomDist();
}
SwPageDescExt::SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * _pDoc)
commit 1621c972a0291369366c07df33cb45666e76e3a9
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Mar 30 23:43:42 2015 +0200
sw: convert these SwFEShell members to std::unique_ptr
Change-Id: Ida2def93baf8d389e8000d5c31ac50dea7cd4c1b
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index dca10c7..cac6a46 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -35,6 +35,7 @@
#include <o3tl/typed_flags_set.hxx>
#include <vector>
+#include <memory>
namespace editeng { class SvxBorderLine; }
@@ -182,7 +183,8 @@ class SdrDropMarkerOverlay;
class SW_DLLPUBLIC SwFEShell : public SwEditShell
{
private:
- SdrDropMarkerOverlay *m_pChainFrom, *m_pChainTo;
+ std::unique_ptr<SdrDropMarkerOverlay> m_pChainTo;
+ std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom;
bool m_bCheckForOLEInCaption;
SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9893d0f..1ef1e8b 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -607,7 +607,8 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
SdrView *pView = Imp()->GetDrawView();
if ( pView && pView->AreObjectsMarked() )
{
- delete m_pChainFrom; delete m_pChainTo; m_pChainFrom = m_pChainTo = nullptr;
+ m_pChainFrom.reset();
+ m_pChainTo.reset();
SdrHdl* pHdl = pView->PickHandle( *pPt );
if (pView->BegDragObj( *pPt, 0, pHdl ))
pView->GetDragMethod()->SetShiftPressed( bIsShift );
@@ -2568,16 +2569,8 @@ void SwFEShell::Unchain( SwFrmFmt &rFmt )
void SwFEShell::HideChainMarker()
{
- if (m_pChainFrom)
- {
- delete m_pChainFrom;
- m_pChainFrom = nullptr;
- }
- if (m_pChainTo)
- {
- delete m_pChainTo;
- m_pChainTo = nullptr;
- }
+ m_pChainFrom.reset();
+ m_pChainTo.reset();
}
void SwFEShell::SetChainMarker()
@@ -2598,7 +2591,8 @@ void SwFEShell::SetChainMarker()
if (!m_pChainFrom)
{
- m_pChainFrom = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+ m_pChainFrom.reset(
+ new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd ));
}
}
if ( pFly->GetNextLink() )
@@ -2611,19 +2605,20 @@ void SwFEShell::SetChainMarker()
if (!m_pChainTo)
{
- m_pChainTo = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+ m_pChainTo.reset(
+ new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd ));
}
}
}
if ( bDelFrom )
{
- delete m_pChainFrom, m_pChainFrom = nullptr;
+ m_pChainFrom.reset();
}
if ( bDelTo )
{
- delete m_pChainTo, m_pChainTo = nullptr;
+ m_pChainTo.reset();
}
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 8cfc54c..eb11323 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -608,24 +608,18 @@ sal_uInt16 SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const
SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOptions )
: SwEditShell( rDoc, pWindow, pOptions )
- , m_pChainFrom(nullptr)
- , m_pChainTo(nullptr)
, m_bCheckForOLEInCaption(false)
{
}
SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow )
: SwEditShell( rShell, pWindow )
- , m_pChainFrom(nullptr)
- , m_pChainTo(nullptr)
, m_bCheckForOLEInCaption(false)
{
}
SwFEShell::~SwFEShell()
{
- delete m_pChainFrom;
- delete m_pChainTo;
}
// #i17567# - adjustments for allowing
commit 58a7850bae8455146eed107efdf7661534a64b5e
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Mar 30 23:37:36 2015 +0200
sw: prefix members of SwFEShell
Change-Id: I785df37d61762a4df2b6af18435f668df873625d
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 13587c6..dca10c7 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -181,8 +181,9 @@ class SdrDropMarkerOverlay;
class SW_DLLPUBLIC SwFEShell : public SwEditShell
{
- SdrDropMarkerOverlay *pChainFrom, *pChainTo;
- bool bCheckForOLEInCaption;
+private:
+ SdrDropMarkerOverlay *m_pChainFrom, *m_pChainTo;
+ bool m_bCheckForOLEInCaption;
SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
@@ -422,8 +423,8 @@ public:
void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
/// Check resize of OLE-Object.
- bool IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; }
- void SetCheckForOLEInCaption( bool bFlag ) { bCheckForOLEInCaption = bFlag; }
+ bool IsCheckForOLEInCaption() const { return m_bCheckForOLEInCaption; }
+ void SetCheckForOLEInCaption( bool bFlag ) { m_bCheckForOLEInCaption = bFlag; }
/// Set name at selected FlyFrame.
void SetFlyName( const OUString& rName );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 80fd4d1..1963d15 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1294,7 +1294,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
const SwTxtNode* pTNd;
const SwpHints* pHts;
const SwFmtFrmSize& rFrmSz = pFly->GetFmt()->GetFrmSize();
- if( bCheckForOLEInCaption &&
+ if (m_bCheckForOLEInCaption &&
0 != rFrmSz.GetWidthPercent() &&
0 != (pAnchor = pFly->GetAnchorFrm()) &&
pAnchor->IsTxtFrm() &&
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9311cc9..9893d0f 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -607,7 +607,7 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
SdrView *pView = Imp()->GetDrawView();
if ( pView && pView->AreObjectsMarked() )
{
- delete pChainFrom; delete pChainTo; pChainFrom = pChainTo = 0;
+ delete m_pChainFrom; delete m_pChainTo; m_pChainFrom = m_pChainTo = nullptr;
SdrHdl* pHdl = pView->PickHandle( *pPt );
if (pView->BegDragObj( *pPt, 0, pHdl ))
pView->GetDragMethod()->SetShiftPressed( bIsShift );
@@ -2568,15 +2568,15 @@ void SwFEShell::Unchain( SwFrmFmt &rFmt )
void SwFEShell::HideChainMarker()
{
- if ( pChainFrom )
+ if (m_pChainFrom)
{
- delete pChainFrom;
- pChainFrom = 0L;
+ delete m_pChainFrom;
+ m_pChainFrom = nullptr;
}
- if ( pChainTo )
+ if (m_pChainTo)
{
- delete pChainTo;
- pChainTo = 0L;
+ delete m_pChainTo;
+ m_pChainTo = nullptr;
}
}
@@ -2596,9 +2596,9 @@ void SwFEShell::SetChainMarker()
Point aStart( pPre->Frm().Right(), pPre->Frm().Bottom());
Point aEnd(pFly->Frm().Pos());
- if ( !pChainFrom )
+ if (!m_pChainFrom)
{
- pChainFrom = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+ m_pChainFrom = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
}
}
if ( pFly->GetNextLink() )
@@ -2609,21 +2609,21 @@ void SwFEShell::SetChainMarker()
Point aStart( pFly->Frm().Right(), pFly->Frm().Bottom());
Point aEnd(pNxt->Frm().Pos());
- if ( !pChainTo )
+ if (!m_pChainTo)
{
- pChainTo = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+ m_pChainTo = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
}
}
}
if ( bDelFrom )
{
- delete pChainFrom, pChainFrom = 0;
+ delete m_pChainFrom, m_pChainFrom = nullptr;
}
if ( bDelTo )
{
- delete pChainTo, pChainTo = 0;
+ delete m_pChainTo, m_pChainTo = nullptr;
}
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index a61854f..8cfc54c 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -607,21 +607,25 @@ sal_uInt16 SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const
}
SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOptions )
- : SwEditShell( rDoc, pWindow, pOptions ),
- pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false )
+ : SwEditShell( rDoc, pWindow, pOptions )
+ , m_pChainFrom(nullptr)
+ , m_pChainTo(nullptr)
+ , m_bCheckForOLEInCaption(false)
{
}
SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow )
- : SwEditShell( rShell, pWindow ),
- pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false )
+ : SwEditShell( rShell, pWindow )
+ , m_pChainFrom(nullptr)
+ , m_pChainTo(nullptr)
+ , m_bCheckForOLEInCaption(false)
{
}
SwFEShell::~SwFEShell()
{
- delete pChainFrom;
- delete pChainTo;
+ delete m_pChainFrom;
+ delete m_pChainTo;
}
// #i17567# - adjustments for allowing
commit 109717c9a2a4d33f2210ed1fbf6d874ff04f32d3
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Mar 30 23:28:17 2015 +0200
sw: prefix members of SwEditShell
Change-Id: I8a06e0660767f23518952e22cca1b56c16d0bbd1
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c617931..3831545 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -137,9 +137,9 @@ typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
-class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
+class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
{
- static SvxSwAutoFmtFlags* pAutoFmtFlags;
+ static SvxSwAutoFmtFlags* s_pAutoFmtFlags;
/// For the private methods DelRange and those of AutoCorrect.
friend class SwAutoFormat;
@@ -952,7 +952,7 @@ inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
/// Class for automated call of Start- and EndAction().
class SwActContext {
- SwEditShell *pSh;
+ SwEditShell & m_rShell;
public:
SwActContext(SwEditShell *pShell);
~SwActContext();
@@ -960,7 +960,7 @@ public:
/// Class for automated call of Start- and EndCrsrMove().
class SwMvContext {
- SwEditShell *pSh;
+ SwEditShell & m_rShell;
public:
SwMvContext(SwEditShell *pShell);
~SwMvContext();
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 6e39a13..11a73ab 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -763,7 +763,7 @@ void _FinitCore()
delete SwSelPaintRects::s_pMapMode;
delete SwFntObj::pPixMap;
- delete SwEditShell::pAutoFmtFlags;
+ delete SwEditShell::s_pAutoFmtFlags;
#if OSL_DEBUG_LEVEL > 0
// free defaults to prevent assertions
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 50972f1..e9e1152 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -81,7 +81,7 @@ const int cnPosEnDash = 2, cnPosEmDash = 4;
const sal_Unicode cStarSymbolEnDash = 0x2013;
const sal_Unicode cStarSymbolEmDash = 0x2014;
-SvxSwAutoFmtFlags* SwEditShell::pAutoFmtFlags = 0;
+SvxSwAutoFmtFlags* SwEditShell::s_pAutoFmtFlags = nullptr;
// Number of num-/bullet-paragraph templates. MAXLEVEL will soon be raised
// to x, but not the number of templates. (Artifact from <= 4.0)
@@ -2606,10 +2606,10 @@ void SwEditShell::AutoFmtBySplitNode()
SvxSwAutoFmtFlags* SwEditShell::GetAutoFmtFlags()
{
- if (!pAutoFmtFlags)
- pAutoFmtFlags = new SvxSwAutoFmtFlags;
+ if (!s_pAutoFmtFlags)
+ s_pAutoFmtFlags = new SvxSwAutoFmtFlags;
- return pAutoFmtFlags;
+ return s_pAutoFmtFlags;
}
void SwEditShell::SetAutoFmtFlags(SvxSwAutoFmtFlags * pFlags)
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 3700e2c..8320085 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -148,25 +148,25 @@ bool SwEditShell::HasOtherCnt() const
// access control functions for file name handling
SwActContext::SwActContext(SwEditShell *pShell)
- : pSh(pShell)
+ : m_rShell(*pShell)
{
- pSh->StartAction();
+ m_rShell.StartAction();
}
SwActContext::~SwActContext()
{
- pSh->EndAction();
+ m_rShell.EndAction();
}
SwMvContext::SwMvContext(SwEditShell *pShell)
- : pSh(pShell)
+ : m_rShell(*pShell)
{
- pSh->SttCrsrMove();
+ m_rShell.SttCrsrMove();
}
SwMvContext::~SwMvContext()
{
- pSh->EndCrsrMove();
+ m_rShell.EndCrsrMove();
}
SwFrmFmt *SwEditShell::GetTableFmt() // fastest test on a table
commit 3e7431f535f1c05ff730b0e3a67c2affe035b509
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Mar 30 23:14:24 2015 +0200
sw: SwDocShell::aFinishedTimer dead since 2006
becf02e58637276ab80227ffb19aa01c86e4962d removed the last use
Change-Id: Ib72a36961dbe4c6218125f48ed251be964016f9d
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index d3da31f..1193638 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -22,7 +22,6 @@
#include <rtl/ref.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/uno/Sequence.h>
-#include <vcl/timer.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/objsh.hxx>
#include "swdllapi.h"
@@ -49,7 +48,6 @@ class SwgReaderOption;
class SwOLEObj;
class IDocumentDeviceAccess;
class IDocumentSettingAccess;
-class IDocumentTimerAccess;
class IDocumentChartDataProviderAccess;
class SwDocShell;
class SwDrawModel;
@@ -75,9 +73,6 @@ class SW_DLLPUBLIC SwDocShell
SwView* m_pView;
SwWrtShell* m_pWrtShell;
- Timer m_FinishedTimer; /**< Timer for checking graphics-links.
- If all are present, the doc is loaded completely. */
-
comphelper::EmbeddedObjectContainer* m_pOLEChildList;
sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode
bool m_IsATemplate; ///< prevent nested calls of UpdateFontList
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index b354fad..0150587 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1108,7 +1108,6 @@ void SwDocShell::LoadingFinished()
void SwDocShell::CancelTransfers()
{
// Cancel all links from LinkManager
- m_FinishedTimer.Stop();
m_pDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers();
SfxObjectShell::CancelTransfers();
}
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index ef140a6..7d90204 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -447,7 +447,6 @@ void SwDocShell::RemoveLink()
// disconnect Uno-Object
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
static_cast<SwXTextDocument*>(xDoc.get())->Invalidate();
- m_FinishedTimer.Stop();
if (m_pDoc)
{
if (m_xBasePool.is())
diff --git a/sw/source/uibase/wrtsh/docsh.cxx b/sw/source/uibase/wrtsh/docsh.cxx
index 904efeb..f5e871c 100644
--- a/sw/source/uibase/wrtsh/docsh.cxx
+++ b/sw/source/uibase/wrtsh/docsh.cxx
@@ -13,7 +13,7 @@
#include <wrtsh.hxx>
SwEditShell * SwDocShell::GetEditShell() {
- return mpWrtShell;
+ return m_pWrtShell;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b9301e9dc93f5961bd83a76410f91174316c99b3
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Mar 30 23:04:01 2015 +0200
sw: prefix members of SwDocShell
Change-Id: I9a9797c96dfdbf5ca464f863517abd9001845015
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 52db867..d3da31f 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -58,29 +58,31 @@ class SwDrawModel;
// as needed, one or both parameters may be zero
void SAL_DLLPRIVATE InitDrawModelAndDocShell(SwDocShell* pSwDocShell, SwDrawModel* pSwDrawModel);
-class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
+class SW_DLLPUBLIC SwDocShell
+ : public SfxObjectShell
+ , public SfxListener
{
- SwDoc* mpDoc; ///< Document.
- rtl::Reference< SfxStyleSheetBasePool > mxBasePool; ///< Passing through for formats.
- FontList* mpFontList; ///< Current Fontlist.
- bool mbInUpdateFontList; ///< prevent nested calls of UpdateFontList
+ SwDoc* m_pDoc; ///< Document.
+ rtl::Reference< SfxStyleSheetBasePool > m_xBasePool; ///< Passing through for formats.
+ FontList* m_pFontList; ///< Current Fontlist.
+ bool m_IsInUpdateFontList; ///< prevent nested calls of UpdateFontList
/** For "historical reasons" nothing can be done without the WrtShell.
Back-pointer on View (again "for historical reasons").
Back-pointer is valid until in Activate a new one is set
or until it is deleted in the View's Dtor. */
- SwView* mpView;
- SwWrtShell* mpWrtShell;
+ SwView* m_pView;
+ SwWrtShell* m_pWrtShell;
- Timer aFinishedTimer; /**< Timer for checking graphics-links.
- If all are present, the doc is loaded completely. */
+ Timer m_FinishedTimer; /**< Timer for checking graphics-links.
+ If all are present, the doc is loaded completely. */
- comphelper::EmbeddedObjectContainer* mpOLEChildList;
- sal_Int16 mnUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode
- bool bIsATemplate; ///< prevent nested calls of UpdateFontList
+ comphelper::EmbeddedObjectContainer* m_pOLEChildList;
+ sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode
+ bool m_IsATemplate; ///< prevent nested calls of UpdateFontList
- bool mbRemovedInvisibleContent;
+ bool m_IsRemovedInvisibleContent;
///< whether SID_MAIL_PREPAREEXPORT removed content that
///< SID_MAIL_EXPORT_FINISHED needs to restore
@@ -199,8 +201,8 @@ public:
void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = 0 );
/// returns Doc. But be careful!
- inline SwDoc* GetDoc() { return mpDoc; }
- inline const SwDoc* GetDoc() const { return mpDoc; }
+ inline SwDoc* GetDoc() { return m_pDoc; }
+ inline const SwDoc* GetDoc() const { return m_pDoc; }
IDocumentDeviceAccess* getIDocumentDeviceAccess();
const IDocumentSettingAccess* getIDocumentSettingAccess() const;
IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
@@ -216,12 +218,12 @@ public:
/// Set View for actions via Shell.
void SetView(SwView* pVw);
- const SwView *GetView() const { return mpView; }
- SwView *GetView() { return mpView; }
+ const SwView *GetView() const { return m_pView; }
+ SwView *GetView() { return m_pView; }
/// Accress to the SwWrtShell belonging to SwView.
- SwWrtShell *GetWrtShell() { return mpWrtShell; }
- const SwWrtShell *GetWrtShell() const { return mpWrtShell; }
+ SwWrtShell *GetWrtShell() { return m_pWrtShell; }
+ const SwWrtShell *GetWrtShell() const { return m_pWrtShell; }
// Same as GetWrtShell, but return pointer to SwEditShell base of
// (potentially incomplete) SwWrtShell:
SwEditShell * GetEditShell();
@@ -279,7 +281,7 @@ public:
/// Re-read Doc from Html-source.
void ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView );
- sal_Int16 GetUpdateDocMode() const {return mnUpdateDocMode;}
+ sal_Int16 GetUpdateDocMode() const { return m_nUpdateDocMode; }
void ToggleBrowserMode(bool bOn, SwView* pView);
@@ -302,8 +304,8 @@ public:
GetController();
SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
- SAL_DLLPRIVATE bool IsTemplate() { return bIsATemplate; }
- SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
+ SAL_DLLPRIVATE bool IsTemplate() { return m_IsATemplate; }
+ SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { m_IsATemplate = bValue; }
virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const SAL_OVERRIDE;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index d6e2d9a..b354fad 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -185,14 +185,14 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
*ppRdr = pPaM ? new SwReader( rMedium, aFileName, *pPaM ) :
pCrsrShell ?
new SwReader( rMedium, aFileName, *pCrsrShell->GetCrsr() )
- : new SwReader( rMedium, aFileName, mpDoc );
+ : new SwReader( rMedium, aFileName, m_pDoc );
}
else
return 0;
// #i30171# set the UpdateDocMode at the SwDocShell
SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false);
- mnUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE;
+ m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE;
if (!pFlt->GetDefaultTemplate().isEmpty())
pRead->SetTemplateName( pFlt->GetDefaultTemplate() );
@@ -223,7 +223,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
return false; // #129881# return if no reader is found
SotStorageRef pStg=pRead->getSotStorageRef(); // #i45333# save sot storage ref in case of recursive calls
- mpDoc->setDocAccTitle(OUString());
+ m_pDoc->setDocAccTitle(OUString());
SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
if (pFrame1)
{
@@ -246,24 +246,24 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
pRdr->GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, ISA(SwWebDocShell));
// Restore the pool default if reading a saved document.
- mpDoc->RemoveAllFmtLanguageDependencies();
+ m_pDoc->RemoveAllFmtLanguageDependencies();
sal_uLong nErr = pRdr->Read( *pRead );
// Maybe put away one old Doc
- if ( mpDoc != pRdr->GetDoc() )
+ if (m_pDoc != pRdr->GetDoc())
{
RemoveLink();
- mpDoc = pRdr->GetDoc();
+ m_pDoc = pRdr->GetDoc();
AddLink();
- if ( !mxBasePool.is() )
- mxBasePool = new SwDocStyleSheetPool( *mpDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
+ if (!m_xBasePool.is())
+ m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
}
UpdateFontList();
- InitDrawModelAndDocShell(this, mpDoc ? mpDoc->getIDocumentDrawModelAccess().GetDrawModel() : 0);
+ InitDrawModelAndDocShell(this, m_pDoc ? m_pDoc->getIDocumentDrawModelAccess().GetDrawModel() : 0);
delete pRdr;
@@ -272,7 +272,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
SetError( nErr, OUString( OSL_LOG_PREFIX ) );
bool bOk = !IsError( nErr );
- if ( bOk && !mpDoc->IsInLoadAsynchron() )
+ if (bOk && !m_pDoc->IsInLoadAsynchron())
{
LoadingFinished();
}
@@ -286,18 +286,18 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
bool SwDocShell::Save()
{
//#i3370# remove quick help to prevent saving of autocorrection suggestions
- if(mpView)
- mpView->GetEditWin().StopQuickHelp();
+ if (m_pView)
+ m_pView->GetEditWin().StopQuickHelp();
SwWait aWait( *this, true );
CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
- if ( mpWrtShell && mpDoc &&
- mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
- docfunc::AllDrawObjsOnPage( *mpDoc ) )
+ if (m_pWrtShell && m_pDoc &&
+ m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
+ docfunc::AllDrawObjsOnPage(*m_pDoc))
{
- mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
+ m_pDoc->getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
}
sal_uLong nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE;
@@ -314,7 +314,7 @@ bool SwDocShell::Save()
WriterRef xWrt;
::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
xWrt->SetOrganizerMode( true );
- SwWriter aWrt( *GetMedium(), *mpDoc );
+ SwWriter aWrt( *GetMedium(), *m_pDoc );
nErr = aWrt.Write( xWrt );
xWrt->SetOrganizerMode( false );
}
@@ -329,32 +329,32 @@ bool SwDocShell::Save()
case SFX_CREATE_MODE_PREVIEW:
default:
{
- if( mpDoc->ContainsMSVBasic() )
+ if (m_pDoc->ContainsMSVBasic())
{
if( SvtFilterOptions::Get().IsLoadWordBasicStorage() )
nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) (*this) );
- mpDoc->SetContainsMSVBasic( false );
+ m_pDoc->SetContainsMSVBasic( false );
}
// End TableBox Edit!
- if( mpWrtShell )
- mpWrtShell->EndAllTblBoxEdit();
+ if (m_pWrtShell)
+ m_pWrtShell->EndAllTblBoxEdit();
WriterRef xWrt;
::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
bool bLockedView(false);
- if ( mpWrtShell )
+ if (m_pWrtShell)
{
- bLockedView = mpWrtShell->IsViewLocked();
- mpWrtShell->LockView( true ); //lock visible section
+ bLockedView = m_pWrtShell->IsViewLocked();
+ m_pWrtShell->LockView( true ); //lock visible section
}
- SwWriter aWrt( *GetMedium(), *mpDoc );
+ SwWriter aWrt( *GetMedium(), *m_pDoc );
nErr = aWrt.Write( xWrt );
- if ( mpWrtShell )
- mpWrtShell->LockView( bLockedView );
+ if (m_pWrtShell)
+ m_pWrtShell->LockView( bLockedView );
}
break;
}
@@ -362,7 +362,8 @@ bool SwDocShell::Save()
}
SetError( nErr ? nErr : nVBWarning, OUString( OSL_LOG_PREFIX ) );
- SfxViewFrame* pFrm = mpWrtShell ? mpWrtShell->GetView().GetViewFrame() : 0;
+ SfxViewFrame *const pFrm =
+ (m_pWrtShell) ? m_pWrtShell->GetView().GetViewFrame() : nullptr;
if( pFrm )
{
pFrm->GetBindings().SetState(SfxBoolItem(SID_DOC_MODIFIED, false));
@@ -375,19 +376,19 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
{
SwWait aWait( *this, true );
//#i3370# remove quick help to prevent saving of autocorrection suggestions
- if(mpView)
- mpView->GetEditWin().StopQuickHelp();
+ if (m_pView)
+ m_pView->GetEditWin().StopQuickHelp();
//#i91811# mod if we have an active margin window, write back the text
- if ( mpView &&
- mpView->GetPostItMgr() &&
- mpView->GetPostItMgr()->HasActiveSidebarWin() )
+ if (m_pView &&
+ m_pView->GetPostItMgr() &&
+ m_pView->GetPostItMgr()->HasActiveSidebarWin())
{
- mpView->GetPostItMgr()->UpdateDataOnActiveSidebarWin();
+ m_pView->GetPostItMgr()->UpdateDataOnActiveSidebarWin();
}
- if( mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::GLOBAL_DOCUMENT) &&
- !mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::GLOBAL_DOCUMENT_SAVE_LINKS) )
+ if (m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::GLOBAL_DOCUMENT) &&
+ !m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::GLOBAL_DOCUMENT_SAVE_LINKS))
RemoveOLEObjects();
{
@@ -413,11 +414,11 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
- if ( mpWrtShell &&
- mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
- docfunc::AllDrawObjsOnPage( *mpDoc ) )
+ if (m_pWrtShell &&
+ m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
+ docfunc::AllDrawObjsOnPage(*m_pDoc))
{
- mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
+ m_pDoc->getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
}
sal_uLong nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE;
@@ -440,23 +441,23 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
xDocSh->DoClose();
}
- if( mpDoc->ContainsMSVBasic() )
+ if (m_pDoc->ContainsMSVBasic())
{
if( SvtFilterOptions::Get().IsLoadWordBasicStorage() )
nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) *this );
- mpDoc->SetContainsMSVBasic( false );
+ m_pDoc->SetContainsMSVBasic( false );
}
// End TableBox Edit!
- if( mpWrtShell )
- mpWrtShell->EndAllTblBoxEdit();
+ if (m_pWrtShell)
+ m_pWrtShell->EndAllTblBoxEdit();
// Remember and preserve Modified-Flag without calling the Link
// (for OLE; after Statement from MM)
- bool bIsModified = mpDoc->getIDocumentState().IsModified();
- mpDoc->GetIDocumentUndoRedo().LockUndoNoModifiedPosition();
- Link aOldOLELnk( mpDoc->GetOle2Link() );
- mpDoc->SetOle2Link( Link() );
+ bool bIsModified = m_pDoc->getIDocumentState().IsModified();
+ m_pDoc->GetIDocumentUndoRedo().LockUndoNoModifiedPosition();
+ Link aOldOLELnk( m_pDoc->GetOle2Link() );
+ m_pDoc->SetOle2Link( Link() );
// Suppress SfxProgress when we are Embedded
SW_MOD()->SetEmbeddedLoadSave(
@@ -466,29 +467,29 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
::GetXMLWriter( aEmptyOUStr, rMedium.GetBaseURL( true ), xWrt );
bool bLockedView(false);
- if ( mpWrtShell )
+ if (m_pWrtShell)
{
- bLockedView = mpWrtShell->IsViewLocked();
- mpWrtShell->LockView( true ); //lock visible section
+ bLockedView = m_pWrtShell->IsViewLocked();
+ m_pWrtShell->LockView( true ); //lock visible section
}
- SwWriter aWrt( rMedium, *mpDoc );
+ SwWriter aWrt( rMedium, *m_pDoc );
nErr = aWrt.Write( xWrt );
- if (mpWrtShell)
- mpWrtShell->LockView( bLockedView );
+ if (m_pWrtShell)
+ m_pWrtShell->LockView( bLockedView );
if( bIsModified )
{
- mpDoc->getIDocumentState().SetModified();
- mpDoc->GetIDocumentUndoRedo().UnLockUndoNoModifiedPosition();
+ m_pDoc->getIDocumentState().SetModified();
+ m_pDoc->GetIDocumentUndoRedo().UnLockUndoNoModifiedPosition();
}
- mpDoc->SetOle2Link( aOldOLELnk );
+ m_pDoc->SetOle2Link( aOldOLELnk );
SW_MOD()->SetEmbeddedLoadSave( false );
// Increase RSID
- mpDoc->setRsid( mpDoc->getRsid() );
+ m_pDoc->setRsid( m_pDoc->getRsid() );
}
SetError( nErr ? nErr : nVBWarning, OUString( OSL_LOG_PREFIX ) );
@@ -520,20 +521,20 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
//#i3370# remove quick help to prevent saving of autocorrection suggestions
- if(mpView)
- mpView->GetEditWin().StopQuickHelp();
+ if (m_pView)
+ m_pView->GetEditWin().StopQuickHelp();
//#i91811# mod if we have an active margin window, write back the text
- if ( mpView &&
- mpView->GetPostItMgr() &&
- mpView->GetPostItMgr()->HasActiveSidebarWin() )
+ if (m_pView &&
+ m_pView->GetPostItMgr() &&
+ m_pView->GetPostItMgr()->HasActiveSidebarWin())
{
- mpView->GetPostItMgr()->UpdateDataOnActiveSidebarWin();
+ m_pView->GetPostItMgr()->UpdateDataOnActiveSidebarWin();
}
sal_uLong nVBWarning = 0;
- if( mpDoc->ContainsMSVBasic() )
+ if (m_pDoc->ContainsMSVBasic())
{
bool bSave = pFlt->GetUserData() == "CWW8"
&& SvtFilterOptions::Get().IsLoadWordBasicStorage();
@@ -546,14 +547,14 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
{
nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, OUString("Macros") );
xStg->Commit();
- mpDoc->SetContainsMSVBasic( true );
+ m_pDoc->SetContainsMSVBasic( true );
}
}
}
// End TableBox Edit!
- if( mpWrtShell )
- mpWrtShell->EndAllTblBoxEdit();
+ if (m_pWrtShell)
+ m_pWrtShell->EndAllTblBoxEdit();
if( pFlt->GetUserData() == "HTML" )
{
@@ -584,16 +585,16 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
// #i76360# Update document statistics
- mpDoc->getIDocumentStatistics().UpdateDocStat( false, true );
+ m_pDoc->getIDocumentStatistics().UpdateDocStat( false, true );
CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
- if ( mpWrtShell &&
- mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
- docfunc::AllDrawObjsOnPage( *mpDoc ) )
+ if (m_pWrtShell &&
+ m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
+ docfunc::AllDrawObjsOnPage(*m_pDoc))
{
- mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
+ m_pDoc->getIDocumentSettingAccess().set(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
}
if( xWriter->IsStgWriter() &&
@@ -666,7 +667,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
if( pFlt->GetUserData() == FILTER_TEXT_DLG &&
- ( mpWrtShell || !::lcl_GetSourceView( this ) ))
+ (m_pWrtShell || !::lcl_GetSourceView(this)))
{
SwAsciiOptions aOpt;
OUString sItemOpt;
@@ -693,23 +694,23 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
const OUString aFileName( rMedium.GetName() );
// No View, so the whole Document!
- if ( mpWrtShell && !Application::IsHeadlessModeEnabled() )
+ if (m_pWrtShell && !Application::IsHeadlessModeEnabled())
{
SwWait aWait( *this, true );
// #i106906#
- const bool bFormerLockView = mpWrtShell->IsViewLocked();
- mpWrtShell->LockView( true );
- mpWrtShell->StartAllAction();
- mpWrtShell->Push();
- SwWriter aWrt( rMedium, *mpWrtShell, true );
+ const bool bFormerLockView = m_pWrtShell->IsViewLocked();
+ m_pWrtShell->LockView( true );
+ m_pWrtShell->StartAllAction();
+ m_pWrtShell->Push();
+ SwWriter aWrt( rMedium, *m_pWrtShell, true );
nErrno = aWrt.Write( xWriter, &aFileName );
//JP 16.05.97: In case the SFX revokes the View while saving
- if( mpWrtShell )
+ if (m_pWrtShell)
{
- mpWrtShell->Pop(false);
- mpWrtShell->EndAllAction();
+ m_pWrtShell->Pop(false);
+ m_pWrtShell->EndAllAction();
// #i106906#
- mpWrtShell->LockView( bFormerLockView );
+ m_pWrtShell->LockView( bFormerLockView );
}
}
else
@@ -723,7 +724,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
else
{
- SwWriter aWrt( rMedium, *mpDoc );
+ SwWriter aWrt( rMedium, *m_pDoc );
nErrno = aWrt.Write( xWriter, &aFileName );
}
}
@@ -745,27 +746,27 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor
{
// Do not decide until here, whether Saving was successful or not
if( IsModified() )
- mpDoc->getIDocumentState().SetModified();
+ m_pDoc->getIDocumentState().SetModified();
else
- mpDoc->getIDocumentState().ResetModified();
+ m_pDoc->getIDocumentState().ResetModified();
}
- if (mpOLEChildList)
+ if (m_pOLEChildList)
{
bool bResetModified = IsEnableSetModified();
if( bResetModified )
EnableSetModified( false );
- uno::Sequence < OUString > aNames = mpOLEChildList->GetObjectNames();
+ uno::Sequence < OUString > aNames = m_pOLEChildList->GetObjectNames();
for( sal_Int32 n = aNames.getLength(); n; n-- )
{
- if ( !mpOLEChildList->MoveEmbeddedObject( aNames[n-1], GetEmbeddedObjectContainer() ) )
+ if (!m_pOLEChildList->MoveEmbeddedObject(aNames[n-1], GetEmbeddedObjectContainer()))
{
OSL_FAIL("Copying of objects didn't work!" );
}
}
- DELETEZ(mpOLEChildList);
+ DELETEZ(m_pOLEChildList);
if( bResetModified )
EnableSetModified( true );
}
@@ -788,10 +789,10 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
JobSetup *pOrig = 0;
if ( !rSetup.GetPrinterName().isEmpty() && ASPECT_THUMBNAIL != nAspect )
{
- pOrig = const_cast<JobSetup*>(mpDoc->getIDocumentDeviceAccess().getJobsetup());
+ pOrig = const_cast<JobSetup*>(m_pDoc->getIDocumentDeviceAccess().getJobsetup());
if( pOrig ) // then we copy that
pOrig = new JobSetup( *pOrig );
- mpDoc->getIDocumentDeviceAccess().setJobsetup( rSetup );
+ m_pDoc->getIDocumentDeviceAccess().setJobsetup( rSetup );
}
Rectangle aRect( nAspect == ASPECT_THUMBNAIL ?
@@ -803,12 +804,12 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
pDev->SetBackground();
const bool bWeb = this->ISA(SwWebDocShell);
SwPrintData aOpts;
- SwViewShell::PrtOle2( mpDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect );
+ SwViewShell::PrtOle2(m_pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect);
pDev->Pop();
if( pOrig )
{
- mpDoc->getIDocumentDeviceAccess().setJobsetup( *pOrig );
+ m_pDoc->getIDocumentDeviceAccess().setJobsetup( *pOrig );
delete pOrig;
}
if ( bResetModified )
@@ -818,9 +819,9 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
void SwDocShell::SetVisArea( const Rectangle &rRect )
{
Rectangle aRect( rRect );
- if (mpView)
+ if (m_pView)
{
- Size aSz( mpView->GetDocSz() );
+ Size aSz( m_pView->GetDocSz() );
aSz.Width() += DOCUMENTBORDER; aSz.Height() += DOCUMENTBORDER;
long nMoveX = 0, nMoveY = 0;
if ( aRect.Right() > aSz.Width() )
@@ -833,7 +834,7 @@ void SwDocShell::SetVisArea( const Rectangle &rRect )
aRect.Move( nMoveX, nMoveY );
// Calls SfxInPlaceObject::SetVisArea()!
- mpView->SetVisArea( aRect, true );
+ m_pView->SetVisArea( aRect, true );
}
else
SfxObjectShell::SetVisArea( aRect );
@@ -844,8 +845,8 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const
if ( nAspect == ASPECT_THUMBNAIL )
{
// Preview: set VisArea to the first page.
- SwNodeIndex aIdx( mpDoc->GetNodes().GetEndOfExtras(), 1 );
- SwCntntNode* pNd = mpDoc->GetNodes().GoNext( &aIdx );
+ SwNodeIndex aIdx( m_pDoc->GetNodes().GetEndOfExtras(), 1 );
+ SwCntntNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx );
const SwRect aPageRect = pNd->FindPageFrmRect( false, 0, false );
return aPageRect.SVRect();
@@ -855,12 +856,12 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const
Printer *SwDocShell::GetDocumentPrinter()
{
- return mpDoc->getIDocumentDeviceAccess().getPrinter( false );
+ return m_pDoc->getIDocumentDeviceAccess().getPrinter( false );
}
OutputDevice* SwDocShell::GetDocumentRefDev()
{
- return mpDoc->getIDocumentDeviceAccess().getReferenceDevice( false );
+ return m_pDoc->getIDocumentDeviceAccess().getReferenceDevice( false );
}
void SwDocShell::OnDocumentPrinterChanged( Printer * pNewPrinter )
@@ -1003,7 +1004,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
case SID_ATTR_YEAR2000:
{
- const SvNumberFormatter* pFmtr = mpDoc->GetNumberFormatter(false);
+ const SvNumberFormatter* pFmtr = m_pDoc->GetNumberFormatter(false);
rSet.Put( SfxUInt16Item( nWhich,
static_cast< sal_uInt16 >(
pFmtr ? pFmtr->GetYear2000()
@@ -1012,14 +1013,14 @@ void SwDocShell::GetState(SfxItemSet& rSet)
break;
case SID_ATTR_CHAR_FONTLIST:
{
- rSet.Put( SvxFontListItem( mpFontList, SID_ATTR_CHAR_FONTLIST ) );
+ rSet.Put( SvxFontListItem(m_pFontList, SID_ATTR_CHAR_FONTLIST) );
}
break;
case SID_MAIL_PREPAREEXPORT:
{
//check if linked content or possibly hidden content is available
- //mpDoc->UpdateFlds( NULL, false );
- sfx2::LinkManager& rLnkMgr = mpDoc->getIDocumentLinksAdministration().GetLinkManager();
+ //m_pDoc->UpdateFlds( NULL, false );
+ sfx2::LinkManager& rLnkMgr = m_pDoc->getIDocumentLinksAdministration().GetLinkManager();
const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
bool bRet = false;
if( !rLnks.empty() )
@@ -1027,7 +1028,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
else
{
//sections with hidden flag, hidden character attribute, hidden paragraph/text or conditional text fields
- bRet = mpDoc->HasInvisibleContent();
+ bRet = m_pDoc->HasInvisibleContent();
}
rSet.Put( SfxBoolItem( nWhich, bRet ) );
}
@@ -1055,16 +1056,17 @@ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p )
// return Pool here, because virtual
SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool()
{
- return mxBasePool.get();
+ return m_xBasePool.get();
}
void SwDocShell::SetView(SwView* pVw)
{
SetViewShell_Impl(pVw);
- if ( 0 != (mpView = pVw) )
- mpWrtShell = &mpView->GetWrtShell();
+ m_pView = pVw;
+ if (m_pView)
+ m_pWrtShell = &m_pView->GetWrtShell();
else
- mpWrtShell = 0;
+ m_pWrtShell = 0;
}
void SwDocShell::PrepareReload()
@@ -1084,7 +1086,7 @@ void SwDocShell::LoadingFinished()
// enables the document modification again.
// Thus, manuell modify the document, if its modified and its links are updated
// before <FinishedLoading(..)> is called.
- const bool bHasDocToStayModified( mpDoc->getIDocumentState().IsModified() && mpDoc->getIDocumentLinksAdministration().LinksUpdated() );
+ const bool bHasDocToStayModified( m_pDoc->getIDocumentState().IsModified() && m_pDoc->getIDocumentLinksAdministration().LinksUpdated() );
FinishedLoading( SFX_LOADED_ALL );
SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this);
@@ -1096,9 +1098,9 @@ void SwDocShell::LoadingFinished()
}
// #i38810#
- if ( bHasDocToStayModified && !mpDoc->getIDocumentState().IsModified() )
+ if ( bHasDocToStayModified && !m_pDoc->getIDocumentState().IsModified() )
{
- mpDoc->getIDocumentState().SetModified();
+ m_pDoc->getIDocumentState().SetModified();
}
}
@@ -1106,30 +1108,30 @@ void SwDocShell::LoadingFinished()
void SwDocShell::CancelTransfers()
{
// Cancel all links from LinkManager
- aFinishedTimer.Stop();
- mpDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers();
+ m_FinishedTimer.Stop();
+ m_pDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers();
SfxObjectShell::CancelTransfers();
}
SwFEShell* SwDocShell::GetFEShell()
{
- return mpWrtShell;
+ return m_pWrtShell;
}
void SwDocShell::RemoveOLEObjects()
{
- SwIterator<SwCntntNode,SwFmtColl> aIter( *mpDoc->GetDfltGrfFmtColl() );
+ SwIterator<SwCntntNode,SwFmtColl> aIter( *m_pDoc->GetDfltGrfFmtColl() );
for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
{
SwOLENode* pOLENd = pNd->GetOLENode();
if( pOLENd && ( pOLENd->IsOLEObjectDeleted() ||
pOLENd->IsInGlobalDocSection() ) )
{
- if( !mpOLEChildList )
- mpOLEChildList = new comphelper::EmbeddedObjectContainer;
+ if (!m_pOLEChildList)
+ m_pOLEChildList = new comphelper::EmbeddedObjectContainer;
OUString aObjName = pOLENd->GetOLEObj().GetCurrentPersistName();
- GetEmbeddedObjectContainer().MoveEmbeddedObject( aObjName, *mpOLEChildList );
+ GetEmbeddedObjectContainer().MoveEmbeddedObject( aObjName, *m_pOLEChildList );
}
}
}
@@ -1143,16 +1145,16 @@ void SwDocShell::RemoveOLEObjects()
// saved, but of course only id there are OLE objects with bOLESizeInvalid set.
void SwDocShell::CalcLayoutForOLEObjects()
{
- if( !mpWrtShell )
+ if (!m_pWrtShell)
return;
- SwIterator<SwCntntNode,SwFmtColl> aIter( *mpDoc->GetDfltGrfFmtColl() );
+ SwIterator<SwCntntNode,SwFmtColl> aIter( *m_pDoc->GetDfltGrfFmtColl() );
for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
{
SwOLENode* pOLENd = pNd->GetOLENode();
if( pOLENd && pOLENd->IsOLESizeInvalid() )
{
- mpWrtShell->CalcLayout();
+ m_pWrtShell->CalcLayout();
break;
}
}
@@ -1218,24 +1220,24 @@ OUString SwDocShell::GetEventName( sal_Int32 nIndex )
const ::sfx2::IXmlIdRegistry* SwDocShell::GetXmlIdRegistry() const
{
- return mpDoc ? &mpDoc->GetXmlIdRegistry() : 0;
+ return m_pDoc ? &m_pDoc->GetXmlIdRegistry() : 0;
}
bool SwDocShell::IsChangeRecording() const
{
- return (mpWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0;
+ return (m_pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0;
}
bool SwDocShell::HasChangeRecordProtection() const
{
- return mpWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0;
+ return m_pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0;
}
void SwDocShell::SetChangeRecording( bool bActivate )
{
sal_uInt16 nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0;
- sal_uInt16 nMode = mpWrtShell->GetRedlineMode();
- mpWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn);
+ sal_uInt16 nMode = m_pWrtShell->GetRedlineMode();
+ m_pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn);
}
bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword )
@@ -1244,7 +1246,7 @@ bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword )
const SfxItemSet* pArgs = &aSet;
const SfxPoolItem* pItem = NULL;
- IDocumentRedlineAccess* pIDRA = mpWrtShell->getIDocumentRedlineAccess();
+ IDocumentRedlineAccess* pIDRA = m_pWrtShell->getIDocumentRedlineAccess();
Sequence< sal_Int8 > aPasswd = pIDRA->GetRedlinePassword();
if (pArgs && SfxItemState::SET == pArgs->GetItemState( FN_REDLINE_PROTECT, false, &pItem )
&& static_cast<const SfxBoolItem*>(pItem)->GetValue() == (aPasswd.getLength() > 0))
@@ -1279,7 +1281,7 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal
const SfxItemSet* pArgs = &aSet;
const SfxPoolItem* pItem = NULL;
- IDocumentRedlineAccess* pIDRA = mpWrtShell->getIDocumentRedlineAccess();
+ IDocumentRedlineAccess* pIDRA = m_pWrtShell->getIDocumentRedlineAccess();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list