[Libreoffice-commits] core.git: 2 commits - basctl/inc chart2/source cui/source extensions/inc extensions/source formula/inc formula/Library_forui.mk formula/source include/sfx2 include/svx include/xmloff reportdesign/inc sc/inc sd/source sfx2/source starmath/inc svx/inc svx/source sw/source ucb/source unotools/source vcl/inc xmloff/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Jun 6 07:02:07 UTC 2016
basctl/inc/basidesh.hrc | 3
chart2/source/controller/inc/ShapeController.hrc | 4
cui/source/inc/cuires.hrc | 2
extensions/inc/propctrlr.hrc | 10 --
extensions/source/bibliography/bib.hrc | 4
extensions/source/dbpilots/dbpresid.hrc | 2
extensions/source/propctrlr/listselectiondlg.hrc | 2
formula/Library_forui.mk | 1
formula/inc/helpids.hrc | 30 ------
formula/source/ui/dlg/formdlgs.hrc | 3
formula/source/ui/dlg/formdlgs.src | 1
formula/source/ui/dlg/parawin.cxx | 1
formula/source/ui/dlg/parawin.src | 1
include/sfx2/sfx.hrc | 5 -
include/sfx2/sidebar/ResourceDefinitions.hrc | 3
include/svx/AccessibleControlShape.hxx | 2
include/svx/dialogs.hrc | 18 ---
include/svx/dlgctrl.hxx | 2
include/svx/fmshell.hxx | 4
include/svx/fmtools.hxx | 5 -
include/svx/fmview.hxx | 4
include/svx/graphctl.hxx | 2
include/svx/gridctrl.hxx | 2
include/svx/svdmodel.hxx | 4
include/svx/svdotable.hxx | 2
include/svx/svxids.hrc | 28 -----
include/svx/unoshtxt.hxx | 5 -
include/xmloff/shapeimport.hxx | 12 +-
include/xmloff/xmlimp.hxx | 2
reportdesign/inc/RptResId.hrc | 4
reportdesign/inc/helpids.hrc | 5 -
sc/inc/sc.hrc | 25 -----
sd/source/ui/dlg/headerfooterdlg.cxx | 1
sd/source/ui/dlg/masterlayoutdlg.cxx | 1
sd/source/ui/inc/dialogs.hrc | 28 -----
sfx2/source/dialog/dialog.hrc | 3
sfx2/source/doc/doc.hrc | 2
sfx2/source/inc/helpid.hrc | 3
sfx2/source/inc/sfxlocal.hrc | 10 --
starmath/inc/starmath.hrc | 33 ------
svx/inc/float3d.hrc | 83 -----------------
svx/inc/helpid.hrc | 5 -
svx/source/accessibility/AccessibleControlShape.cxx | 4
svx/source/dialog/dlgctrl.cxx | 11 --
svx/source/dialog/graphctl.cxx | 10 --
svx/source/dialog/imapdlg.hrc | 7 -
svx/source/fmcomp/gridcell.cxx | 45 +++------
svx/source/fmcomp/gridctrl.cxx | 23 +---
svx/source/form/filtnav.cxx | 7 -
svx/source/form/fmshell.cxx | 3
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/fmtools.cxx | 15 ---
svx/source/form/fmview.cxx | 8 -
svx/source/form/formcontroller.cxx | 40 ++------
svx/source/form/formcontrolling.cxx | 8 -
svx/source/form/navigatortreemodel.cxx | 16 +--
svx/source/form/tabwin.cxx | 11 --
svx/source/inc/filtnav.hxx | 2
svx/source/inc/fmexpl.hxx | 2
svx/source/inc/formcontroller.hxx | 4
svx/source/inc/formcontrolling.hxx | 7 -
svx/source/inc/gridcell.hxx | 8 -
svx/source/inc/tabwin.hxx | 2
svx/source/sidebar/text/TextPropertyPanel.hrc | 1
svx/source/svdraw/svdmodel.cxx | 11 --
svx/source/table/svdotable.cxx | 73 +++++++-------
svx/source/unodraw/unoshtxt.cxx | 8 -
sw/source/uibase/inc/frmui.hrc | 1
sw/source/uibase/sidebar/PropertyPanel.hrc | 2
ucb/source/core/ucbstore.cxx | 25 +----
ucb/source/sorter/sortresult.cxx | 9 -
ucb/source/sorter/sortresult.hxx | 3
unotools/source/misc/eventlisteneradapter.cxx | 24 +---
vcl/inc/win/salids.hrc | 2
xmloff/source/core/xmlimp.cxx | 15 ---
xmloff/source/draw/sdxmlexp.cxx | 35 +------
xmloff/source/draw/sdxmlexp_impl.hxx | 10 +-
xmloff/source/draw/shapeimport.cxx | 29 +----
xmlsecurity/source/dialogs/certificateviewer.src | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 1
xmlsecurity/source/dialogs/helpids.hrc | 29 -----
82 files changed, 188 insertions(+), 696 deletions(-)
New commits:
commit 7d1b01070c330d45212cd69ea692b2263c23c2a6
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 2 14:53:50 2016 +0200
remove some manual ref counting in svx and xmloff
Change-Id: Ica0b6ff8ff7fa9e65cd758160d6e3ea7110ebb46
Reviewed-on: https://gerrit.libreoffice.org/25824
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index c419d22..d2c2ec0 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -183,7 +183,7 @@ private:
css::uno::Reference< css::lang::XComponent >
m_xControlContextComponent; // cached interface of our aggregate
- ::comphelper::OWrappedAccessibleChildrenManager*
+ rtl::Reference<::comphelper::OWrappedAccessibleChildrenManager>
m_pChildManager;
bool m_bListeningForName : 1; // are we currently listening for changes of the "Name" property?
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 45d600c..2e6aa4c 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -78,7 +78,7 @@ private:
SVX_DLLPRIVATE void Resize_Impl();
protected:
- SvxRectCtlAccessibleContext* pAccContext;
+ rtl::Reference<SvxRectCtlAccessibleContext> pAccContext;
sal_uInt16 nBorderWidth;
sal_uInt16 nRadius;
Size aSize;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 8f4d656..38b8c34 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -71,7 +71,7 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
friend class FmFormView;
friend class FmXFormShell;
- FmXFormShell* m_pImpl;
+ rtl::Reference<FmXFormShell> m_pImpl;
FmFormView* m_pFormView;
FmFormModel* m_pFormModel;
@@ -113,7 +113,7 @@ public:
FmFormView* GetFormView() const { return m_pFormView; }
FmFormModel* GetFormModel() const { return m_pFormModel; }
FmFormPage* GetCurPage() const;
- FmXFormShell* GetImpl() const {return m_pImpl;};
+ FmXFormShell* GetImpl() const {return m_pImpl.get();};
bool PrepareClose(bool bUI = true);
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index bd7696a..e122243 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -62,6 +62,7 @@
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
+#include <rtl/ref.hxx>
#include <tools/wintypes.hxx>
#include <cppuhelper/weakref.hxx>
#include <comphelper/uno3.hxx>
@@ -156,11 +157,11 @@ class SAL_WARN_UNUSED FmXDisposeListener
{
friend class FmXDisposeMultiplexer;
- FmXDisposeMultiplexer* m_pAdapter;
+ rtl::Reference<FmXDisposeMultiplexer> m_pAdapter;
::osl::Mutex& m_rMutex;
public:
- FmXDisposeListener(::osl::Mutex& _rMutex) : m_pAdapter(nullptr), m_rMutex(_rMutex) { }
+ FmXDisposeListener(::osl::Mutex& _rMutex) : m_rMutex(_rMutex) { }
virtual ~FmXDisposeListener();
virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) throw( css::uno::RuntimeException ) = 0;
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index dff8ce8..ed6e264 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace form {
class SVX_DLLPUBLIC FmFormView : public E3dView
{
- FmXFormView* pImpl;
+ rtl::Reference<FmXFormView> pImpl;
FmFormShell* pFormShell;
void Init();
@@ -130,7 +130,7 @@ public:
SVX_DLLPRIVATE void ChangeDesignMode(bool bDesign);
- SVX_DLLPRIVATE FmXFormView* GetImpl() const { return pImpl; }
+ SVX_DLLPRIVATE FmXFormView* GetImpl() const { return pImpl.get(); }
SVX_DLLPRIVATE FmFormShell* GetFormShell() const { return pFormShell; }
struct FormShellAccess { friend class FmFormShell; private: FormShellAccess() { } };
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index cf44b1c..3416a35 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -55,7 +55,7 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
DECL_LINK_TYPED( UpdateHdl, Idle*, void );
- SvxGraphCtrlAccessibleContext* mpAccContext;
+ rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
protected:
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index d23b7d0..2f3c409 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -237,7 +237,7 @@ private:
// if we modify the row for the new record, we automatically insert a "new new row".
// But if somebody else inserts a new record into the data source, we have to do the same.
// For that reason we have to listen to some properties of our data source.
- ::comphelper::OPropertyChangeMultiplexer* m_pDataSourcePropMultiplexer;
+ rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pDataSourcePropMultiplexer;
FmXGridSourcePropListener* m_pDataSourcePropListener;
css::uno::Reference< css::sdb::XRowsChangeListener>
m_xRowSetListener; // get notification when rows were changed
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index d906713..65889f4 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -220,7 +220,7 @@ private:
public:
sal_uInt16 nStarDrawPreviewMasterPageNum;
- SvxForbiddenCharactersTable* mpForbiddenCharactersTable;
+ rtl::Reference<SvxForbiddenCharactersTable> mpForbiddenCharactersTable;
SdrSwapGraphicsMode nSwapGraphicsMode;
SdrOutlinerCache* mpOutlinerCache;
@@ -567,7 +567,7 @@ public:
void setLock( bool bLock );
void SetForbiddenCharsTable( const rtl::Reference<SvxForbiddenCharactersTable>& xForbiddenChars );
- rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const { return mpForbiddenCharactersTable;}
+ const rtl::Reference<SvxForbiddenCharactersTable>& GetForbiddenCharsTable() const { return mpForbiddenCharactersTable;}
void SetCharCompressType( sal_uInt16 nType );
sal_uInt16 GetCharCompressType() const { return mnCharCompressType; }
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 5747e2b..e561f6d 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -303,7 +303,7 @@ private:
Rectangle maLogicRect;
private:
- SdrTableObjImpl* mpImpl;
+ rtl::Reference<SdrTableObjImpl> mpImpl;
};
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index 50d8cf8..f916314 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -52,7 +52,8 @@ public:
The window is necessary, since our views can display on multiple windows
*/
SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rViewWindow );
-
+ SvxTextEditSource(const SvxTextEditSource&) = delete;
+ SvxTextEditSource& operator=(const SvxTextEditSource&) = delete;
virtual ~SvxTextEditSource();
virtual SvxEditSource* Clone() const override;
@@ -83,7 +84,7 @@ public:
private:
SVX_DLLPRIVATE SvxTextEditSource( SvxTextEditSourceImpl* pImpl );
- SvxTextEditSourceImpl* mpImpl;
+ rtl::Reference<SvxTextEditSourceImpl> mpImpl;
};
#endif
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index aa4a7b4..db54f5c 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -270,9 +270,9 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceO
XMLShapeImportPageContextImpl* mpPageContext;
// PropertySetMappers and factory
- XMLSdPropHdlFactory* mpSdPropHdlFactory;
- SvXMLImportPropertyMapper* mpPropertySetMapper;
- SvXMLImportPropertyMapper* mpPresPagePropsMapper;
+ rtl::Reference<XMLSdPropHdlFactory> mpSdPropHdlFactory;
+ rtl::Reference<SvXMLImportPropertyMapper> mpPropertySetMapper;
+ rtl::Reference<SvXMLImportPropertyMapper> mpPresPagePropsMapper;
// contexts for Style and AutoStyle import
SvXMLStylesContext* mpStylesContext;
@@ -341,8 +341,8 @@ public:
void SetAutoStylesContext(SvXMLStylesContext* pNew);
// get factories and mappers
- SvXMLImportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; }
- SvXMLImportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; }
+ SvXMLImportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper.get(); }
+ SvXMLImportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper.get(); }
// this function is called whenever the implementation classes like to add this new
// shape to the given XShapes.
@@ -409,7 +409,7 @@ public:
/** queries the capability of the current model to create presentation shapes */
bool IsPresentationShapesSupported();
- XMLSdPropHdlFactory* GetSdPropHdlFactory() const { return mpSdPropHdlFactory; }
+ XMLSdPropHdlFactory* GetSdPropHdlFactory() const { return mpSdPropHdlFactory.get(); }
const rtl::Reference< XMLTableImport >& GetShapeTableImport();
};
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2261e47..7827177 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -151,7 +151,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
ProgressBarHelper *mpProgressBarHelper;
XMLEventImportHelper *mpEventImportHelper;
XMLErrors *mpXMLErrors;
- StyleMap *mpStyleMap;
+ rtl::Reference<StyleMap> mpStyleMap;
OUString msPackageProtocol;
SAL_DLLPRIVATE void InitCtor_();
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 6891b37..a71dfe6 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -117,7 +117,6 @@ AccessibleControlShape::AccessibleControlShape (
, m_bWaitingForControl( false )
{
m_pChildManager = new comphelper::OWrappedAccessibleChildrenManager( comphelper::getProcessComponentContext() );
- m_pChildManager->acquire();
osl_atomic_increment( &m_refCount );
{
@@ -128,8 +127,7 @@ AccessibleControlShape::AccessibleControlShape (
AccessibleControlShape::~AccessibleControlShape()
{
- m_pChildManager->release();
- m_pChildManager = nullptr;
+ m_pChildManager.clear();
if ( m_xControlContextProxy.is() )
m_xControlContextProxy->setDelegator( nullptr );
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 786c453..9ac13bb 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -70,7 +70,6 @@ Bitmap& SvxRectCtl::GetRectBitmap()
SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt,
sal_uInt16 nBorder, sal_uInt16 nCircle)
: Control(pParent, WB_BORDER | WB_TABSTOP)
- , pAccContext(nullptr)
, nBorderWidth(nBorder)
, nRadius(nCircle)
, eDefRP(eRpt)
@@ -110,8 +109,7 @@ void SvxRectCtl::dispose()
{
delete pBitmap;
- if( pAccContext )
- pAccContext->release();
+ pAccContext.clear();
Control::dispose();
}
@@ -567,7 +565,7 @@ void SvxRectCtl::GetFocus()
// Send the accessible focused event
Control::GetFocus();
// Send accessibility event.
- if(pAccContext)
+ if(pAccContext.is())
{
pAccContext->FireChildFocus(GetActualRP());
}
@@ -652,7 +650,7 @@ void SvxRectCtl::SetActualRP( RECT_POINT eNewRP )
Invalidate( Rectangle( aPtNew - Point( nRadius, nRadius ), aPtNew + Point( nRadius, nRadius ) ) );
// notify accessibility object about change
- if( pAccContext )
+ if( pAccContext.is() )
pAccContext->selectChild( eNewRP /* MT, bFireFocus */ );
}
@@ -718,11 +716,10 @@ Reference< XAccessible > SvxRectCtl::CreateAccessible()
if( xAccParent.is() )
{
pAccContext = new SvxRectCtlAccessibleContext( xAccParent, *this );
- pAccContext->acquire();
SetActualRP( GetActualRP() );
- return pAccContext;
+ return pAccContext.get();
}
else
return Reference< XAccessible >();
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index fac0708..05a687f 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -64,7 +64,6 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) :
bEditMode ( false ),
bSdrMode ( false ),
bAnim ( false ),
- mpAccContext ( nullptr ),
pModel ( nullptr ),
pView ( nullptr )
{
@@ -93,10 +92,10 @@ void GraphCtrl::dispose()
{
aUpdateIdle.Stop();
- if( mpAccContext )
+ if( mpAccContext.is() )
{
mpAccContext->disposing();
- mpAccContext->release();
+ mpAccContext.clear();
}
delete pView;
pView = nullptr;
@@ -166,7 +165,7 @@ void GraphCtrl::InitSdrModel()
pView->SetBufferedOverlayAllowed(true);
// Tell the accessibility object about the changes.
- if (mpAccContext != nullptr)
+ if (mpAccContext.is())
mpAccContext->setModelAndView (pModel, pView);
}
@@ -769,12 +768,11 @@ css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessib
xAccParent.is() )
{
mpAccContext = new SvxGraphCtrlAccessibleContext( xAccParent, *this );
- mpAccContext->acquire();
}
}
}
- return mpAccContext;
+ return mpAccContext.get();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b14cdd1..d83fb06 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -226,7 +226,6 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< css::bea
m_pCell = new FmXEditCell( this, *pCellControl );
}
}
- m_pCell->acquire();
m_pCell->init();
impl_toggleScriptManager_nothrow( true );
@@ -262,9 +261,9 @@ void DbGridColumn::impl_toggleScriptManager_nothrow( bool _bAttach )
void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter)
{
- if (FmXFilterCell* pCell = dynamic_cast<FmXFilterCell*>(m_pCell))
+ if (FmXFilterCell* pCell = dynamic_cast<FmXFilterCell*>(m_pCell.get()))
pCell->Update();
- else if (pRow && pRow->IsValid() && m_nFieldPos >= 0 && m_pCell && pRow->HasField(m_nFieldPos))
+ else if (pRow && pRow->IsValid() && m_nFieldPos >= 0 && m_pCell.is() && pRow->HasField(m_nFieldPos))
{
dynamic_cast<FmXDataCell&>(*m_pCell).UpdateFromField( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter );
}
@@ -273,13 +272,13 @@ void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumb
bool DbGridColumn::Commit()
{
bool bResult = true;
- if (!m_bInSave && m_pCell)
+ if (!m_bInSave && m_pCell.is())
{
m_bInSave = true;
bResult = m_pCell->Commit();
// store the data into the model
- FmXDataCell* pDataCell = dynamic_cast<FmXDataCell*>( m_pCell );
+ FmXDataCell* pDataCell = dynamic_cast<FmXDataCell*>( m_pCell.get() );
if (bResult && pDataCell)
{
Reference< css::form::XBoundComponent > xComp(m_xModel, UNO_QUERY);
@@ -300,25 +299,24 @@ DbGridColumn::~DbGridColumn()
void DbGridColumn::setModel(const css::uno::Reference< css::beans::XPropertySet >& _xModel)
{
- if ( m_pCell )
+ if ( m_pCell.is() )
impl_toggleScriptManager_nothrow( false );
m_xModel = _xModel;
- if ( m_pCell )
+ if ( m_pCell.is() )
impl_toggleScriptManager_nothrow( true );
}
void DbGridColumn::Clear()
{
- if ( m_pCell )
+ if ( m_pCell.is() )
{
impl_toggleScriptManager_nothrow( false );
m_pCell->dispose();
- m_pCell->release();
- m_pCell = nullptr;
+ m_pCell.clear();
}
m_xController = nullptr;
@@ -370,7 +368,7 @@ sal_Int16 DbGridColumn::SetAlignment(sal_Int16 _nAlign)
}
m_nAlign = _nAlign;
- if (m_pCell && m_pCell->isAlignedController())
+ if (m_pCell.is() && m_pCell->isAlignedController())
m_pCell->AlignControl(m_nAlign);
return m_nAlign;
@@ -411,7 +409,7 @@ void DbGridColumn::setLock(bool _bLock)
OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) const
{
OUString aText;
- if (m_pCell && dynamic_cast<const FmXFilterCell*>( m_pCell) != nullptr)
+ if (m_pCell.is() && dynamic_cast<const FmXFilterCell*>( m_pCell.get() ) != nullptr)
return aText;
if (!pRow || !pRow->IsValid())
@@ -429,7 +427,7 @@ OUString DbGridColumn::GetCellText(const Reference< css::sdb::XColumn >& xField,
OUString aText;
if (xField.is())
{
- FmXTextCell* pTextCell = dynamic_cast<FmXTextCell*>( m_pCell );
+ FmXTextCell* pTextCell = dynamic_cast<FmXTextCell*>( m_pCell.get() );
if (pTextCell)
aText = pTextCell->GetText(xField, xFormatter);
else if (m_bObject)
@@ -459,7 +457,7 @@ void DbGridColumn::Paint(OutputDevice& rDev,
bool bEnabled = ( rDev.GetOutDevType() != OUTDEV_WINDOW )
|| ( static_cast< vcl::Window& >( rDev ).IsEnabled() );
- FmXDataCell* pDataCell = dynamic_cast<FmXDataCell*>( m_pCell );
+ FmXDataCell* pDataCell = dynamic_cast<FmXDataCell*>( m_pCell.get() );
if (pDataCell)
{
if (!pRow || !pRow->IsValid())
@@ -495,7 +493,7 @@ void DbGridColumn::Paint(OutputDevice& rDev,
pDataCell->PaintFieldToCell(rDev, rRect, pRow->GetField( m_nFieldPos ).getColumn(), xFormatter);
}
}
- else if (!m_pCell)
+ else if (!m_pCell.is())
{
if (!pRow || !pRow->IsValid())
{
@@ -513,14 +511,14 @@ void DbGridColumn::Paint(OutputDevice& rDev,
rDev.DrawText(rRect, OUString(OBJECTTEXT), nStyle);
}
}
- else if ( dynamic_cast<const FmXFilterCell*>( m_pCell) != nullptr )
- static_cast< FmXFilterCell* >( m_pCell )->PaintCell( rDev, rRect );
+ else if ( dynamic_cast<const FmXFilterCell*>( m_pCell.get() ) != nullptr )
+ static_cast< FmXFilterCell* >( m_pCell.get() )->PaintCell( rDev, rRect );
}
void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat )
{
- if ( m_pCell )
+ if ( m_pCell.is() )
m_pCell->ImplInitWindow( rParent, _eInitWhat );
}
@@ -530,8 +528,6 @@ void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _
DbCellControl::DbCellControl( DbGridColumn& _rColumn )
:OPropertyChangeListener(m_aMutex)
- ,m_pModelChangeBroadcaster(nullptr)
- ,m_pFieldChangeBroadcaster(nullptr)
,m_bTransparent( false )
,m_bAlignedController( true )
,m_bAccessingValueProperty( false )
@@ -544,7 +540,6 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn )
{
// if our model's format key changes we want to propagate the new value to our windows
m_pModelChangeBroadcaster = new ::comphelper::OPropertyChangeMultiplexer(this, Reference< css::beans::XPropertySet > (_rColumn.getModel(), UNO_QUERY));
- m_pModelChangeBroadcaster->acquire();
// be listener for some common properties
implDoPropertyListening( FM_PROP_READONLY, false );
@@ -570,7 +565,6 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn )
if ( xField.is() )
{
m_pFieldChangeBroadcaster = new ::comphelper::OPropertyChangeMultiplexer(this, xField);
- m_pFieldChangeBroadcaster->acquire();
m_pFieldChangeBroadcaster->addProperty( FM_PROP_ISREADONLY );
}
}
@@ -613,13 +607,12 @@ void DbCellControl::doPropertyListening(const OUString& _rPropertyName)
implDoPropertyListening( _rPropertyName );
}
-static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster)
+static void lcl_clearBroadCaster(rtl::Reference<::comphelper::OPropertyChangeMultiplexer>& _pBroadcaster)
{
- if ( _pBroadcaster )
+ if ( _pBroadcaster.is() )
{
_pBroadcaster->dispose();
- _pBroadcaster->release();
- _pBroadcaster = nullptr;
+ _pBroadcaster.clear();
// no delete, this is done implicitly
}
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index c6d4877..a6043a6 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -129,7 +129,7 @@ class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
{
osl::Mutex m_aMutex;
DbGridControl& m_rParent;
- ::comphelper::OPropertyChangeMultiplexer* m_pRealListener;
+ rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pRealListener;
sal_uInt16 m_nId;
sal_Int16 m_nSuspended;
bool m_bDisposed : 1;
@@ -149,7 +149,6 @@ public:
GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Reference< XPropertySet >& _rField, sal_uInt16 _nId)
:OPropertyChangeListener(m_aMutex)
,m_rParent(_rParent)
- ,m_pRealListener(nullptr)
,m_nId(_nId)
,m_nSuspended(0)
,m_bDisposed(false)
@@ -158,7 +157,6 @@ GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Re
{
m_pRealListener = new ::comphelper::OPropertyChangeMultiplexer(this, _rField);
m_pRealListener->addProperty(FM_PROP_VALUE);
- m_pRealListener->acquire();
}
}
@@ -178,15 +176,14 @@ void GridFieldValueListener::dispose()
{
if (m_bDisposed)
{
- DBG_ASSERT(m_pRealListener == nullptr, "GridFieldValueListener::dispose : inconsistent !");
+ DBG_ASSERT(m_pRealListener.get() == nullptr, "GridFieldValueListener::dispose : inconsistent !");
return;
}
- if (m_pRealListener)
+ if (m_pRealListener.is())
{
m_pRealListener->dispose();
- m_pRealListener->release();
- m_pRealListener = nullptr;
+ m_pRealListener.clear();
}
m_bDisposed = true;
@@ -947,7 +944,6 @@ DbGridControl::DbGridControl(
,m_xContext(_rxContext)
,m_aBar(VclPtr<DbGridControl::NavigationBar>::Create(this))
,m_nAsynAdjustEvent(nullptr)
- ,m_pDataSourcePropMultiplexer(nullptr)
,m_pDataSourcePropListener(nullptr)
,m_pFieldListeners(nullptr)
,m_pCursorDisposeListener(nullptr)
@@ -1031,12 +1027,11 @@ void DbGridControl::dispose()
if (m_nDeleteEvent)
Application::RemoveUserEvent(m_nDeleteEvent);
- if (m_pDataSourcePropMultiplexer)
+ if (m_pDataSourcePropMultiplexer.is())
{
m_pDataSourcePropMultiplexer->dispose();
- m_pDataSourcePropMultiplexer->release(); // this should delete the multiplexer
+ m_pDataSourcePropMultiplexer.clear(); // this should delete the multiplexer
delete m_pDataSourcePropListener;
- m_pDataSourcePropMultiplexer = nullptr;
m_pDataSourcePropListener = nullptr;
}
m_xRowSetListener.clear();
@@ -1426,12 +1421,11 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
if (!_xCursor.is() && !m_pDataCursor)
return;
- if (m_pDataSourcePropMultiplexer)
+ if (m_pDataSourcePropMultiplexer.is())
{
m_pDataSourcePropMultiplexer->dispose();
- m_pDataSourcePropMultiplexer->release(); // this should delete the multiplexer
+ m_pDataSourcePropMultiplexer.clear(); // this should delete the multiplexer
delete m_pDataSourcePropListener;
- m_pDataSourcePropMultiplexer = nullptr;
m_pDataSourcePropListener = nullptr;
}
m_xRowSetListener.clear();
@@ -1508,7 +1502,6 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
{
m_pDataSourcePropListener = new FmXGridSourcePropListener(this);
m_pDataSourcePropMultiplexer = new ::comphelper::OPropertyChangeMultiplexer(m_pDataSourcePropListener, m_pDataCursor->getPropertySet() );
- m_pDataSourcePropMultiplexer->acquire();
m_pDataSourcePropMultiplexer->addProperty(FM_PROP_ISMODIFIED);
m_pDataSourcePropMultiplexer->addProperty(FM_PROP_ISNEW);
}
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index d6f9d20..7c1f1ee 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -490,7 +490,6 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event )
FmFilterModel::FmFilterModel()
:FmParentData(nullptr, OUString())
,OSQLParserClient(comphelper::getProcessComponentContext())
- ,m_pAdapter(nullptr)
,m_pCurrentItems(nullptr)
{
}
@@ -509,11 +508,10 @@ void FmFilterModel::Clear()
Broadcast( aClearedHint );
// lose endings
- if (m_pAdapter)
+ if (m_pAdapter.is())
{
m_pAdapter->dispose();
- m_pAdapter->release();
- m_pAdapter= nullptr;
+ m_pAdapter.clear();
}
m_pCurrentItems = nullptr;
@@ -551,7 +549,6 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, const
// Listening for TextChanges
m_pAdapter = new FmFilterAdapter(this, xControllers);
- m_pAdapter->acquire();
SetCurrentController(xCurrent);
EnsureEmptyFilterRows( *this );
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 7eb32e2..e710f0f 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -211,7 +211,6 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
,m_bDesignMode( true )
,m_bHasForms(false)
{
- m_pImpl->acquire();
SetPool( &SfxGetpApp()->GetPool() );
SetName( "Form" );
@@ -225,8 +224,6 @@ FmFormShell::~FmFormShell()
SetView( nullptr );
m_pImpl->dispose();
- m_pImpl->release();
- m_pImpl = nullptr;
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 2e6ab8e..914872b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -217,14 +217,12 @@ bool FmSearchEngine::MoveCursor()
else
if (m_xSearchCursor.isFirst())
{
- FmRecordCountListener* prclListener = new FmRecordCountListener(m_xSearchCursor);
- prclListener->acquire();
+ rtl::Reference<FmRecordCountListener> prclListener = new FmRecordCountListener(m_xSearchCursor);
prclListener->SetPropChangeHandler(LINK(this, FmSearchEngine, OnNewRecordCount));
m_xSearchCursor.last();
prclListener->DisConnect();
- prclListener->release();
}
else
m_xSearchCursor.previous();
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index bfd316e..4eb8d38 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -283,19 +283,8 @@ FmXDisposeListener::~FmXDisposeListener()
void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter)
{
- if (m_pAdapter)
- {
- ::osl::MutexGuard aGuard(m_rMutex);
- m_pAdapter->release();
- m_pAdapter = nullptr;
- }
-
- if (pAdapter)
- {
- ::osl::MutexGuard aGuard(m_rMutex);
- m_pAdapter = pAdapter;
- m_pAdapter->acquire();
- }
+ ::osl::MutexGuard aGuard(m_rMutex);
+ m_pAdapter = pAdapter;
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 7762f8b..f40e773 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -90,8 +90,6 @@ void FmFormView::Init()
{
pFormShell = nullptr;
pImpl = new FmXFormView(this);
- pImpl->acquire();
-
// Model setzen
SdrModel* pModel = GetModel();
@@ -138,8 +136,6 @@ FmFormView::~FmFormView()
pFormShell->SetView( nullptr );
pImpl->notifyViewDying();
- pImpl->release();
- pImpl = nullptr;
}
@@ -163,7 +159,7 @@ void FmFormView::MarkListHasChanged()
pImpl->m_pMarkedGrid = nullptr;
if ( pImpl->m_xWindow.is() )
{
- pImpl->m_xWindow->removeFocusListener(pImpl);
+ pImpl->m_xWindow->removeFocusListener(pImpl.get());
pImpl->m_xWindow = nullptr;
}
SetMoveOutside(false);
@@ -500,7 +496,7 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
pImpl->m_pMarkedGrid = pObj;
pImpl->m_xWindow = xWindow;
// add as listener to get notified when ESC will be pressed inside the grid
- pImpl->m_xWindow->addFocusListener(pImpl);
+ pImpl->m_xWindow->addFocusListener(pImpl.get());
SetMoveOutside(true);
//OLMRefreshAllIAOManagers();
xWindow->setFocus();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 20602fd..1ace5b9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4165,21 +4165,17 @@ Reference< XDispatchProviderInterceptor > FormController::createInterceptor(con
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
#ifdef DBG_UTIL
// check if we already have a interceptor for the given object
- for ( Interceptors::const_iterator aIter = m_aControlDispatchInterceptors.begin();
- aIter != m_aControlDispatchInterceptors.end();
- ++aIter
- )
+ for ( const auto & it : m_aControlDispatchInterceptors )
{
- if ((*aIter)->getIntercepted() == _xInterception)
+ if (it->getIntercepted() == _xInterception)
OSL_FAIL("FormController::createInterceptor : we already do intercept this objects dispatches !");
}
#endif
- DispatchInterceptionMultiplexer* pInterceptor = new DispatchInterceptionMultiplexer( _xInterception, this );
- pInterceptor->acquire();
- m_aControlDispatchInterceptors.insert( m_aControlDispatchInterceptors.end(), pInterceptor );
+ rtl::Reference<DispatchInterceptionMultiplexer> pInterceptor(new DispatchInterceptionMultiplexer( _xInterception, this ));
+ m_aControlDispatchInterceptors.push_back( pInterceptor );
- return pInterceptor;
+ return pInterceptor.get();
}
@@ -4208,28 +4204,20 @@ void FormController::deleteInterceptor(const Reference< XDispatchProviderInterce
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
// search the interceptor responsible for the given object
- Interceptors::const_iterator aEnd = m_aControlDispatchInterceptors.end();
- Interceptors::iterator aIter;
- for ( aIter = m_aControlDispatchInterceptors.begin();
+ const auto aEnd = m_aControlDispatchInterceptors.end();
+ for ( auto aIter = m_aControlDispatchInterceptors.begin();
aIter != aEnd;
++aIter
)
{
- if ((*aIter)->getIntercepted() == _xInterception)
- break;
- }
- if (aIter == aEnd)
- {
- return;
+ if ((*aIter)->getIntercepted() == _xInterception) {
+ // log off the interception from its interception object
+ (*aIter)->dispose();
+ // remove the interceptor from our array
+ m_aControlDispatchInterceptors.erase(aIter);
+ return;
+ }
}
-
- // log off the interception from its interception object
- DispatchInterceptionMultiplexer* pInterceptorImpl = *aIter;
- pInterceptorImpl->dispose();
- pInterceptorImpl->release();
-
- // remove the interceptor from our array
- m_aControlDispatchInterceptors.erase(aIter);
}
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 8255ccc..06172a1 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -190,14 +190,12 @@ namespace svx
ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback )
:m_pInvalidationCallback( _pInvalidationCallback )
- ,m_pImpl( nullptr )
{
}
ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback )
:m_pInvalidationCallback( _pInvalidationCallback )
- ,m_pImpl( nullptr )
{
assign( _rxController );
}
@@ -207,7 +205,6 @@ namespace svx
{
dispose();
m_pImpl = new FormControllerHelper( _rxController, m_pInvalidationCallback );
- m_pImpl->acquire();
}
@@ -219,11 +216,10 @@ namespace svx
void ControllerFeatures::dispose()
{
- if ( m_pImpl )
+ if ( m_pImpl.is() )
{
m_pImpl->dispose();
- m_pImpl->release();
- m_pImpl = nullptr;
+ m_pImpl.clear();
}
}
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index ada3cf9..fbfbeb6 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -193,7 +193,6 @@ namespace svxform
,m_aNormalImages( _rNormalImages )
{
m_pPropChangeList = new OFormComponentObserver(this);
- m_pPropChangeList->acquire();
m_pRootList = new FmEntryDataList();
}
@@ -215,7 +214,6 @@ namespace svxform
Clear();
delete m_pRootList;
m_pPropChangeList->ReleaseModel();
- m_pPropChangeList->release();
}
@@ -232,7 +230,7 @@ namespace svxform
{
Reference< css::form::XForms > xForms( GetForms());
if(xForms.is())
- xForms->removeContainerListener(static_cast<XContainerListener*>(m_pPropChangeList));
+ xForms->removeContainerListener(m_pPropChangeList.get());
// delete RootList
@@ -325,7 +323,7 @@ namespace svxform
// register as PropertyChangeListener
Reference< XPropertySet > xSet(xElement, UNO_QUERY);
if( xSet.is() )
- xSet->addPropertyChangeListener( FM_PROP_NAME, m_pPropChangeList );
+ xSet->addPropertyChangeListener( FM_PROP_NAME, m_pPropChangeList.get() );
// Remove data from model
@@ -333,7 +331,7 @@ namespace svxform
{
Reference< XContainer > xContainer(xElement, UNO_QUERY);
if (xContainer.is())
- xContainer->addContainerListener(static_cast<XContainerListener*>(m_pPropChangeList));
+ xContainer->addContainerListener(m_pPropChangeList.get());
}
if (pFolder)
@@ -466,11 +464,11 @@ namespace svxform
// unregister as PropertyChangeListener
Reference< XPropertySet > xSet( pFormData->GetPropertySet() );
if ( xSet.is() )
- xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList );
+ xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList.get() );
Reference< XContainer > xContainer( pFormData->GetContainer() );
if (xContainer.is())
- xContainer->removeContainerListener(static_cast<XContainerListener*>(m_pPropChangeList));
+ xContainer->removeContainerListener(m_pPropChangeList.get());
}
@@ -485,7 +483,7 @@ namespace svxform
// unregister as PropertyChangeListener
Reference< XPropertySet > xSet( pControlData->GetPropertySet() );
if (xSet.is())
- xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList);
+ xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList.get());
}
@@ -835,7 +833,7 @@ namespace svxform
Clear();
if (xForms.is())
{
- xForms->addContainerListener(static_cast<XContainerListener*>(m_pPropChangeList));
+ xForms->addContainerListener(m_pPropChangeList.get());
FillBranch(nullptr);
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index c9adc54..e9b06b3 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -172,7 +172,6 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Wind
,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings)
,::comphelper::OPropertyChangeListener(m_aMutex)
,m_nObjectType(0)
- ,m_pChangeListener(nullptr)
{
SetHelpId( HID_FIELD_SEL_WIN );
@@ -191,11 +190,10 @@ FmFieldWin::~FmFieldWin()
void FmFieldWin::dispose()
{
- if (m_pChangeListener)
+ if (m_pChangeListener.is())
{
m_pChangeListener->dispose();
- m_pChangeListener->release();
- // delete m_pChangeListener;
+ m_pChangeListener.clear();
}
pListBox.disposeAndClear();
::SfxControllerItem::dispose();
@@ -358,13 +356,12 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x
}
// listen for changes at ControlSource in PropertySet
- if (m_pChangeListener)
+ if (m_pChangeListener.is())
{
m_pChangeListener->dispose();
- m_pChangeListener->release();
+ m_pChangeListener.clear();
}
m_pChangeListener = new ::comphelper::OPropertyChangeMultiplexer(this, xSet);
- m_pChangeListener->acquire();
m_pChangeListener->addProperty(FM_PROP_DATASOURCE);
m_pChangeListener->addProperty(FM_PROP_COMMAND);
m_pChangeListener->addProperty(FM_PROP_COMMANDTYPE);
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 66906ef..afc6f0b 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -156,7 +156,7 @@ class FmFilterModel : public FmParentData
css::uno::Reference< css::container::XIndexAccess > m_xControllers;
css::uno::Reference< css::form::runtime::XFormController > m_xController;
- FmFilterAdapter* m_pAdapter;
+ rtl::Reference<FmFilterAdapter> m_pAdapter;
FmFilterItems* m_pCurrentItems;
public:
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 1059b26..5b5486a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -334,7 +334,7 @@ namespace svxform
FmFormShell* m_pFormShell;
FmFormPage* m_pFormPage;
FmFormModel* m_pFormModel;
- OFormComponentObserver* m_pPropChangeList;
+ rtl::Reference<OFormComponentObserver> m_pPropChangeList;
ImageList m_aNormalImages;
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 1e1e611..64802ad 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -75,6 +75,7 @@
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/propshlp.hxx>
#include <comphelper/interfacecontainer2.hxx>
+#include <rtl/ref.hxx>
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
@@ -203,8 +204,7 @@ namespace svxform
// as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
// the css::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
- typedef std::vector<DispatchInterceptionMultiplexer*> Interceptors;
- Interceptors m_aControlDispatchInterceptors;
+ std::vector<rtl::Reference<DispatchInterceptionMultiplexer>> m_aControlDispatchInterceptors;
public:
FormController( const css::uno::Reference< css::uno::XComponentContext > & _rxORB );
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index a24aab1..8b0a824 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/sdb/XSQLErrorListener.hpp>
#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
#include <vector>
@@ -72,7 +73,7 @@ namespace svx
{
protected:
IControllerFeatureInvalidation* m_pInvalidationCallback; // necessary as long as m_pImpl is not yet constructed
- FormControllerHelper* m_pImpl;
+ rtl::Reference<FormControllerHelper> m_pImpl;
public:
/** standard ctor
@@ -116,8 +117,8 @@ namespace svx
void dispose();
// access to the instance which implements the functionality. Not to be used when not assigned
- inline const FormControllerHelper* operator->() const { return m_pImpl; }
- inline FormControllerHelper* operator->() { return m_pImpl; }
+ inline const FormControllerHelper* operator->() const { return m_pImpl.get(); }
+ inline FormControllerHelper* operator->() { return m_pImpl.get(); }
};
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index a9c0ae7..26b632a 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -71,7 +71,7 @@ class DbGridColumn
::svt::CellControllerRef m_xController; // Struktur zum Verwalten der Controls fuer eine Spalte
// diese wird von der DbBrowseBox auf die jeweiligen Zellen
// einer Spalte positioniert
- FmXGridCell* m_pCell;
+ rtl::Reference<FmXGridCell> m_pCell;
protected:
DbGridControl& m_rParent;
@@ -134,7 +134,7 @@ public:
const ::svt::CellControllerRef& GetController() const {return m_bLocked ? s_xEmptyController : m_xController;}
const css::uno::Reference< css::beans::XPropertySet >& GetField() const {return m_xField;}
DbGridControl& GetParent() const {return m_rParent;}
- FmXGridCell* GetCell() const {return m_pCell;}
+ FmXGridCell* GetCell() const {return m_pCell.get();}
css::uno::Reference< css::sdb::XColumn > GetCurrentFieldValue() const;
@@ -200,8 +200,8 @@ class DbCellControl
,public ::comphelper::OPropertyChangeListener
{
private:
- ::comphelper::OPropertyChangeMultiplexer* m_pModelChangeBroadcaster;
- ::comphelper::OPropertyChangeMultiplexer* m_pFieldChangeBroadcaster;
+ rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pModelChangeBroadcaster;
+ rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pFieldChangeBroadcaster;
private:
bool m_bTransparent : 1;
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index e042fc7..2774ccb 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -74,7 +74,7 @@ class FmFieldWin :public SfxFloatingWindow
m_aObjectName;
sal_Int32 m_nObjectType;
- ::comphelper::OPropertyChangeMultiplexer* m_pChangeListener;
+ rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pChangeListener;
public:
FmFieldWin(SfxBindings *pBindings,
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 8f0beef..b654568 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -311,8 +311,7 @@ SdrModel::~SdrModel()
SfxItemPool::Free(pOutlPool);
}
- if( mpForbiddenCharactersTable )
- mpForbiddenCharactersTable->release();
+ mpForbiddenCharactersTable.clear();
delete mpNumberFormatter;
@@ -1905,13 +1904,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
void SdrModel::SetForbiddenCharsTable( const rtl::Reference<SvxForbiddenCharactersTable>& xForbiddenChars )
{
- if( mpForbiddenCharactersTable )
- mpForbiddenCharactersTable->release();
-
- mpForbiddenCharactersTable = xForbiddenChars.get();
-
- if( mpForbiddenCharactersTable )
- mpForbiddenCharactersTable->acquire();
+ mpForbiddenCharactersTable = xForbiddenChars;
ImpSetOutlinerDefaults( pDrawOutliner );
ImpSetOutlinerDefaults( pHitTestOutliner );
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 2ea9c8a..8c70711 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -758,7 +758,6 @@ void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
bClosedObj = true;
mpImpl = new SdrTableObjImpl;
- mpImpl->acquire();
mpImpl->init( this, nColumns, nRows );
}
@@ -766,7 +765,6 @@ void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
SdrTableObj::~SdrTableObj()
{
mpImpl->dispose();
- mpImpl->release();
}
@@ -864,7 +862,7 @@ CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const
CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) const
{
CellPos aPos( rPos );
- if( mpImpl )
+ if( mpImpl.is() )
{
CellRef xCell( mpImpl->getCell( aPos ) );
if( xCell.is() && xCell->isMerged() )
@@ -891,7 +889,7 @@ CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) co
CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const
{
CellPos aPos( rPos );
- if( mpImpl )
+ if( mpImpl.is() )
{
CellRef xCell( mpImpl->getCell( aPos ) );
if( xCell.is() )
@@ -933,7 +931,7 @@ CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const
CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) const
{
CellPos aPos( rPos );
- if( mpImpl )
+ if( mpImpl.is() )
{
CellRef xCell( mpImpl->getCell( aPos ) );
if( xCell.is() )
@@ -963,7 +961,7 @@ CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const
{
CellPos aPos( rPos );
- if( mpImpl )
+ if( mpImpl.is() )
{
CellRef xCell( mpImpl->getCell( rPos ) );
if( xCell.is() )
@@ -1004,7 +1002,7 @@ CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const
const TableStyleSettings& SdrTableObj::getTableStyleSettings() const
{
- if( mpImpl )
+ if( mpImpl.is())
{
return mpImpl->maTableStyle;
}
@@ -1018,7 +1016,7 @@ const TableStyleSettings& SdrTableObj::getTableStyleSettings() const
void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle )
{
- if( mpImpl )
+ if( mpImpl.is() )
{
mpImpl->maTableStyle = rStyle;
mpImpl->update();
@@ -1028,7 +1026,7 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle )
TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY ) const
{
- if( !mpImpl || !mpImpl->mxTable.is() )
+ if( !mpImpl.is() || !mpImpl->mxTable.is() )
return SDRTABLEHIT_NONE;
rnX = 0;
@@ -1155,7 +1153,7 @@ const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const
void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle )
{
- if( mpImpl && (mpImpl->mxTableStyle != xTableStyle) )
+ if( mpImpl.is() && (mpImpl->mxTableStyle != xTableStyle) )
{
mpImpl->disconnectTableStyle();
mpImpl->mxTableStyle = xTableStyle;
@@ -1167,7 +1165,7 @@ void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle )
const Reference< XIndexAccess >& SdrTableObj::getTableStyle() const
{
- if( mpImpl )
+ if( mpImpl.is() )
{
return mpImpl->mxTableStyle;
}
@@ -1227,7 +1225,7 @@ sal_Int32 SdrTableObj::getTextCount() const
/** changes the current active text */
void SdrTableObj::setActiveText( sal_Int32 nIndex )
{
- if( mpImpl && mpImpl->mxTable.is() )
+ if( mpImpl.is() && mpImpl->mxTable.is() )
{
const sal_Int32 nColCount = mpImpl->mxTable->getColumnCount();
if( nColCount )
@@ -1243,7 +1241,7 @@ void SdrTableObj::setActiveText( sal_Int32 nIndex )
/** returns the index of the text that contains the given point or -1 */
sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const
{
- if( mpImpl && mpImpl->mxTable.is() )
+ if( mpImpl.is() && mpImpl->mxTable.is() )
{
CellPos aPos;
if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow ) == SDRTABLEHIT_CELLTEXTAREA )
@@ -1255,7 +1253,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const
SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const
{
- if( mpImpl && (mpImpl->getCell( mpImpl->maEditPos ).get() == &rCell) )
+ if( mpImpl.is() && (mpImpl->getCell( mpImpl->maEditPos ).get() == &rCell) )
return pEdtOutl;
else
return nullptr;
@@ -1263,7 +1261,7 @@ SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const
const TableLayouter& SdrTableObj::getTableLayouter() const
{
- assert(mpImpl && mpImpl->mpLayouter && "getTableLayouter() error: no mpImpl or mpLayouter (!)");
+ assert(mpImpl.is() && mpImpl->mpLayouter && "getTableLayouter() error: no mpImpl or mpLayouter (!)");
return *(mpImpl->mpLayouter);
}
@@ -1284,13 +1282,13 @@ bool SdrTableObj::HasText() const
bool SdrTableObj::IsTextEditActive( const CellPos& rPos )
{
- return pEdtOutl && mpImpl && (rPos == mpImpl->maEditPos);
+ return pEdtOutl && mpImpl.is() && (rPos == mpImpl->maEditPos);
}
void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
{
- if( (pEditStatus->GetStatusWord() & EditStatusFlags::TEXTHEIGHTCHANGED) && mpImpl && mpImpl->mpLayouter )
+ if( (pEditStatus->GetStatusWord() & EditStatusFlags::TEXTHEIGHTCHANGED) && mpImpl.is() && mpImpl->mpLayouter )
{
Rectangle aRect0( maRect );
maRect = maLogicRect;
@@ -1349,7 +1347,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
{
SdrTextObj::SetModel(pNewModel);
- if( mpImpl )
+ if( mpImpl.is() )
{
mpImpl->SetModel( pOldModel, pNewModel );
@@ -1365,14 +1363,14 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const
{
- if( mpImpl )
+ if( mpImpl.is() )
TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
}
void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
{
- if( !mpImpl )
+ if( !mpImpl.is())
return;
CellRef xCell( mpImpl->getCell( rPos ) );
@@ -1454,7 +1452,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
const CellRef& SdrTableObj::getActiveCell() const
{
- if( mpImpl )
+ if( mpImpl.is() )
{
if( !mpImpl->mxActiveCell.is() )
{
@@ -1473,13 +1471,13 @@ const CellRef& SdrTableObj::getActiveCell() const
sal_Int32 SdrTableObj::getColumnCount() const
{
- return mpImpl ? mpImpl->getColumnCount() : 0;
+ return mpImpl.is() ? mpImpl->getColumnCount() : 0;
}
void SdrTableObj::setActiveCell( const CellPos& rPos )
{
- if( mpImpl && mpImpl->mxTable.is() ) try
+ if( mpImpl.is() && mpImpl->mxTable.is() ) try
{
mpImpl->mxActiveCell.set( dynamic_cast< Cell* >( mpImpl->mxTable->getCellByPosition( rPos.mnCol, rPos.mnRow ).get() ) );
if( mpImpl->mxActiveCell.is() && mpImpl->mxActiveCell->isMerged() )
@@ -1509,7 +1507,7 @@ void SdrTableObj::getActiveCellPos( CellPos& rPos ) const
void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect )
{
- if( mpImpl )
+ if( mpImpl.is() )
{
CellRef xCell( mpImpl->getCell( rPos ) );
if( xCell.is() )
@@ -1520,7 +1518,7 @@ void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect )
void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
{
- if( mpImpl )
+ if( mpImpl.is() )
TakeTextAnchorRect( mpImpl->maEditPos, rAnchorRect );
}
@@ -1529,7 +1527,7 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec
{
Rectangle aAnkRect(maRect);
- if( mpImpl )
+ if( mpImpl.is() )
{
CellRef xCell( mpImpl->getCell( rPos ) );
if( xCell.is() )
@@ -1543,7 +1541,7 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec
void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const
{
- if( mpImpl )
+ if( mpImpl.is() )
TakeTextEditArea( mpImpl->maEditPos, pPaperMin, pPaperMax, pViewInit, pViewMin );
}
@@ -1671,7 +1669,7 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj)
// call parent
SdrObject::operator=(rObj);
- TableModelNotifyGuard aGuard( mpImpl ? mpImpl->mxTable.get() : nullptr );
+ TableModelNotifyGuard aGuard( mpImpl.is() ? mpImpl->mxTable.get() : nullptr );
maLogicRect = rObj.maLogicRect;
maRect = rObj.maRect;
@@ -1685,8 +1683,7 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj)
bNoMirror = rObj.bNoMirror;
bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging;
- if (mpImpl && rObj.mpImpl)
- *mpImpl = *rObj.mpImpl;
+ *mpImpl = *rObj.mpImpl;
return *this;
}
@@ -1891,7 +1888,7 @@ void SdrTableObj::NbcMove(const Size& rSiz)
{
MoveRect(maLogicRect,rSiz);
SdrTextObj::NbcMove( rSiz );
- if( mpImpl )
+ if( mpImpl.is() )
mpImpl->UpdateCells( maRect );
}
@@ -1928,7 +1925,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight()
bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const
{
- if((pModel == nullptr) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() )
+ if((pModel == nullptr) || rR.IsEmpty() || !mpImpl.is() || !mpImpl->mxTable.is() )
return false;
Rectangle aRectangle( rR );
@@ -2392,7 +2389,7 @@ void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo)
SdrTextObj::RestGeoData (rGeo);
- if( mpImpl )
+ if( mpImpl.is() )
mpImpl->LayoutTable(maRect, false, false);
ActionChanged();
}
@@ -2458,7 +2455,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd
void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn )
{
- if( mpImpl && mpImpl->mpLayouter )
+ if( mpImpl.is() && mpImpl->mpLayouter )
{
TableModelNotifyGuard aGuard( mpImpl->mxTable.get() );
mpImpl->mpLayouter->DistributeColumns( maRect, nFirstColumn, nLastColumn );
@@ -2468,7 +2465,7 @@ void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColu
void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow )
{
- if( mpImpl && mpImpl->mpLayouter )
+ if( mpImpl.is() && mpImpl->mpLayouter )
{
TableModelNotifyGuard aGuard( mpImpl->mxTable.get() );
mpImpl->mpLayouter->DistributeRows( maRect, nFirstRow, nLastRow );
@@ -2478,7 +2475,7 @@ void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow )
void SdrTableObj::SetChanged()
{
- if( mpImpl )
+ if( mpImpl.is() )
{
mpImpl->LayoutTable( maRect, false, false );
}
@@ -2489,14 +2486,14 @@ void SdrTableObj::SetChanged()
void SdrTableObj::uno_lock()
{
- if( mpImpl && mpImpl->mxTable.is() )
+ if( mpImpl.is() && mpImpl->mxTable.is() )
mpImpl->mxTable->lockBroadcasts();
}
void SdrTableObj::uno_unlock()
{
- if( mpImpl && mpImpl->mxTable.is() )
+ if( mpImpl.is() && mpImpl->mxTable.is() )
mpImpl->mxTable->unlockBroadcasts();
}
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index a6ef500..8d1d382 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -1006,35 +1006,31 @@ IMPL_LINK_TYPED(SvxTextEditSourceImpl, NotifyHdl, EENotify&, rNotify, void)
SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText )
{
mpImpl = new SvxTextEditSourceImpl( pObject, pText );
- mpImpl->acquire();
}
SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rWindow )
{
mpImpl = new SvxTextEditSourceImpl( rObj, pText, rView, rWindow );
- mpImpl->acquire();
}
SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl )
{
mpImpl = pImpl;
- mpImpl->acquire();
}
SvxTextEditSource::~SvxTextEditSource()
{
::SolarMutexGuard aGuard;
-
- mpImpl->release();
+ mpImpl.clear();
}
SvxEditSource* SvxTextEditSource::Clone() const
{
- return new SvxTextEditSource( mpImpl );
+ return new SvxTextEditSource( mpImpl.get() );
}
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 96ba17f..6e020ed 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -28,6 +28,7 @@
#include <unordered_map>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
+#include <rtl/ref.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -1063,8 +1064,8 @@ typedef OMultiTypeInterfaceContainerHelperVar<OUString> PropertyListeners_Impl;
struct PersistentPropertySet_Impl
{
- PropertySetRegistry* m_pCreator;
- PropertySetInfo_Impl* m_pInfo;
+ rtl::Reference<PropertySetRegistry> m_pCreator;
+ rtl::Reference<PropertySetInfo_Impl> m_pInfo;
OUString m_aKey;
OUString m_aFullKey;
osl::Mutex m_aMutex;
@@ -1078,16 +1079,10 @@ struct PersistentPropertySet_Impl
m_pDisposeEventListeners( nullptr ), m_pPropSetChangeListeners( nullptr ),
m_pPropertyChangeListeners( nullptr )
{
- m_pCreator->acquire();
}
~PersistentPropertySet_Impl()
{
- m_pCreator->release();
-
- if ( m_pInfo )
- m_pInfo->release();
-
delete m_pDisposeEventListeners;
delete m_pPropSetChangeListeners;
delete m_pPropertyChangeListeners;
@@ -1189,13 +1184,11 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo
{
osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
- PropertySetInfo_Impl*& rpInfo = m_pImpl->m_pInfo;
- if ( !rpInfo )
+ if ( !m_pImpl->m_pInfo.is() )
{
- rpInfo = new PropertySetInfo_Impl( this );
- rpInfo->acquire();
+ m_pImpl->m_pInfo = new PropertySetInfo_Impl( this );
}
- return Reference< XPropertySetInfo >( rpInfo );
+ return Reference< XPropertySetInfo >( m_pImpl->m_pInfo.get() );
}
@@ -1410,7 +1403,7 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener(
Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry()
throw( RuntimeException, std::exception )
{
- return Reference< XPropertySetRegistry >( m_pImpl->m_pCreator );
+ return Reference< XPropertySetRegistry >( m_pImpl->m_pCreator.get() );
}
@@ -1549,7 +1542,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
xBatch->commitChanges();
// Property set info is invalid.
- if ( m_pImpl->m_pInfo )
+ if ( m_pImpl->m_pInfo.is() )
m_pImpl->m_pInfo->reset();
// Notify propertyset info change listeners.
@@ -1717,7 +1710,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
xBatch->commitChanges();
// Property set info is invalid.
- if ( m_pImpl->m_pInfo )
+ if ( m_pImpl->m_pInfo.is() )
m_pImpl->m_pInfo->reset();
// Notify propertyset info change listeners.
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 95d9c97..4931621 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -124,7 +124,6 @@ SortedResultSet::SortedResultSet( Reference< XResultSet > aResult )
mpDisposeEventListeners = nullptr;
mpPropChangeListeners = nullptr;
mpVetoChangeListeners = nullptr;
- mpPropSetInfo = nullptr;
mxOriginal = aResult;
mpSortInfo = nullptr;
@@ -153,8 +152,7 @@ SortedResultSet::~SortedResultSet()
mpSortInfo = nullptr;
- if ( mpPropSetInfo )
- mpPropSetInfo->release();
+ mpPropSetInfo.clear();
delete mpPropChangeListeners;
delete mpVetoChangeListeners;
@@ -830,13 +828,12 @@ SortedResultSet::getPropertySetInfo() throw( RuntimeException, std::exception )
{
osl::Guard< osl::Mutex > aGuard( maMutex );
- if ( !mpPropSetInfo )
+ if ( !mpPropSetInfo.is() )
{
mpPropSetInfo = new SRSPropertySetInfo();
- mpPropSetInfo->acquire();
}
- return Reference< XPropertySetInfo >( mpPropSetInfo );
+ return Reference< XPropertySetInfo >( mpPropSetInfo.get() );
}
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 9ee45c5..21a5fe6 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -35,6 +35,7 @@
#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
#include <com/sun/star/ucb/ListAction.hpp>
#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
#include <deque>
namespace comphelper {
@@ -126,7 +127,7 @@ class SortedResultSet: public cppu::WeakImplHelper <
css::uno::Reference < css::sdbc::XResultSet > mxOriginal;
css::uno::Reference < css::sdbc::XResultSet > mxOther;
- SRSPropertySetInfo* mpPropSetInfo;
+ rtl::Reference<SRSPropertySetInfo> mpPropSetInfo;
SortInfo* mpSortInfo;
osl::Mutex maMutex;
SortedEntryList maS2O; // maps the sorted entries to the original ones
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index 9eaa1bd..f33811a 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -24,6 +24,7 @@
#include <unotools/eventlisteneradapter.hxx>
#include <osl/diagnose.h>
#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
namespace utl
{
@@ -92,7 +93,7 @@ namespace utl
struct OEventListenerAdapterImpl
{
public:
- ::std::vector< void* > aListeners;
+ std::vector< rtl::Reference<OEventListenerImpl> > aListeners;
};
//= OEventListenerAdapter
@@ -112,32 +113,26 @@ namespace utl
if ( m_pImpl->aListeners.empty() )
return;
- ::std::vector< void* >::iterator dispose = m_pImpl->aListeners.begin();
+ auto it = m_pImpl->aListeners.begin();
do
{
- OEventListenerImpl* pListenerImpl = static_cast< OEventListenerImpl* >( *dispose );
+ rtl::Reference<OEventListenerImpl>& pListenerImpl = *it;
if ( pListenerImpl->getComponent().get() == _rxComp.get() )
{
pListenerImpl->dispose();
- pListenerImpl->release();
- dispose = m_pImpl->aListeners.erase( dispose );
+ it = m_pImpl->aListeners.erase( it );
}
else
- ++dispose;
+ ++it;
}
- while ( dispose != m_pImpl->aListeners.end() );
+ while ( it != m_pImpl->aListeners.end() );
}
void OEventListenerAdapter::stopAllComponentListening( )
{
- for ( ::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin();
- aDisposeLoop != m_pImpl->aListeners.end();
- ++aDisposeLoop
- )
+ for ( const auto & i : m_pImpl->aListeners )
{
- OEventListenerImpl* pListenerImpl = static_cast< OEventListenerImpl* >(*aDisposeLoop);
- pListenerImpl->dispose();
- pListenerImpl->release();
+ i->dispose();
}
m_pImpl->aListeners.clear();
}
@@ -151,7 +146,6 @@ namespace utl
}
OEventListenerImpl* pListenerImpl = new OEventListenerImpl(this, _rxComp);
- pListenerImpl->acquire();
m_pImpl->aListeners.push_back(pListenerImpl);
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 3b702cd..dae07e6 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -430,7 +430,6 @@ SvXMLImport::SvXMLImport(
mpProgressBarHelper( nullptr ),
mpEventImportHelper( nullptr ),
mpXMLErrors( nullptr ),
- mpStyleMap(nullptr),
mnImportFlags( nImportFlags ),
mnErrorFlags(SvXMLErrorFlags::NO),
mbIsFormsSupported( true ),
@@ -618,11 +617,7 @@ void SAL_CALL SvXMLImport::endDocument()
Reference< lang::XComponent > xComp( mxEmbeddedResolver, UNO_QUERY );
xComp->dispose();
}
- if( mpStyleMap )
- {
- mpStyleMap->release();
- mpStyleMap = nullptr;
- }
+ mpStyleMap.clear();
if ( mpXMLErrors != nullptr )
{
@@ -1008,7 +1003,6 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
if( pSMap )
{
mpStyleMap = pSMap;
- mpStyleMap->acquire();
}
}
OUString sBaseURI;
@@ -1405,10 +1399,9 @@ void SvXMLImport::AddStyleDisplayName( sal_uInt16 nFamily,
const OUString& rName,
const OUString& rDisplayName )
{
- if( !mpStyleMap )
+ if( !mpStyleMap.is() )
{
mpStyleMap = new StyleMap;
- mpStyleMap->acquire();
if( mxImportInfo.is() )
{
OUString sPrivateData( "PrivateData" );
@@ -1418,7 +1411,7 @@ void SvXMLImport::AddStyleDisplayName( sal_uInt16 nFamily,
xPropertySetInfo->hasPropertyByName(sPrivateData) )
{
Reference < XInterface > xIfc(
- static_cast< XUnoTunnel *>( mpStyleMap ) );
+ static_cast< XUnoTunnel *>( mpStyleMap.get() ) );
mxImportInfo->setPropertyValue( sPrivateData, Any(xIfc) );
}
}
@@ -1437,7 +1430,7 @@ OUString SvXMLImport::GetStyleDisplayName( sal_uInt16 nFamily,
const OUString& rName ) const
{
OUString sName( rName );
- if( mpStyleMap && !rName.isEmpty() )
+ if( mpStyleMap.is() && !rName.isEmpty() )
{
StyleMap::key_type aKey( nFamily, rName );
StyleMap::const_iterator aIter = mpStyleMap->find( aKey );
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index d25d18b..f9f9d52 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -402,9 +402,6 @@ SdXMLExport::SdXMLExport(
mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList()),
mpHandoutPageMaster(nullptr),
mpAutoLayoutInfoList(new ImpXMLAutoLayoutInfoList()),
- mpSdPropHdlFactory(nullptr),
- mpPropertySetMapper(nullptr),
- mpPresPagePropsMapper(nullptr),
mbIsDraw(bIsDraw),
msPageLayoutNames( "PageLayoutNames" )
{
@@ -422,30 +419,20 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
// prepare factory parts
mpSdPropHdlFactory = new XMLSdPropHdlFactory( GetModel(), *this );
- // set lock to avoid deletion
- mpSdPropHdlFactory->acquire();
-
- // build one ref
- const rtl::Reference< XMLPropertyHandlerFactory > aFactoryRef = mpSdPropHdlFactory;
-
// construct PropertySetMapper
- rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( aFactoryRef, true);
+ rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( mpSdPropHdlFactory.get(), true);
// get or create text paragraph export
GetTextParagraphExport();
mpPropertySetMapper = new XMLShapeExportPropertyMapper( xMapper, *this );
- // set lock to avoid deletion
- mpPropertySetMapper->acquire();
// chain text attributes
mpPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
// construct PresPagePropsMapper
- xMapper = new XMLPropertySetMapper(aXMLSDPresPageProps, aFactoryRef, true);
+ xMapper = new XMLPropertySetMapper(aXMLSDPresPageProps, mpSdPropHdlFactory.get(), true);
mpPresPagePropsMapper = new XMLPageExportPropertyMapper( xMapper, *this );
- // set lock to avoid deletion
- mpPresPagePropsMapper->acquire();
// add family name
GetAutoStylePool()->AddFamily(
@@ -654,25 +641,13 @@ sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(const Reference< drawing::XShape
SdXMLExport::~SdXMLExport()
{
// cleanup factory, decrease refcount. Should lead to destruction.
- if(mpSdPropHdlFactory)
- {
- mpSdPropHdlFactory->release();
- mpSdPropHdlFactory = nullptr;
- }
+ mpSdPropHdlFactory.clear();
// cleanup mapper, decrease refcount. Should lead to destruction.
- if(mpPropertySetMapper)
- {
- mpPropertySetMapper->release();
- mpPropertySetMapper = nullptr;
- }
+ mpPropertySetMapper.clear();
// cleanup presPage mapper, decrease refcount. Should lead to destruction.
- if(mpPresPagePropsMapper)
- {
- mpPresPagePropsMapper->release();
- mpPresPagePropsMapper = nullptr;
- }
+ mpPresPagePropsMapper.clear();
// clear evtl. temporary page master infos
if(mpPageMasterUsageList)
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 06be622..a69bdde 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -106,9 +106,9 @@ class SdXMLExport : public SvXMLExport
HeaderFooterPageSettingsImpl maHandoutPageHeaderFooterSettings;
- XMLSdPropHdlFactory* mpSdPropHdlFactory;
- XMLShapeExportPropertyMapper* mpPropertySetMapper;
- XMLPageExportPropertyMapper* mpPresPagePropsMapper;
+ rtl::Reference<XMLSdPropHdlFactory> mpSdPropHdlFactory;
+ rtl::Reference<XMLShapeExportPropertyMapper> mpPropertySetMapper;
+ rtl::Reference<XMLPageExportPropertyMapper> mpPresPagePropsMapper;
SdXMLFormatMap maUsedDateStyles; // this is a vector with the used formatings for date fields
SdXMLFormatMap maUsedTimeStyles; // this is a vector with the used formatings for time fields
@@ -171,8 +171,8 @@ public:
virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
// get factories and mappers
- XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; }
- XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; }
+ XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper.get(); }
+ XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper.get(); }
bool IsDraw() const { return mbIsDraw; }
bool IsImpress() const { return !mbIsDraw; }
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 8608197..3932638 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -137,14 +137,9 @@ XMLShapeImportHelper::XMLShapeImportHelper(
mpSdPropHdlFactory = new XMLSdPropHdlFactory( rModel, rImporter );
- // set lock to avoid deletion
- mpSdPropHdlFactory->acquire();
-
// construct PropertySetMapper
- rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper(mpSdPropHdlFactory, false);
+ rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper(mpSdPropHdlFactory.get(), false);
mpPropertySetMapper = new SvXMLImportPropertyMapper( xMapper, rImporter );
- // set lock to avoid deletion
- mpPropertySetMapper->acquire();
if( pExtMapper )
{
@@ -157,10 +152,8 @@ XMLShapeImportHelper::XMLShapeImportHelper(
mpPropertySetMapper->ChainImportMapper(XMLTextImportHelper::CreateParaDefaultExtPropMapper(rImporter));
// construct PresPagePropsMapper
- xMapper = new XMLPropertySetMapper(aXMLSDPresPageProps, mpSdPropHdlFactory, false);
+ xMapper = new XMLPropertySetMapper(aXMLSDPresPageProps, mpSdPropHdlFactory.get(), false);
mpPresPagePropsMapper = new SvXMLImportPropertyMapper( xMapper, rImporter );
- // set lock to avoid deletion
- mpPresPagePropsMapper->acquire();
uno::Reference< lang::XServiceInfo > xInfo( rImporter.GetModel(), uno::UNO_QUERY );
const OUString aSName( "com.sun.star.presentation.PresentationDocument" );
@@ -172,25 +165,13 @@ XMLShapeImportHelper::~XMLShapeImportHelper()
DBG_ASSERT( mpImpl->maConnections.empty(), "XMLShapeImportHelper::restoreConnections() was not called!" );
// cleanup factory, decrease refcount. Should lead to destruction.
- if(mpSdPropHdlFactory)
- {
- mpSdPropHdlFactory->release();
- mpSdPropHdlFactory = nullptr;
- }
+ mpSdPropHdlFactory.clear();
// cleanup mapper, decrease refcount. Should lead to destruction.
- if(mpPropertySetMapper)
- {
- mpPropertySetMapper->release();
- mpPropertySetMapper = nullptr;
- }
+ mpPropertySetMapper.clear();
// cleanup presPage mapper, decrease refcount. Should lead to destruction.
- if(mpPresPagePropsMapper)
- {
- mpPresPagePropsMapper->release();
- mpPresPagePropsMapper = nullptr;
- }
+ mpPresPagePropsMapper.clear();
delete mpGroupShapeElemTokenMap;
delete mpFrameShapeElemTokenMap;
commit 9f138ffe9da2f448a455f4b51facab82e5e243d7
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 2 13:05:45 2016 +0200
remove unused constants in HRC files
Change-Id: Ia034fb16ce75caeb69fd746d4a602cd5fcfef6d1
Reviewed-on: https://gerrit.libreoffice.org/25817
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 9082001..22288cb 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -143,9 +143,6 @@
#define RID_STR_NORMAL_MODULES ( RID_BASICIDE_START + 120 )
#define RID_STR_CLASS_MODULES ( RID_BASICIDE_START + 121 )
-#define RID_FT_LINE ( RID_BASICIDE_START + 123 )
-#define RID_ED_LINE ( RID_BASICIDE_START + 124 )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc
index f5a14ba..fbd1f63 100644
--- a/chart2/source/controller/inc/ShapeController.hrc
+++ b/chart2/source/controller/inc/ShapeController.hrc
@@ -26,14 +26,10 @@
#define COMMAND_ID_TRANSFORM_DIALOG 4
#define COMMAND_ID_OBJECT_TITLE_DESCRIPTION 5
#define COMMAND_ID_RENAME_OBJECT 6
-#define COMMAND_ID_ARRANGE_ROW 7
#define COMMAND_ID_BRING_TO_FRONT 8
#define COMMAND_ID_FORWARD 9
#define COMMAND_ID_BACKWARD 10
#define COMMAND_ID_SEND_TO_BACK 11
-#define COMMAND_ID_CUT 12
-#define COMMAND_ID_COPY 13
-#define COMMAND_ID_PASTE 14
#define COMMAND_ID_FONT_DIALOG 15
#define COMMAND_ID_PARAGRAPH_DIALOG 16
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 103f74f..4fa00c0 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -136,7 +136,6 @@
#define RID_SVXSTR_JAVA_START_PARAM (RID_SVX_START + 258)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
-#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
#define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209)
#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //?
#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//?
@@ -194,7 +193,6 @@
#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815)
#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800)
#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
-#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232)
#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550)
#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551)
#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552)
diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc
index 3709f7d..0886ecf 100644
--- a/extensions/inc/propctrlr.hrc
+++ b/extensions/inc/propctrlr.hrc
@@ -227,16 +227,6 @@
#define HID_PROP_REPEAT "EXTENSIONS_HID_PROP_REPEAT"
#define HID_PROP_WORDBREAK "EXTENSIONS_HID_PROP_WORDBREAK"
#define HID_PROP_SHOW_SCROLLBARS "EXTENSIONS_HID_PROP_SHOW_SCROLLBARS"
-#define HID_FIELDLINK_DETAIL_COLUMN "EXTENSIONS_HID_FIELDLINK_DETAIL_COLUMN"
-#define HID_FIELDLINK_MASTER_COLUMN "EXTENSIONS_HID_FIELDLINK_MASTER_COLUMN"
-#define UID_FIELDLINK_DETAIL1 "EXTENSIONS_UID_FIELDLINK_DETAIL1"
-#define UID_FIELDLINK_MASTER1 "EXTENSIONS_UID_FIELDLINK_MASTER1"
-#define UID_FIELDLINK_DETAIL2 "EXTENSIONS_UID_FIELDLINK_DETAIL2"
-#define UID_FIELDLINK_MASTER2 "EXTENSIONS_UID_FIELDLINK_MASTER2"
-#define UID_FIELDLINK_DETAIL3 "EXTENSIONS_UID_FIELDLINK_DETAIL3"
-#define UID_FIELDLINK_MASTER3 "EXTENSIONS_UID_FIELDLINK_MASTER3"
-#define UID_FIELDLINK_DETAIL4 "EXTENSIONS_UID_FIELDLINK_DETAIL4"
-#define UID_FIELDLINK_MASTER4 "EXTENSIONS_UID_FIELDLINK_MASTER4"
#define HID_PROP_ICONSIZE "EXTENSIONS_HID_PROP_ICONSIZE"
#define HID_PROP_SHOW_POSITION "EXTENSIONS_HID_PROP_SHOW_POSITION"
#define HID_PROP_SHOW_NAVIGATION "EXTENSIONS_HID_PROP_SHOW_NAVIGATION"
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index 96233b1..2a08819 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -27,14 +27,10 @@
//Controls(100)
#define RID_BIB_CONTROLS (RID_BIB_START + 100)
-#define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1)
#define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2)
// free
#define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4)
-//Menu(100)
-#define RID_BIB_MENU (RID_BIB_CONTROLS + 100)
-
// Strings (500)
#define RID_BIB_STRING (RID_BIB_START + 200)
#define RID_BIB_STR_NONE (RID_BIB_STRING + 1)
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 02581b8..84c85f7 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -77,7 +77,6 @@
// FixedLine
#define FL_FRAME 6
-#define FL_FORMSETINGS 7
// Image
@@ -86,7 +85,6 @@
#define WINDOW_SIZE_X 260
#define WINDOW_SIZE_Y 185
-#define WINDOW_HALF_SIZE_X ( WINDOW_SIZE_X / 2 )
#endif
diff --git a/extensions/source/propctrlr/listselectiondlg.hrc b/extensions/source/propctrlr/listselectiondlg.hrc
index 3df83e6..6768364 100644
--- a/extensions/source/propctrlr/listselectiondlg.hrc
+++ b/extensions/source/propctrlr/listselectiondlg.hrc
@@ -20,8 +20,6 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
#define EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
-#define FT_ENTRIES 1
-
#define LB_ENTRIES 1
#define PB_OK 1
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 581f93f..adddca8 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Library_Library,forui))
$(eval $(call gb_Library_set_include,forui,\
$$(INCLUDE) \
- -I$(SRCDIR)/formula/inc \
-I$(SRCDIR)/formula/source/ui/inc \
))
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
deleted file mode 100644
index 461e402..0000000
--- a/formula/inc/helpids.hrc
+++ /dev/null
@@ -1,30 +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 .
- */
-#ifndef FORMULA_HELPID_HRC
-#define FORMULA_HELPID_HRC
-
-#define HID_FORMULA_FAP_PAGE "FORMULA_HID_FORMULA_FAP_PAGE"
-#define HID_FORMULA_FAP_EDIT1 "FORMULA_HID_FORMULA_FAP_EDIT1"
-#define HID_FORMULA_FAP_EDIT2 "FORMULA_HID_FORMULA_FAP_EDIT2"
-#define HID_FORMULA_FAP_EDIT3 "FORMULA_HID_FORMULA_FAP_EDIT3"
-#define HID_FORMULA_FAP_EDIT4 "FORMULA_HID_FORMULA_FAP_EDIT4"
-
-#endif //FORMULA_HELPID_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 3640c81..c56104c 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -19,10 +19,7 @@
#define BTN_HELP 6
#define BTN_CANCEL 7
-#define BTN_BACKWARD 8
-#define BTN_FORWARD 9
#define BTN_END 10
-#define BTN_MATRIX 11
#define ED_FORMULA 17
#define ED_REF 19
#define RB_REF 20
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index ee99d15..4159da1 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -19,7 +19,6 @@
#include "formdlgs.hrc"
#include "ForResId.hrc"
-#include "helpids.hrc"
#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 4b08dd9..a7d5c66 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -23,7 +23,6 @@
#include <vcl/settings.hxx>
#include "parawin.hxx"
-#include "helpids.hrc"
#include "formula/formdata.hxx"
#include "formula/IFunctionDescription.hxx"
#include "ModuleHelper.hxx"
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 87785a0..1d43bbc 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -18,7 +18,6 @@
*/
#include "ForResId.hrc"
-#include "helpids.hrc"
#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 0c0921d..5145f5d 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -44,7 +44,6 @@
#define SFX_EVENT_ACTIVATEDOC (EVENT_SFX_START + 7)
#define SFX_EVENT_DEACTIVATEDOC (EVENT_SFX_START + 8)
#define SFX_EVENT_PRINTDOC (EVENT_SFX_START + 9)
-#define SFX_EVENT_SAVEACOPY (EVENT_SFX_START + 10)
#define SFX_EVENT_LOADFINISHED (EVENT_SFX_START + 11)
@@ -110,14 +109,10 @@
#define RID_DEFAULTIMAGELIST_SC (RID_SFX_START+15)
#define RID_DEFAULTIMAGELIST_LC (RID_SFX_START+17)
-#define RID_STYLECATALOG (RID_SFX_START+1201)
-
#define RID_DEFAULTABOUT (RID_SFX_START+0)
#define DLG_STYLE_DESIGNER (RID_SFX_START+8)
-#define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216)
-
#define STR_STYLE_FILTER_AUTO (RID_SFX_START+9)
#define STR_STYLE_FILTER_USED (RID_SFX_START+10)
#define STR_STYLE_FILTER_USERDEF (RID_SFX_START+11)
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
index 85fd0cf..c819045 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -21,8 +21,6 @@
#include <sfx2/sfx.hrc>
-#define STR_TITLE_DISCRIPTION ( RID_SFX_PROPERTYPANEL_START + 0 )
-
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
#endif
@@ -37,7 +35,6 @@
#define TEXT_CONTROL_SPACING_VERTICAL 2
#define TEXT_HEIGHT 8
-#define CBOX_HEIGHT 12
#define MBOX_HEIGHT 12
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index c030ff7..45ac305 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -81,7 +81,6 @@
#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216)
#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217)
#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218)
-#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303)
#define RID_SVXPAGE_HATCH (RID_SVX_START + 57)
#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58)
#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59)
@@ -180,8 +179,6 @@
#define RID_SVX_UPDATE_STYLE (RID_SVX_START + 122)
#define RID_SVX_MODIFY_STYLE (RID_SVX_START + 123)
-#define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142)
-
#define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226)
// ResId's for Starone impl. bitmaps
@@ -192,22 +189,12 @@
#define RID_SVXIMG_NOTCHECKED (RID_SVX_START + 243)
#define RID_SVXIMG_CHECKED (RID_SVX_START + 244)
-#define RID_SVXDLG_LINK_WARNING (RID_SVX_START + 313)
-#define RID_SIDEBAR_TEXT_PANEL (RID_SVX_START + 314)
-#define RID_POPUPPANEL_TEXTPAGE_UNDERLINE (RID_SVX_START + 315)
-#define RID_POPUPPANEL_TEXTPAGE_FONT_COLOR (RID_SVX_START + 316)
-
#define RID_POPUPPANEL_AREAPAGE_TRGR (RID_SVX_START + 320)
#define RID_SIDEBAR_LINE_PANEL (RID_SVX_START + 321)
-#define RID_SIDEBAR_POSSIZE_PANEL (RID_SVX_START + 325)
-#define RID_SIDEBAR_GRAPHIC_PANEL (RID_SVX_START + 326)
#define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 327)
-#define RID_SIDEBAR_PARA_PANEL (RID_SVX_START + 328)
-#define RID_SIDEBAR_INSERT_PANEL (RID_SVX_START + 329)
-
// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
// Strings ------------------------------------------------------------------
@@ -943,14 +930,9 @@
#define RID_SVXSTR_FINDBAR_MATCHCASE (RID_SVX_START + 1189)
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190)
-#define RID_SVXSTR_NUMBULLET_CURRENT_LIST_DESCRIPTION (RID_SVX_START + 1192)
#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START + 1193)
#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START + 1194)
#define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION (RID_SVX_START + 1195)
-#define RID_SVXSTR_NUMBULLET_CUSTOMIZED_WATERMARK (RID_SVX_START + 1196)
-#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_4 (RID_SVX_START + 1197)
-#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_5 (RID_SVX_START + 1198)
-#define RID_SVXSTR_OUTLINENUM_RTL_DESCRIPTION_7 (RID_SVX_START + 1199)
#define RID_SVXSTR_GRAPHICS_DESCRIPTIONS (RID_SVX_START + 1200)
#define RID_SVXSTR_GRAPHICS_DESCRIPTION_0 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 0) // 1200
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6d2a297..8f9bcf7 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -34,40 +34,12 @@
// Member-Id's
-#define MID_APPFLAG 0x20
-#define MID_AUTOBREAK 0x21
-#define MID_BREAKxxx 0x22
-#define MID_BRUSHSTYLE 0x23
-#define MID_CELLTYPE 0x24
-#define MID_CHARSET 0x25
-#define MID_COMMAND 0x26
-#define MID_CONTENT 0x27
-#define MID_DESCNAMExxx 0x28
-
-#define MID_ESCAPEMENT 0x2a
-#define MID_FAMILY 0x2b
-#define MID_FIRSTLINE_OFFSET 0x2d
-#define MID_FONTFAMILY 0x2f
-#define MID_FONTFAMILYNAME 0x30
-#define MID_FONTSTYLE 0x32
-#define MID_HYPHEN 0x34
#define MID_INTER_LINESPACE 0x36
#define MID_INTER_SPACE 0x37
-#define MID_LANDSCAPE 0x38
-#define MID_LEFT_MARGIN 0x3a
#define MID_LOWER 0x3d
-#define MID_MAXHYPHENS 0x3e
-#define MID_MINLEAD 0x3f
-#define MID_MINTRAIL 0x40
-#define MID_NUMTYPExxx 0x41
-#define MID_PAGEEND 0x42
#define MID_POS 0x43
-#define MID_PROPORTIONAL 0x44
-#define MID_REPLACE_STRING 0x45
#define MID_RIGHT 0x46
-#define MID_RIGHT_MARGIN 0x47
-#define MID_ROW_DIRECTION 0x48
#define MID_SIZE 0x4a
#define MID_UPPER 0x4b
#define MID_USExxx 0x4c
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 00aafb0..f12f0a7 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -37,10 +37,6 @@
#define RID_CONTROL_START RID_RPT_START
#define RID_MISC_START RID_RPT_START
-// Dialog Control Id's -----------------------------------------------------------
-#define RID_DATETIME_DLG ( RID_DIALOG_START + 2 )
-#define WIN_CONDITION ( RID_DIALOG_START + 4 )
-
// strings
#define RID_STR_CLASS_FORMATTEDFIELD ( RID_STRING_START + 1 )
#define RID_STR_CLASS_FIXEDTEXT ( RID_STRING_START + 2 )
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index 8cfa5b9..ed17967 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -26,15 +26,11 @@
#define UID_RPT_PROP_DLG_LINKFIELDS "REPORTDESIGN_UID_RPT_PROP_DLG_LINKFIELDS"
#define UID_RPT_RPT_APP_VIEW "REPORTDESIGN_UID_RPT_RPT_APP_VIEW"
-#define UID_RPT_SCROLLWINDOW "REPORTDESIGN_UID_RPT_SCROLLWINDOW"
#define UID_RPT_REPORTWINDOW "REPORTDESIGN_UID_RPT_REPORTWINDOW"
-#define HID_RPT_HORZ_RULER "REPORTDESIGN_HID_RPT_HORZ_RULER"
-#define HID_RPT_SPLITTER "REPORTDESIGN_HID_RPT_SPLITTER"
#define HID_REPORTSECTION "REPORTDESIGN_HID_REPORTSECTION"
#define HID_RPT_HORZ_SCROLLBAR "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR"
#define HID_RPT_VERT_SCROLLBAR "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR"
#define HID_RPT_FIELDEXPRESSION "REPORTDESIGN_HID_RPT_FIELDEXPRESSION"
-#define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER"
#define HID_RPT_POPUP_COLOR_CTRL "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL"
#define HID_RPT_POPUP_COLOR "REPORTDESIGN_HID_RPT_POPUP_COLOR"
#define HID_RPT_FIELD_SEL "REPORTDESIGN_HID_RPT_FIELD_SEL"
@@ -73,7 +69,6 @@
#define HID_RPT_PROP_GROUPKEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER"
#define HID_RPT_PROP_PAGEHEADEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION"
#define HID_RPT_PROP_PAGEFOOTEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION"
-#define UID_RPT_PROP_DLG_LINE_STYLE "REPORTDESIGN_UID_RPT_PROP_DLG_LINE_STYLE"
#define HID_RPT_PROP_PREVIEW_COUNT "REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT"
#define HID_RPT_PROP_DATAFIELD "REPORTDESIGN_HID_RPT_PROP_DATAFIELD"
#define HID_RPT_PROP_BACKCOLOR "REPORTDESIGN_HID_RPT_PROP_BACKCOLOR"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8395c23..ba1ccb4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -702,9 +702,6 @@
#define RID_GLOBSTR (SC_RESOURCE_START+15)
#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19)
#define RID_ERRHDLSC (SC_RESOURCE_START+23)
-#define RID_MN_FORMAT_ALGN (SC_RESOURCE_START+30)
-#define RID_MN_FORMAT_STYLE (SC_RESOURCE_START+31)
-#define RID_MN_FORMAT_LINESPACE (SC_RESOURCE_START+32)
#define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35)
#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43)
#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44)
@@ -1014,19 +1011,11 @@
#define SC_DIALOGS_START (BMP_END)
-#define RID_SCDLG_FILTER (SC_DIALOGS_START + 8)
-
#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12)
#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18)
-#define RID_SCDLG_NAMES (SC_DIALOGS_START + 22)
-#define RID_SCDLG_DBNAMES (SC_DIALOGS_START + 23)
-#define RID_SCDLG_SOLVER (SC_DIALOGS_START + 26)
-#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
#define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31)
-#define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35)
-#define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42)
#define RID_SCPAGE_AREAS (SC_DIALOGS_START + 44)
#define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46)
@@ -1050,10 +1039,7 @@
#define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69)
#define RID_SCPAGE_PRINT (SC_DIALOGS_START + 70)
-#define RID_SCDLG_CONTACTS (SC_DIALOGS_START + 78)
-
#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79)
-#define RID_SCDLG_AREAS (SC_DIALOGS_START + 81)
// popup for drop-mode in navigator
#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92)
@@ -1066,8 +1052,6 @@
#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113)
#define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114)
-#define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119)
-
#define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120)
#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121)
#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122)
@@ -1083,11 +1067,6 @@
#define RID_SCDLG_DPDATEGROUP (SC_DIALOGS_START + 136)
#define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137)
-#define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
-#define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
-#define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148)
-#define RID_SCDLG_RETYPEPASS (SC_DIALOGS_START + 150)
-
#define RID_POPUP_FILTER (SC_DIALOGS_START + 153)
#define RID_COND_ENTRY (SC_DIALOGS_START + 156)
@@ -1095,9 +1074,6 @@
#define RID_SCDLG_COND_FORMAT_MANAGER (SC_DIALOGS_START + 159)
-// defines for AlignmentPropertyPanel
-#define RID_PROPERTYPANEL_SC_ALIGNMENT (SC_DIALOGS_START + 161)
-
// defines for CellAppearancePropertyPanel
#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 162)
#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 163)
@@ -1131,7 +1107,6 @@
// data Form
#define SID_DATA_FORM (SC_OOO_BUILD_START + 7) // menu (in Data menu)
-#define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 8) // dialog
// compatibility options page
#define RID_SCPAGE_COMPATIBILITY (SC_OOO_BUILD_START + 9)
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b1b1471..84e5216 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -36,7 +36,6 @@
#include "helpids.h"
#include "Outliner.hxx"
-#include "dialogs.hrc"
#include "headerfooterdlg.hxx"
#include "DrawDocShell.hxx"
#include "drawdoc.hxx"
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index e49bc33..820be4a 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -22,7 +22,6 @@
#include "sdresid.hxx"
#include "strings.hrc"
-#include "dialogs.hrc"
#include "masterlayoutdlg.hxx"
#include "drawdoc.hxx"
diff --git a/sd/source/ui/inc/dialogs.hrc b/sd/source/ui/inc/dialogs.hrc
deleted file mode 100644
index b19b8e0..0000000
--- a/sd/source/ui/inc/dialogs.hrc
+++ /dev/null
@@ -1,28 +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 .
- */
-
-/** module unique resource ids for dialogs */
-#define RID_SD_DLG_HEADERFOOTER (1000)
-
-/** module unique resource ids for tabpages */
-#define RID_SD_TABPAGE_HEADERFOOTER (1000)
-#define RID_SD_TABPAGE_HEADERFOOTER_SLIDE (1001)
-#define RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (1002)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list