mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hide more symbols

Browse Source 
using the bin/find-can-be-private-symbols.py script
to find classes with large numbers of exported symbols
that can hidden.

before
exported       = 58104
imported       = 30810
unused_exports = 35433

after
exported       = 55094
imported       = 31073
unused_exports = 32423

Change-Id: Idd0a70ee3740afd5ca1a86771e0e2ff8090d102d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163456
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-02-15 10:04:51 +02:00
parent 5f0021cdd0
commit 3ba92b5f1e
68 changed files with 4637 additions and 5801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8522
bin/find-can-be-private-symbols.functions.results
View File

File diff suppressed because it is too large Load Diff

52
connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
View File

@ -54,11 +54,11 @@ namespace connectivity
// typedef ORefVector<ORowSetValue> ORow;
// typedef ORefVector<ORow> ORows;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet :
public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
class ODatabaseMetaDataResultSet :
public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
{
public:
@ -130,22 +130,22 @@ namespace connectivity
virtual const ORowSetValue& getValue(sal_Int32 columnIndex);
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
OOO_DLLPUBLIC_DBTOOLS virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
OOO_DLLPUBLIC_DBTOOLS virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
virtual ~ODatabaseMetaDataResultSet() override;
public:
virtual void SAL_CALL acquire() noexcept override;
virtual void SAL_CALL release() noexcept override;
OOO_DLLPUBLIC_DBTOOLS virtual void SAL_CALL acquire() noexcept override;
OOO_DLLPUBLIC_DBTOOLS virtual void SAL_CALL release() noexcept override;
/// default construction
ODatabaseMetaDataResultSet();
/// construction of a pre-defined result set type
ODatabaseMetaDataResultSet( MetaDataResultSetType _eType );
OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet( MetaDataResultSetType _eType );
void setRows(ORows&& _rRows);
OOO_DLLPUBLIC_DBTOOLS void setRows(ORows&& _rRows);
// XServiceInfo
@ -156,11 +156,11 @@ namespace connectivity
// ::cppu::OComponentHelper
virtual void SAL_CALL disposing() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
OOO_DLLPUBLIC_DBTOOLS virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
OOO_DLLPUBLIC_DBTOOLS virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
// XResultSet
virtual sal_Bool SAL_CALL next( ) override;
virtual sal_Bool SAL_CALL isBeforeFirst( ) override;
@ -238,31 +238,31 @@ namespace connectivity
// some methods to get already defined ORowSetValues
// this increase the reuse of ORowSetValues
/// return an empty ORowSetValueDecorator
static ORowSetValueDecoratorRef const & getEmptyValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getEmptyValue();
/// return an ORowSetValueDecorator with 0 as value
static ORowSetValueDecoratorRef const & get0Value();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & get0Value();
/// return an ORowSetValueDecorator with 1 as value
static ORowSetValueDecoratorRef const & get1Value();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & get1Value();
/// return an ORowSetValueDecorator with ColumnSearch::BASIC as value
static ORowSetValueDecoratorRef const & getBasicValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getBasicValue();
/// return an ORowSetValueDecorator with string SELECT as value
static ORowSetValueDecoratorRef const & getSelectValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getSelectValue();
/// return an ORowSetValueDecorator with string INSERT as value
static ORowSetValueDecoratorRef const & getInsertValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getInsertValue();
/// return an ORowSetValueDecorator with string DELETE as value
static ORowSetValueDecoratorRef const & getDeleteValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getDeleteValue();
/// return an ORowSetValueDecorator with string UPDATE as value
static ORowSetValueDecoratorRef const & getUpdateValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getUpdateValue();
/// return an ORowSetValueDecorator with string CREATE as value
static ORowSetValueDecoratorRef const & getCreateValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getCreateValue();
/// return an ORowSetValueDecorator with string READ as value
static ORowSetValueDecoratorRef const & getReadValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getReadValue();
/// return an ORowSetValueDecorator with string ALTER as value
static ORowSetValueDecoratorRef const & getAlterValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getAlterValue();
/// return an ORowSetValueDecorator with string DROP as value
static ORowSetValueDecoratorRef const & getDropValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getDropValue();
/// return an ORowSetValueDecorator with string ' as value
static ORowSetValueDecoratorRef const & getQuoteValue();
OOO_DLLPUBLIC_DBTOOLS static ORowSetValueDecoratorRef const & getQuoteValue();
};
}

2
connectivity/source/inc/odbc/OConnection.hxx
View File

@ -41,7 +41,7 @@ namespace connectivity::odbc
typedef connectivity::OMetaConnection OConnection_BASE;
typedef std::vector< ::connectivity::OTypeInfo> TTypeInfoVector;
class OOO_DLLPUBLIC_ODBCBASE OConnection final :
class OConnection final :
public OConnection_BASE,
public OAutoRetrievingBase
{

2
connectivity/source/inc/odbc/ODatabaseMetaData.hxx
View File

@ -29,7 +29,7 @@ namespace connectivity::odbc
//************ Class: ODatabaseMetaData
class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData final :
class ODatabaseMetaData final :
public ODatabaseMetaDataBase
{
SQLHANDLE m_aConnectionHandle;

2
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
View File

@ -53,7 +53,7 @@ namespace connectivity::odbc
css::sdbc::XCloseable,
css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet :
class ODatabaseMetaDataResultSet :
public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::cppu::OPropertySetHelper,

2
connectivity/source/inc/odbc/OPreparedStatement.hxx
View File

@ -38,7 +38,7 @@ namespace connectivity::odbc
css::sdbc::XResultSetMetaDataSupplier,
css::lang::XServiceInfo> OPreparedStatement_BASE;
class OOO_DLLPUBLIC_ODBCBASE OPreparedStatement final :
class OPreparedStatement final :
public OStatement_BASE2,
public OPreparedStatement_BASE
{

12
connectivity/source/inc/odbc/OResultSet.hxx
View File

@ -102,12 +102,12 @@ namespace connectivity::odbc
typedef std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap;
class OOO_DLLPUBLIC_ODBCBASE OResultSet :
public cppu::BaseMutex,
public ::connectivity::IResultSetHelper,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
class OResultSet :
public cppu::BaseMutex,
public ::connectivity::IResultSetHelper,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
{
protected:
TBookmarkPosMap m_aPosToBookmarks;

2
connectivity/source/inc/odbc/OResultSetMetaData.hxx
View File

@ -33,7 +33,7 @@ namespace connectivity::odbc
typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData final :
class OResultSetMetaData final :
public OResultSetMetaData_BASE
{
std::vector<sal_Int32> m_vMapping; // when not every column is needed

18
connectivity/source/inc/odbc/OStatement.hxx
View File

@ -52,11 +52,11 @@ namespace connectivity::odbc
//************ Class: java.sql.Statement
class OOO_DLLPUBLIC_ODBCBASE OStatement_Base :
public cppu::BaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
class OStatement_Base :
public cppu::BaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
{
css::sdbc::SQLWarning m_aLastWarning;
@ -218,10 +218,10 @@ namespace connectivity::odbc
virtual void SAL_CALL disposing() override;
};
class OOO_DLLPUBLIC_ODBCBASE OStatement :
public OStatement_BASE2,
public css::sdbc::XBatchExecution,
public css::lang::XServiceInfo
class OStatement :
public OStatement_BASE2,
public css::sdbc::XBatchExecution,
public css::lang::XServiceInfo
{
protected:
virtual ~OStatement() override {}

10
desktop/inc/lib/init.hxx
View File

@ -93,14 +93,14 @@ namespace desktop {
};
/// One instance of this per view, handles flushing callbacks
class DESKTOP_DLLPUBLIC CallbackFlushHandler final : public Idle, public SfxLokCallbackInterface
class CallbackFlushHandler final : public Idle, public SfxLokCallbackInterface
{
public:
explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument, LibreOfficeKitCallback pCallback, void* pData);
virtual ~CallbackFlushHandler() override;
DESKTOP_DLLPUBLIC explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument, LibreOfficeKitCallback pCallback, void* pData);
DESKTOP_DLLPUBLIC virtual ~CallbackFlushHandler() override;
virtual void Invoke() override;
// TODO This should be dropped and the binary libreOfficeKitViewCallback() variants should be called?
void queue(const int type, const OString& data);
DESKTOP_DLLPUBLIC void queue(const int type, const OString& data);
/// Disables callbacks on this handler. Must match with identical count
/// of enableCallbacks. Used during painting and changing views.
@ -119,7 +119,7 @@ namespace desktop {
// SfxLockCallbackInterface
virtual void libreOfficeKitViewCallback(int nType, const OString& pPayload) override;
virtual void libreOfficeKitViewCallbackWithViewId(int nType, const OString& pPayload, int nViewId) override;
virtual void libreOfficeKitViewInvalidateTilesCallback(const tools::Rectangle* pRect, int nPart, int nMode) override;
DESKTOP_DLLPUBLIC virtual void libreOfficeKitViewInvalidateTilesCallback(const tools::Rectangle* pRect, int nPart, int nMode) override;
virtual void libreOfficeKitViewUpdatedCallback(int nType) override;
virtual void libreOfficeKitViewUpdatedCallbackPerViewId(int nType, int nViewId, int nSourceViewId) override;
virtual void libreOfficeKitViewAddPendingInvalidateTiles() override;

38
include/connectivity/sqliterator.hxx
View File

@ -76,7 +76,7 @@ namespace connectivity
struct OSQLParseTreeIteratorImpl;
class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator final
class OSQLParseTreeIterator final
{
private:
std::optional<css::sdbc::SQLException> m_xErrors; // contains the error while iterating through the statement
@ -155,29 +155,29 @@ namespace connectivity
OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) = delete;
public:
OSQLParseTreeIterator(
OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator(
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const css::uno::Reference< css::container::XNameAccess >& _rxTables,
const OSQLParser& _rParser );
~OSQLParseTreeIterator();
OOO_DLLPUBLIC_DBTOOLS ~OSQLParseTreeIterator();
void dispose();
bool isCaseSensitive() const;
OOO_DLLPUBLIC_DBTOOLS void dispose();
OOO_DLLPUBLIC_DBTOOLS bool isCaseSensitive() const;
// The parse tree to be analysed/traversed:
// If NULL is passed, the current parse tree will be deleted and the error status cleared.
void setParseTree(const OSQLParseNode * pNewParseTree);
OOO_DLLPUBLIC_DBTOOLS void setParseTree(const OSQLParseNode * pNewParseTree);
const OSQLParseNode * getParseTree() const { return m_pParseTree; };
// subtrees in case of a select statement
const OSQLParseNode* getWhereTree() const;
const OSQLParseNode* getOrderTree() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getWhereTree() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getOrderTree() const;
const OSQLParseNode* getGroupByTree() const;
const OSQLParseNode* getHavingTree() const;
const OSQLParseNode* getSimpleWhereTree() const;
const OSQLParseNode* getSimpleOrderTree() const;
const OSQLParseNode* getSimpleGroupByTree() const;
const OSQLParseNode* getSimpleHavingTree() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleWhereTree() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleOrderTree() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleGroupByTree() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleHavingTree() const;
/** returns the errors which occurred during parsing.
@ -195,10 +195,10 @@ namespace connectivity
Implemented by calling the single traverse* methods in the proper
order (depending on the statement type).
*/
void traverseAll();
OOO_DLLPUBLIC_DBTOOLS void traverseAll();
// The TableRangeMap contains all tables associated with the range name found first.
const OSQLTables& getTables() const;
OOO_DLLPUBLIC_DBTOOLS const OSQLTables& getTables() const;
const ::rtl::Reference<OSQLColumns>& getSelectColumns() const { return m_aSelectColumns;}
const ::rtl::Reference<OSQLColumns>& getGroupColumns() const { return m_aGroupColumns;}
@ -213,7 +213,7 @@ namespace connectivity
@param _rTableRange
The table range to be set.
*/
void getColumnRange( const OSQLParseNode* _pColumnRef,
OOO_DLLPUBLIC_DBTOOLS void getColumnRange( const OSQLParseNode* _pColumnRef,
OUString &_rColumnName,
OUString& _rTableRange) const;
@ -241,7 +241,7 @@ namespace connectivity
@return
The alias name of the column or an empty string.
*/
static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn);
OOO_DLLPUBLIC_DBTOOLS static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn);
/** return the columname and the table range
@param _pColumnRef
@ -253,19 +253,19 @@ namespace connectivity
@param _rTableRange
The table range to be set.
*/
static void getColumnRange( const OSQLParseNode* _pColumnRef,
OOO_DLLPUBLIC_DBTOOLS static void getColumnRange( const OSQLParseNode* _pColumnRef,
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
OUString &_rColumnName,
OUString& _rTableRange);
// return true when the tableNode is a rule like catalog_name, schema_name or table_name
static bool isTableNode(const OSQLParseNode* _pTableNode);
OOO_DLLPUBLIC_DBTOOLS static bool isTableNode(const OSQLParseNode* _pTableNode);
// tries to find the correct type of the function
sal_Int32 getFunctionReturnType(const OSQLParseNode* _pNode );
// returns a lis of all joined columns
::std::vector< TNodePair >& getJoinConditions() const;
OOO_DLLPUBLIC_DBTOOLS ::std::vector< TNodePair >& getJoinConditions() const;
private:

10
include/dbaccess/dbaundomanager.hxx
View File

@ -55,17 +55,17 @@ namespace dbaui
struct UndoManager_Impl;
typedef ::cppu::ImplHelper1< css::document::XUndoManager > UndoManager_Base;
class DBACCESS_DLLPUBLIC UndoManager final : public UndoManager_Base
class UndoManager final : public UndoManager_Base
{
public:
UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex );
DBACCESS_DLLPUBLIC UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex );
virtual ~UndoManager();
SfxUndoManager& GetSfxUndoManager() const;
DBACCESS_DLLPUBLIC SfxUndoManager& GetSfxUndoManager() const;
// XInterface
virtual void SAL_CALL acquire( ) noexcept override;
virtual void SAL_CALL release( ) noexcept override;
DBACCESS_DLLPUBLIC virtual void SAL_CALL acquire( ) noexcept override;
DBACCESS_DLLPUBLIC virtual void SAL_CALL release( ) noexcept override;
// XComponent equivalents
void disposing();

10
include/oox/export/chartexport.hxx
View File

@ -128,7 +128,7 @@ private:
};
class OOX_DLLPUBLIC ChartExport final : public DrawingML {
class ChartExport final : public DrawingML {
public:
// first: data sequence for label, second: data sequence for values.
@ -257,18 +257,18 @@ private:
public:
ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel,
OOX_DLLPUBLIC ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel,
::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType );
virtual ~ChartExport() {}
void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer);
OOX_DLLPUBLIC void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer);
const css::uno::Reference< css::frame::XModel >& getModel() const { return mxChartModel; }
void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount );
OOX_DLLPUBLIC void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount );
void exportTextProps(const css::uno::Reference< css::beans::XPropertySet >& xPropSet);
void ExportContent();
OOX_DLLPUBLIC void ExportContent();
void InitRangeSegmentationProperties(
const css::uno::Reference<
css::chart2::XChartDocument > & xChartDoc );

34
include/oox/export/drawingml.hxx
View File

@ -280,12 +280,12 @@ public:
void writeSvgExtension(OUString const& rSvgRelId);
};
class OOX_DLLPUBLIC DrawingML
class DrawingML
{
private:
static sal_Int32 mnDrawingMLCount;
static sal_Int32 mnVmlCount;
OOX_DLLPUBLIC static sal_Int32 mnDrawingMLCount;
OOX_DLLPUBLIC static sal_Int32 mnVmlCount;
/// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC).
DocumentType meDocumentType;
@ -300,7 +300,7 @@ protected:
/// If set, this is the parent of the currently handled shape.
css::uno::Reference<css::drawing::XShape> m_xParent;
bool mbIsBackgroundDark;
static sal_Int32 mnChartCount;
OOX_DLLPUBLIC static sal_Int32 mnChartCount;
/// True when exporting presentation placeholder shape.
bool mbPlaceholder;
@ -325,7 +325,7 @@ protected:
@param eDate LO Date format
@param eTime LO Time format
*/
static OUString GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeFormat eTime);
OOX_DLLPUBLIC static OUString GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeFormat eTime);
/// Output the media (including copying a video from vnd.sun.star.Package: to the output if necessary).
void WriteMediaNonVisualProperties(const css::uno::Reference<css::drawing::XShape>& xShape);
@ -362,7 +362,7 @@ public:
void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; }
/// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship
OUString writeGraphicToStorage(const Graphic &rGraphic , bool bRelPathToMedia = false, GraphicExport::TypeHint eHint = GraphicExport::TypeHint::Detect);
OOX_DLLPUBLIC OUString writeGraphicToStorage(const Graphic &rGraphic , bool bRelPathToMedia = false, GraphicExport::TypeHint eHint = GraphicExport::TypeHint::Detect);
void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
@ -379,7 +379,7 @@ public:
void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
void WriteSolidFill( const ::Color nColor, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
void WriteSolidFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
OOX_DLLPUBLIC void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
/* New API for WriteGradientFill:
If a BGradient is given, it will be used. Else, the 'Fix' entry will be used for
@ -395,7 +395,7 @@ public:
void WriteBlipOrNormalFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
const OUString& rURLPropName, const css::awt::Size& rSize = {});
void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
OOX_DLLPUBLIC void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
const OUString& sURLPropName, const css::awt::Size& rSize = {});
void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
const css::awt::Size& rSize, const OUString& sURLPropName,
@ -416,7 +416,7 @@ public:
void WriteSrcRectXGraphic(css::uno::Reference<css::beans::XPropertySet> const & rxPropertySet,
css::uno::Reference<css::graphic::XGraphic> const & rxGraphic);
void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
OOX_DLLPUBLIC void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
css::uno::Reference< css::frame::XModel> const & xModel = nullptr );
void WriteXGraphicStretch(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet,
@ -442,7 +442,7 @@ public:
css::uno::Reference<css::graphic::XGraphic> const& rxGraphic,
css::awt::Size const& rSize);
void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape,
OOX_DLLPUBLIC void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false, bool bSuppressFlipping = false, bool bFlippedBeforeRotation = false);
void WriteTransformation(const css::uno::Reference< css::drawing::XShape >& xShape, const tools::Rectangle& rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0, bool bIsGroupShape = false);
@ -472,7 +472,7 @@ public:
const css::uno::Reference< css::beans::XPropertySet >& rXShapePropSet = {});
void WritePresetShape( const OString& pShape , std::vector< std::pair<sal_Int32,sal_Int32>> & rAvList );
void WritePresetShape( const OString& pShape );
OOX_DLLPUBLIC void WritePresetShape( const OString& pShape );
void WritePresetShape( const OString& pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, const css::beans::PropertyValue& rProp );
bool WriteCustomGeometry(
const css::uno::Reference<css::drawing::XShape>& rXShape,
@ -480,19 +480,19 @@ public:
void WriteEmptyCustomGeometry();
void WritePolyPolygon(const css::uno::Reference<css::drawing::XShape>& rXShape,
const bool bClosed);
void WriteFill(const css::uno::Reference<css::beans::XPropertySet>& xPropSet,
OOX_DLLPUBLIC void WriteFill(const css::uno::Reference<css::beans::XPropertySet>& xPropSet,
const css::awt::Size& rSize = {});
void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
OOX_DLLPUBLIC void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
void WriteShapeEffect( std::u16string_view sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps );
/** Populates scene3d tag
@param rXPropSet Prop set
@param bIsText True if the 3D effects are for a text body, false if it is for a shape
*/
void Write3DEffects(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, bool bIsText);
OOX_DLLPUBLIC void Write3DEffects(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, bool bIsText);
void WriteArtisticEffect( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData );
void WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape, int nDiagramId);
OOX_DLLPUBLIC void WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape, int nDiagramId);
void writeDiagramRels(const css::uno::Sequence<css::uno::Sequence<css::uno::Any>>& xRelSeq,
const css::uno::Reference<css::io::XOutputStream>& xOutStream,
std::u16string_view sGrabBagProperyName, int nDiagramId);
@ -502,7 +502,7 @@ public:
static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape );
sal_Int32 getBulletMarginIndentation (const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, std::u16string_view propName);
static void ResetMlCounters();
OOX_DLLPUBLIC static void ResetMlCounters();
static sal_Int32 getNewDrawingUniqueId() { return ++mnDrawingMLCount; }
static sal_Int32 getNewVMLUniqueId() { return ++mnVmlCount; }
@ -525,7 +525,7 @@ public:
const OUString& sRelationshipType,
OUString* pRelationshipId );
std::shared_ptr<GraphicExport> createGraphicExport();
OOX_DLLPUBLIC std::shared_ptr<GraphicExport> createGraphicExport();
};
}

3
include/sfx2/charwin.hxx
View File

@ -26,7 +26,7 @@
#include <vcl/weld.hxx>
#include <deque>
class SFX2_DLLPUBLIC SvxCharView final : public weld::CustomWidgetController
class SAL_DLLPUBLIC_RTTI SvxCharView final : public weld::CustomWidgetController
{
private:
VclPtr<VirtualDevice> mxVirDev;
@ -52,6 +52,7 @@ private:
bool GetDecimalValueAndCharName(sal_UCS4& rDecimalValue, OUString& rCharName);
public:
SvxCharView(const VclPtr<VirtualDevice>& rVirDev);
SFX2_DLLPUBLIC virtual ~SvxCharView() override;
void SetFont( const vcl::Font& rFont );
vcl::Font const & GetFont() const { return maFont; }

6
include/sot/stg.hxx
View File

@ -236,15 +236,15 @@ namespace ucbhelper
class UCBStorage_Impl;
struct UCBStorageElement_Impl;
class SOT_DLLPUBLIC UCBStorage final : public BaseStorage
class UCBStorage final : public BaseStorage
{
UCBStorage_Impl* pImp;
virtual ~UCBStorage() override;
public:
static bool IsStorageFile( SvStream* );
SOT_DLLPUBLIC static bool IsStorageFile( SvStream* );
UCBStorage( const ::ucbhelper::Content& rContent,
SOT_DLLPUBLIC UCBStorage( const ::ucbhelper::Content& rContent,
const OUString& rName,
StreamMode nMode,
bool bDirect,

4
include/svtools/openfiledroptargetlistener.hxx
View File

@ -37,7 +37,7 @@ namespace com::sun::star::uno {
/** DropTargetListener that takes care of opening a file when it is dropped in the frame.
*/
class UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener final : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener >
class OpenFileDropTargetListener final : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener >
{
private:
/// uno service manager to create necessary services
@ -50,7 +50,7 @@ class UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener final : public
DataFlavorExVector m_aFormats;
public:
OpenFileDropTargetListener( css::uno::Reference< css::uno::XComponentContext > xContext,
UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener( css::uno::Reference< css::uno::XComponentContext > xContext,
const css::uno::Reference< css::frame::XFrame >& xFrame );
virtual ~OpenFileDropTargetListener() override;

12
include/svx/charmap.hxx
View File

@ -52,19 +52,19 @@ namespace svx
class SvxShowCharSetAcc;
}
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxShowCharSet : public weld::CustomWidgetController
class SAL_WARN_UNUSED SvxShowCharSet : public weld::CustomWidgetController
{
protected:
VclPtr<VirtualDevice> mxVirDev;
vcl::Font maFont;
std::unique_ptr<weld::ScrolledWindow> mxScrollArea;
public:
SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrollArea, const VclPtr<VirtualDevice>& rVirDev);
SVX_DLLPUBLIC SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrollArea, const VclPtr<VirtualDevice>& rVirDev);
virtual ~SvxShowCharSet() override;
virtual void RecalculateFont(vcl::RenderContext& rRenderContext);
void SelectCharacter( sal_UCS4 cNew );
SVX_DLLPUBLIC void SelectCharacter( sal_UCS4 cNew );
virtual sal_UCS4 GetSelectCharacter() const;
virtual sal_UCS4 GetCharFromIndex(int index) const;
void createContextMenu(const Point& rPosition);
@ -76,9 +76,9 @@ public:
void SetPreSelectHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aPreSelectHdl = rHdl; }
void SetFavClickHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aFavClickHdl = rHdl; }
static sal_uInt32& getSelectedChar();
void SetFont( const vcl::Font& rFont );
SVX_DLLPUBLIC void SetFont( const vcl::Font& rFont );
vcl::Font const & GetFont() const { return maFont; }
FontCharMapRef const & GetFontCharMap();
SVX_DLLPUBLIC FontCharMapRef const & GetFontCharMap();
bool isFavChar(std::u16string_view sTitle, std::u16string_view rFont);
void getFavCharacterList(); //gets both Fav char and Fav char font list
void updateFavCharacterList(const OUString& rChar, const OUString& rFont);
@ -153,7 +153,7 @@ protected:
void InitSettings(vcl::RenderContext& rRenderContext);
// abstraction layers are: Unicode<->MapIndex<->Pixel
Point MapIndexToPixel( int) const;
DECL_DLLPRIVATE_LINK(VscrollHdl, weld::ScrolledWindow&, void);
DECL_LINK(VscrollHdl, weld::ScrolledWindow&, void);
void ContextMenuSelect(std::u16string_view rIdent);
void init();

4
include/svx/cube3d.hxx
View File

@ -44,7 +44,7 @@ class E3dDefaultAttributes;
|*
\************************************************************************/
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject
class SAL_WARN_UNUSED E3dCubeObj final : public E3dCompoundObject
{
// Parameter
basegfx::B3DPoint aCubePos;
@ -61,7 +61,7 @@ private:
virtual ~E3dCubeObj() override;
public:
E3dCubeObj(SdrModel& rSdrModel,
SVXCORE_DLLPUBLIC E3dCubeObj(SdrModel& rSdrModel,
const E3dDefaultAttributes& rDefault,
const basegfx::B3DPoint& aPos,
const basegfx::B3DVector& r3DSize);

10
include/svx/graphctl.hxx
View File

@ -43,7 +43,7 @@ public:
class SvxGraphCtrlAccessibleContext;
class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
class GraphCtrl : public weld::CustomWidgetController
{
friend class GraphCtrlView;
friend class GraphCtrlUserCall;
@ -65,7 +65,7 @@ class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
bool mbInIdleUpdate;
weld::Dialog* mpDialog;
DECL_DLLPRIVATE_LINK( UpdateHdl, Timer*, void );
DECL_LINK( UpdateHdl, Timer*, void );
rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
@ -93,11 +93,11 @@ protected:
public:
GraphCtrl(weld::Dialog* pDialog);
SVX_DLLPUBLIC GraphCtrl(weld::Dialog* pDialog);
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
virtual ~GraphCtrl() override;
SVX_DLLPUBLIC virtual ~GraphCtrl() override;
void SetGraphic( const Graphic& rGraphic, bool bNewModel = true );
SVX_DLLPUBLIC void SetGraphic( const Graphic& rGraphic, bool bNewModel = true );
const Graphic& GetGraphic() const { return aGraphic; }
const Size& GetGraphicSize() const { return aGraphSize; }

4
include/svx/lathe3d.hxx
View File

@ -39,7 +39,7 @@ class E3dDefaultAttributes;
|*
\************************************************************************/
class SVXCORE_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject
class E3dLatheObj final : public E3dCompoundObject
{
basegfx::B2DPolyPolygon maPolyPoly2D;
@ -52,7 +52,7 @@ private:
virtual ~E3dLatheObj() override;
public:
E3dLatheObj(
SVXCORE_DLLPUBLIC E3dLatheObj(
SdrModel& rSdrModel,
const E3dDefaultAttributes& rDefault,
basegfx::B2DPolyPolygon aPoly2D);

4
include/svx/sphere3d.hxx
View File

@ -32,7 +32,7 @@ class E3dDefaultAttributes;
* SphereObject with diameter r3DSize.
* The count of planes depends on the horizontal and vertical segment count.
*/
class SVXCORE_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject
class E3dSphereObj final : public E3dCompoundObject
{
private:
basegfx::B3DPoint aCenter;
@ -47,7 +47,7 @@ private:
virtual ~E3dSphereObj() override;
public:
E3dSphereObj(
SVXCORE_DLLPUBLIC E3dSphereObj(
SdrModel& rSdrModel,
const E3dDefaultAttributes& rDefault,
const basegfx::B3DPoint& rCenter,

12
include/toolkit/awt/vclxwindows.hxx
View File

@ -535,25 +535,25 @@ protected:
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
class TOOLKIT_DLLPUBLIC SVTXNumericField final : public cppu::ImplInheritanceHelper<SVTXFormattedField, css::awt::XNumericField>
class SVTXNumericField final : public cppu::ImplInheritanceHelper<SVTXFormattedField, css::awt::XNumericField>
{
public:
SVTXNumericField();
virtual ~SVTXNumericField() override;
// css::awt::XNumericField
void SAL_CALL setValue( double Value ) override;
double SAL_CALL getValue( ) override;
TOOLKIT_DLLPUBLIC void SAL_CALL setValue( double Value ) override;
TOOLKIT_DLLPUBLIC double SAL_CALL getValue( ) override;
void SAL_CALL setMin( double Value ) override;
double SAL_CALL getMin( ) override;
TOOLKIT_DLLPUBLIC double SAL_CALL getMin( ) override;
void SAL_CALL setMax( double Value ) override;
double SAL_CALL getMax( ) override;
TOOLKIT_DLLPUBLIC double SAL_CALL getMax( ) override;
void SAL_CALL setFirst( double Value ) override;
double SAL_CALL getFirst( ) override;
void SAL_CALL setLast( double Value ) override;
double SAL_CALL getLast( ) override;
void SAL_CALL setSpinSize( double Value ) override;
double SAL_CALL getSpinSize( ) override;
TOOLKIT_DLLPUBLIC double SAL_CALL getSpinSize( ) override;
void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
sal_Int16 SAL_CALL getDecimalDigits( ) override;
void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;

10
include/tools/b3dtrans.hxx
View File

@ -30,7 +30,7 @@
#include <tools/toolsdllapi.h>
/// Transformation sets for 3D output
class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dTransformationSet
class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI B3dTransformationSet
{
private:
// Object Matrix Object -> World
@ -106,16 +106,16 @@ public:
// aspect ratio accessors and the defined method of keeping defined aspect ratio
double GetRatio() const { return mfRatio; }
void SetRatio(double fNew);
TOOLS_DLLPUBLIC void SetRatio(double fNew);
// Parameters of ViewportTransformation
void SetDeviceRectangle(double fL=-1.0, double fR=1.0,
TOOLS_DLLPUBLIC void SetDeviceRectangle(double fL=-1.0, double fR=1.0,
double fB=-1.0, double fT=1.0);
double GetDeviceRectangleWidth() const { return mfRightBound - mfLeftBound; }
void SetPerspective(bool bNew);
TOOLS_DLLPUBLIC void SetPerspective(bool bNew);
void SetViewportRectangle(tools::Rectangle const & rRect, tools::Rectangle const & rVisible);
TOOLS_DLLPUBLIC void SetViewportRectangle(tools::Rectangle const & rRect, tools::Rectangle const & rVisible);
void SetViewportRectangle(tools::Rectangle const & rRect) { SetViewportRectangle(rRect, rRect); }
void CalcViewport();

22
include/ucbhelper/propertyvalueset.hxx
View File

@ -54,7 +54,7 @@ class PropertyValues;
* values to return can easily appended to a valueset object. That object can
* directly be returned by the implementation of the command.
*/
class UCBHELPER_DLLPUBLIC PropertyValueSet final :
class PropertyValueSet final :
public cppu::WeakImplHelper<
css::sdbc::XRow,
css::sdbc::XColumnLocate>
@ -67,7 +67,7 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet final :
bool m_bTriedToGetTypeConverter;
private:
UCBHELPER_DLLPRIVATE const css::uno::Reference< css::script::XTypeConverter >&
const css::uno::Reference< css::script::XTypeConverter >&
getTypeConverter();
template <class T, T ucbhelper_impl::PropertyValue::*_member_name_>
@ -77,7 +77,7 @@ private:
void appendValue(const OUString& rPropName, PropsSet nTypeName, const T& rValue);
public:
PropertyValueSet(
UCBHELPER_DLLPUBLIC PropertyValueSet(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~PropertyValueSet() override;
@ -138,37 +138,37 @@ public:
// Non-interface methods
void appendString( const OUString& rPropName, const OUString& rValue );
UCBHELPER_DLLPUBLIC void appendString( const OUString& rPropName, const OUString& rValue );
void appendString( const css::beans::Property& rProp, const OUString& rValue )
{
appendString( rProp.Name, rValue );
}
void appendBoolean( const OUString& rPropName, bool bValue );
UCBHELPER_DLLPUBLIC void appendBoolean( const OUString& rPropName, bool bValue );
void appendBoolean( const css::beans::Property& rProp, bool bValue )
{
appendBoolean( rProp.Name, bValue );
}
void appendLong( const OUString& rPropName, sal_Int64 nValue );
UCBHELPER_DLLPUBLIC void appendLong( const OUString& rPropName, sal_Int64 nValue );
void appendLong( const css::beans::Property& rProp, sal_Int64 nValue )
{
appendLong( rProp.Name, nValue );
}
void appendTimestamp( const OUString& rPropName, const css::util::DateTime& rValue );
UCBHELPER_DLLPUBLIC void appendTimestamp( const OUString& rPropName, const css::util::DateTime& rValue );
void appendTimestamp( const css::beans::Property& rProp, const css::util::DateTime& rValue )
{
appendTimestamp( rProp.Name, rValue );
}
void appendObject( const OUString& rPropName, const css::uno::Any& rValue );
UCBHELPER_DLLPUBLIC void appendObject( const OUString& rPropName, const css::uno::Any& rValue );
void appendObject( const css::beans::Property& rProp, const css::uno::Any& rValue )
{
appendObject( rProp.Name, rValue );
}
void appendVoid( const OUString& rPropName );
UCBHELPER_DLLPUBLIC void appendVoid( const OUString& rPropName );
void appendVoid( const css::beans::Property& rProp )
{
appendVoid( rProp.Name );
@ -180,7 +180,7 @@ public:
*
* @param rSet is a property set containing the property values.
*/
void appendPropertySet( const css::uno::Reference< css::beans::XPropertySet >& rSet );
UCBHELPER_DLLPUBLIC void appendPropertySet( const css::uno::Reference< css::beans::XPropertySet >& rSet );
/** This method tries to append a single property value contained in a
* property set to the value set.
@ -191,7 +191,7 @@ public:
* @return False, if the property value cannot be obtained from the
* given property pet. True, otherwise.
*/
bool appendPropertySetValue(
UCBHELPER_DLLPUBLIC bool appendPropertySetValue(
const css::uno::Reference< css::beans::XPropertySet >& rSet,
const css::beans::Property& rProperty );
};

14
include/ucbhelper/resultset.hxx
View File

@ -56,7 +56,7 @@ struct ResultSet_Impl;
*
* @see ResultSetDataSupplier
*/
class UCBHELPER_DLLPUBLIC ResultSet final :
class ResultSet final :
public cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::lang::XComponent,
@ -78,7 +78,7 @@ public:
* shall be able to obtain the values.
* @param rDataSupplier is a supplier for the resultset data.
*/
ResultSet(
UCBHELPER_DLLPUBLIC ResultSet(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::beans::Property >& rProperties,
const rtl::Reference< ResultSetDataSupplier >& rDataSupplier );
@ -92,7 +92,7 @@ public:
* @param rxEnv is the environment for interactions, progress propagation,
* ...
*/
ResultSet(
UCBHELPER_DLLPUBLIC ResultSet(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::beans::Property >& rProperties,
const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
@ -253,13 +253,13 @@ public:
* @param nOld is the old count of rows; must be non-negative.
* @param nnew is the new count of rows; must be non-negative.
*/
void rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew );
UCBHELPER_DLLPUBLIC void rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew );
/**
* This method should be called by the data supplier for the result set
* to indicate that there were all rows obtained from the data source.
*/
void rowCountFinal();
UCBHELPER_DLLPUBLIC void rowCountFinal();
/**
* This method returns a sequence containing all properties ( not the
@ -267,7 +267,7 @@ public:
*
* @return a sequence of properties.
*/
const css::uno::Sequence< css::beans::Property >&
UCBHELPER_DLLPUBLIC const css::uno::Sequence< css::beans::Property >&
getProperties() const;
/**
@ -276,7 +276,7 @@ public:
*
* @return an environment or an empty reference.
*/
const css::uno::Reference< css::ucb::XCommandEnvironment >&
UCBHELPER_DLLPUBLIC const css::uno::Reference< css::ucb::XCommandEnvironment >&
getEnvironment() const;
};

6
include/ucbhelper/resultsetmetadata.hxx
View File

@ -69,7 +69,7 @@ ResultSetColumnData::ResultSetColumnData()
* css::sdbc::XResultSetMetaDataSupplier, which is required for
* implementations of service com.sun.star.ucb.ContentResultSet.
*/
class UCBHELPER_DLLPUBLIC ResultSetMetaData final :
class ResultSetMetaData final :
public cppu::WeakImplHelper<css::sdbc::XResultSetMetaData>
{
std::unique_ptr<ucbhelper_impl::ResultSetMetaData_Impl> m_pImpl;
@ -85,7 +85,7 @@ public:
* @param rProps is a sequence of properties (partially) describing the
* columns of a resultset.
*/
ResultSetMetaData(
UCBHELPER_DLLPUBLIC ResultSetMetaData(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::beans::Property >& rProps );
@ -102,7 +102,7 @@ public:
* rColumnData[ 0 ] corresponds to data in rProps[ 0 ],
* rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ...
*/
ResultSetMetaData(
UCBHELPER_DLLPUBLIC ResultSetMetaData(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::beans::Property >& rProps,
std::vector< ResultSetColumnData >&& rColumnData );

23
include/vcl/accessibility/AccessibleTextAttributeHelper.hxx
View File

@ -48,20 +48,9 @@ template <> struct o3tl::typed_flags<IA2AttributeType> : is_typed_flags<IA2Attri
{
};
class VCL_DLLPUBLIC AccessibleTextAttributeHelper
namespace AccessibleTextAttributeHelper
{
public:
/** Converts UNO text attribute properties to a string holding
* the corresponding IAccessible2 text attributes.
* @param rUnoAttributes A sequence holding the UNO text attributes.
* @param eAttributeType: The type(s) of attributes of interest.
* @returns String holding the corresponding IAccessible2 text properties.
*/
static OUString ConvertUnoToIAccessible2TextAttributes(
const css::uno::Sequence<css::beans::PropertyValue>& rUnoAttributes,
IA2AttributeType eAttributeType);
/**
/**
* Get the IAccessible2 text attributes and the span of the attributes at the given index.
* @param xText The interface to query for the information.
* @param eAttributeType: The type(s) of attributes of interest.
@ -70,10 +59,10 @@ public:
* @param rEndOffset Out param that is set to the end index of the attribute run.
* @return IAccessible2 text attributes at the given character offset.
*/
static OUString
GetIAccessible2TextAttributes(css::uno::Reference<css::accessibility::XAccessibleText> xText,
IA2AttributeType eAttributeType, sal_Int32 nOffset,
sal_Int32& rStartOffset, sal_Int32& rEndOffset);
OUString VCL_DLLPUBLIC
GetIAccessible2TextAttributes(const css::uno::Reference<css::accessibility::XAccessibleText>& xText,
IA2AttributeType eAttributeType, sal_Int32 nOffset,
sal_Int32& rStartOffset, sal_Int32& rEndOffset);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

16
include/vcl/builder.hxx
View File

@ -409,24 +409,24 @@ private:
namespace BuilderUtils
{
//apply the properties of rProps to pWindow
UNLESS_MERGELIBS(VCL_DLLPUBLIC) void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps);
void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps);
//Convert _ gtk markup to ~ vcl markup
UNLESS_MERGELIBS(VCL_DLLPUBLIC) OUString convertMnemonicMarkup(std::u16string_view rIn);
OUString convertMnemonicMarkup(std::u16string_view rIn);
UNLESS_MERGELIBS(VCL_DLLPUBLIC) OUString extractCustomProperty(VclBuilder::stringmap &rMap);
OUString extractCustomProperty(VclBuilder::stringmap &rMap);
UNLESS_MERGELIBS(VCL_DLLPUBLIC) bool extractDropdown(VclBuilder::stringmap &rMap);
bool extractDropdown(VclBuilder::stringmap &rMap);
//add a default value of 25 width-chars to a map if width-chars not set
UNLESS_MERGELIBS(VCL_DLLPUBLIC) void ensureDefaultWidthChars(VclBuilder::stringmap &rMap);
void ensureDefaultWidthChars(VclBuilder::stringmap &rMap);
//Helpers to retrofit all the existing code to the builder
UNLESS_MERGELIBS(VCL_DLLPUBLIC) void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox);
UNLESS_MERGELIBS(VCL_DLLPUBLIC) void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition);
void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox);
void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition);
//Convert an accessibility role name to accessibility role number
UNLESS_MERGELIBS(VCL_DLLPUBLIC) sal_Int16 getRoleFromName(const OUString& roleName);
sal_Int16 getRoleFromName(const OUString& roleName);
}
template <typename T>

56
include/vcl/pdfwriter.hxx
View File

@ -78,7 +78,7 @@ class VCL_DLLPUBLIC PDFOutputStream
virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0;
};
class VCL_DLLPUBLIC PDFWriter
class PDFWriter
{
ScopedVclPtr<PDFWriterImpl> xImplementation;
@ -688,8 +688,8 @@ The following structure describes the permissions used in PDF security
{}
};
PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& );
~PDFWriter();
VCL_DLLPUBLIC PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& );
VCL_DLLPUBLIC ~PDFWriter();
/** Returns an OutputDevice for formatting
This Output device is guaranteed to use the same
@ -698,7 +698,7 @@ The following structure describes the permissions used in PDF security
@returns
the reference output device
*/
OutputDevice* GetReferenceDevice();
VCL_DLLPUBLIC OutputDevice* GetReferenceDevice();
/** Creates a new page to fill
If width and height are not set the page size
@ -708,7 +708,7 @@ The following structure describes the permissions used in PDF security
Colors and other state information MUST
be set again or are undefined.
*/
void NewPage( double nPageWidth, double nPageHeight, Orientation eOrientation = Orientation::Inherit );
VCL_DLLPUBLIC void NewPage( double nPageWidth, double nPageHeight, Orientation eOrientation = Orientation::Inherit );
/** Play a metafile like an outputdevice would do
*/
struct PlayMetafileContext
@ -726,36 +726,36 @@ The following structure describes the permissions used in PDF security
{}
};
void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr );
VCL_DLLPUBLIC void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr );
/* sets the document locale originally passed with the context to a new value
* only affects the output if used before calling Emit.
*/
void SetDocumentLocale( const css::lang::Locale& rDocLocale );
VCL_DLLPUBLIC void SetDocumentLocale( const css::lang::Locale& rDocLocale );
/* finishes the file */
bool Emit();
VCL_DLLPUBLIC bool Emit();
/*
* Get a list of errors that occurred during processing
* this should enable the producer to give feedback about
* any anomalies that might have occurred
*/
std::set< ErrorCode > const & GetErrors() const;
VCL_DLLPUBLIC std::set< ErrorCode > const & GetErrors() const;
// uses 128bit encryption
static css::uno::Reference< css::beans::XMaterialHolder >
VCL_DLLPUBLIC static css::uno::Reference< css::beans::XMaterialHolder >
InitEncryption( const OUString& i_rOwnerPassword,
const OUString& i_rUserPassword
);
/* functions for graphics state */
/* flag values: see vcl/outdev.hxx */
void Push( PushFlags nFlags = PushFlags::ALL );
void Pop();
VCL_DLLPUBLIC void Push( PushFlags nFlags = PushFlags::ALL );
VCL_DLLPUBLIC void Pop();
void SetClipRegion();
void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion );
VCL_DLLPUBLIC void SetClipRegion();
VCL_DLLPUBLIC void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion );
void MoveClipRegion( tools::Long nHorzMove, tools::Long nVertMove );
void IntersectClipRegion( const tools::Rectangle& rRect );
void IntersectClipRegion( const basegfx::B2DPolyPolygon& rRegion );
@ -769,8 +769,8 @@ The following structure describes the permissions used in PDF security
void SetFillColor( const Color& rColor );
void SetFillColor() { SetFillColor( COL_TRANSPARENT ); }
void SetFont( const vcl::Font& rNewFont );
void SetTextColor( const Color& rColor );
VCL_DLLPUBLIC void SetFont( const vcl::Font& rNewFont );
VCL_DLLPUBLIC void SetTextColor( const Color& rColor );
void SetTextFillColor();
void SetTextFillColor( const Color& rColor );
@ -780,11 +780,11 @@ The following structure describes the permissions used in PDF security
void SetOverlineColor( const Color& rColor );
void SetTextAlign( ::TextAlign eAlign );
void SetMapMode( const MapMode& rNewMapMode );
VCL_DLLPUBLIC void SetMapMode( const MapMode& rNewMapMode );
/* actual drawing functions */
void DrawText( const Point& rPos, const OUString& rText );
VCL_DLLPUBLIC void DrawText( const Point& rPos, const OUString& rText );
void DrawTextLine( const Point& rPos, tools::Long nWidth,
FontStrikeout eStrikeout,
@ -798,7 +798,7 @@ The following structure describes the permissions used in PDF security
void DrawStretchText( const Point& rStartPt, sal_Int32 nWidth,
const OUString& rStr,
sal_Int32 nIndex, sal_Int32 nLen );
void DrawText( const tools::Rectangle& rRect,
VCL_DLLPUBLIC void DrawText( const tools::Rectangle& rRect,
const OUString& rStr, DrawTextFlags nStyle );
void DrawPixel( const Point& rPt, const Color& rColor );
@ -808,7 +808,7 @@ The following structure describes the permissions used in PDF security
void DrawLine( const Point& rStartPt, const Point& rEndPt );
void DrawLine( const Point& rStartPt, const Point& rEndPt,
const LineInfo& rLineInfo );
void DrawPolyLine( const tools::Polygon& rPoly );
VCL_DLLPUBLIC void DrawPolyLine( const tools::Polygon& rPoly );
void DrawPolyLine( const tools::Polygon& rPoly,
const LineInfo& rLineInfo );
void DrawPolyLine( const tools::Polygon& rPoly, const ExtLineInfo& rInfo );
@ -858,7 +858,7 @@ The following structure describes the permissions used in PDF security
will be ignored if the produced PDF has a lower version. The drawing
operations will be emitted normally.
*/
void BeginTransparencyGroup();
VCL_DLLPUBLIC void BeginTransparencyGroup();
/** End a transparency group with constant transparency factor
@ -871,7 +871,7 @@ The following structure describes the permissions used in PDF security
@param nTransparencePercent
The transparency factor
*/
void EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent );
VCL_DLLPUBLIC void EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent );
/** Insert a JPG encoded image (optionally with mask)
@ -1109,9 +1109,9 @@ The following structure describes the permissions used in PDF security
@returns
the new structure element's id for use in SetCurrentStructureElement
*/
void BeginStructureElement(sal_Int32 id);
sal_Int32 EnsureStructureElement();
void InitStructureElement(sal_Int32 id, PDFWriter::StructElement eType, std::u16string_view rAlias);
VCL_DLLPUBLIC void BeginStructureElement(sal_Int32 id);
VCL_DLLPUBLIC sal_Int32 EnsureStructureElement();
VCL_DLLPUBLIC void InitStructureElement(sal_Int32 id, PDFWriter::StructElement eType, std::u16string_view rAlias);
/** end the current logical structure element
@ -1120,7 +1120,7 @@ The following structure describes the permissions used in PDF security
@see BeginStructureElement
*/
void EndStructureElement();
VCL_DLLPUBLIC void EndStructureElement();
/** set the current structure element
For different purposes it may be useful to paint a structure element's
@ -1148,7 +1148,7 @@ The following structure describes the permissions used in PDF security
@param eVal
the value to set the attribute to
*/
void SetStructureAttribute( enum StructAttribute eAttr, enum StructAttributeValue eVal );
VCL_DLLPUBLIC void SetStructureAttribute( enum StructAttribute eAttr, enum StructAttributeValue eVal );
/** set a structure attribute on the current structural element
SetStructureAttributeNumerical sets an attribute of the current structural element
@ -1249,7 +1249,7 @@ The following structure describes the permissions used in PDF security
@param pStream
the interface to the additional stream
*/
void AddAttachedFile(OUString const& rFileName, OUString const& rMimeType, OUString const& rDescription, std::unique_ptr<PDFOutputStream> pStream);
VCL_DLLPUBLIC void AddAttachedFile(OUString const& rFileName, OUString const& rMimeType, OUString const& rDescription, std::unique_ptr<PDFOutputStream> pStream);
/// Write rString as a PDF hex string into rBuffer.
static void AppendUnicodeTextString(const OUString& rString, OStringBuffer& rBuffer);

6
include/xmloff/unointerfacetouniqueidentifiermapper.hxx
View File

@ -34,7 +34,7 @@ namespace comphelper
typedef ::std::map< OUString, css::uno::Reference< css::uno::XInterface > > IdMap_t;
class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
class UnoInterfaceToUniqueIdentifierMapper
{
typedef std::deque< OUString > Reserved_t;
@ -44,7 +44,7 @@ public:
/** returns a unique identifier for the given uno object. If a UNO object is
registered more than once, the returned identifier is always the same.
*/
const OUString& registerReference( const css::uno::Reference< css::uno::XInterface >& rInterface );
XMLOFF_DLLPUBLIC const OUString& registerReference( const css::uno::Reference< css::uno::XInterface >& rInterface );
/** registers the given uno object with the given identifier.
@ -68,7 +68,7 @@ public:
the identifier for the given uno object. If this uno object is not already
registered, an empty string is returned
*/
const OUString& getIdentifier( const css::uno::Reference< css::uno::XInterface >& rInterface ) const;
XMLOFF_DLLPUBLIC const OUString& getIdentifier( const css::uno::Reference< css::uno::XInterface >& rInterface ) const;
/** @returns
the uno object that is registered with the given identifier. If no uno object

4
reportdesign/inc/ReportDefinition.hxx
View File

@ -82,7 +82,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class REPORTDESIGN_DLLPUBLIC OReportDefinition final :public ::cppu::BaseMutex
class OReportDefinition final :public ::cppu::BaseMutex
,public ReportDefinitionBase
,public ReportDefinitionPropertySet
,public ::comphelper::IEmbeddedHelper
@ -189,7 +189,7 @@ namespace reportdesign
public:
//TTTT Needed? Or same as above?
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
static std::shared_ptr<rptui::OReportModel> getSdrModel(const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition);
REPORTDESIGN_DLLPUBLIC static std::shared_ptr<rptui::OReportModel> getSdrModel(const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition);
private:
DECLARE_XINTERFACE( )

12
reportdesign/inc/UndoEnv.hxx
View File

@ -37,7 +37,7 @@ namespace rptui
class OXUndoEnvironmentImpl;
class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment final
class OXUndoEnvironment final
: public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener
, css::container::XContainerListener
, css::util::XModifyListener
@ -51,7 +51,7 @@ namespace rptui
virtual ~OXUndoEnvironment() override;
void SetUndoMode(bool _bUndo);
REPORTDESIGN_DLLPUBLIC void SetUndoMode(bool _bUndo);
public:
OXUndoEnvironment(OReportModel& _rModel);
@ -89,8 +89,8 @@ namespace rptui
}
};
void Lock();
void UnLock();
REPORTDESIGN_DLLPUBLIC void Lock();
REPORTDESIGN_DLLPUBLIC void UnLock();
bool IsLocked() const;
// returns sal_True is we are in UNDO
@ -100,8 +100,8 @@ namespace rptui
struct Accessor { friend class OReportModel; private: Accessor() { } };
void Clear(const Accessor& _r);
void AddElement(const css::uno::Reference< css::uno::XInterface>& Element);
void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element);
REPORTDESIGN_DLLPUBLIC void AddElement(const css::uno::Reference< css::uno::XInterface>& Element);
REPORTDESIGN_DLLPUBLIC void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element);
void AddSection( const css::uno::Reference< css::report::XSection>& _xSection);
void RemoveSection( const css::uno::Reference< css::report::XSection>& _xSection );

5
sc/inc/cellsuno.hxx
View File

@ -372,7 +372,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
class UNLESS_MERGELIBS(SC_DLLPUBLIC) ScCellRangesObj final : public ScCellRangesBase,
class ScCellRangesObj final : public ScCellRangesBase,
public css::sheet::XSheetCellRangeContainer,
public css::container::XNameContainer,
public css::container::XEnumerationAccess
@ -391,8 +391,7 @@ private:
rtl::Reference<ScCellRangeObj> GetObjectByIndex_Impl(sal_Int32 nIndex) const;
public:
IF_MERGELIBS(SC_DLLPUBLIC)
ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR);
SC_DLLPUBLIC ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR);
virtual ~ScCellRangesObj() override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;

20
sc/inc/cellvalue.hxx
View File

@ -28,7 +28,7 @@ struct ColumnBlockPosition;
* nothing else. It creates a copy of the original cell value, and manages
* the life cycle of the copied value.
*/
struct SC_DLLPUBLIC ScCellValue
struct ScCellValue
{
private:
/// std::monostate is there to indicate CellType::NONE
@ -37,24 +37,24 @@ private:
void reset_to_empty();
public:
ScCellValue();
SC_DLLPUBLIC ScCellValue();
ScCellValue( const ScRefCellValue& rCell );
ScCellValue( double fValue );
ScCellValue( const svl::SharedString& rString );
ScCellValue( std::unique_ptr<EditTextObject> );
ScCellValue( const ScCellValue& r );
ScCellValue(ScCellValue&& r) noexcept;
~ScCellValue();
SC_DLLPUBLIC ~ScCellValue();
void clear() noexcept;
SC_DLLPUBLIC void clear() noexcept;
void set( double fValue );
void set( const svl::SharedString& rStr );
SC_DLLPUBLIC void set( double fValue );
SC_DLLPUBLIC void set( const svl::SharedString& rStr );
void set( const EditTextObject& rEditText );
void set( std::unique_ptr<EditTextObject> );
void set( ScFormulaCell* pFormula );
SC_DLLPUBLIC void set( std::unique_ptr<EditTextObject> );
SC_DLLPUBLIC void set( ScFormulaCell* pFormula );
CellType getType() const;
SC_DLLPUBLIC CellType getType() const;
double getDouble() const { return std::get<double>(maData); }
ScFormulaCell* getFormula() const { return std::get<ScFormulaCell*>(maData); }
const svl::SharedString* getSharedString() const { return &std::get<svl::SharedString>(maData); }
@ -87,7 +87,7 @@ public:
OUString getString( const ScDocument& rDoc ) const;
bool isEmpty() const;
SC_DLLPUBLIC bool isEmpty() const;
bool equalsWithoutFormat( const ScCellValue& r ) const;

4
sc/inc/chart2uno.hxx
View File

@ -53,7 +53,7 @@ namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
class ScDocument;
// DataProvider
class SC_DLLPUBLIC ScChart2DataProvider final : public
class ScChart2DataProvider final : public
::cppu::WeakImplHelper<
css::chart2::data::XDataProvider,
css::chart2::data::XSheetDataProvider,
@ -64,7 +64,7 @@ class SC_DLLPUBLIC ScChart2DataProvider final : public
{
public:
explicit ScChart2DataProvider( ScDocument* pDoc );
SC_DLLPUBLIC explicit ScChart2DataProvider( ScDocument* pDoc );
virtual ~ScChart2DataProvider() override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;

10
sc/inc/chartlis.hxx
View File

@ -38,10 +38,10 @@ class Timer;
class ScDocument;
class ScChartUnoData;
class SC_DLLPUBLIC ScChartListener final : public SvtListener
class ScChartListener final : public SvtListener
{
public:
class SAL_DLLPRIVATE ExternalRefListener final : public ScExternalRefManager::LinkListener
class ExternalRefListener final : public ScExternalRefManager::LinkListener
{
public:
ExternalRefListener(ScChartListener& rParent, ScDocument& rDoc);
@ -75,10 +75,10 @@ private:
public:
ScChartListener( OUString aName, ScDocument& rDoc,
const ScRangeListRef& rRangeListRef );
ScChartListener( OUString aName, ScDocument& rDoc,
SC_DLLPUBLIC ScChartListener( OUString aName, ScDocument& rDoc,
::std::vector<ScTokenRef> aTokens );
ScChartListener( const ScChartListener& ) = delete;
virtual ~ScChartListener() override;
SC_DLLPUBLIC virtual ~ScChartListener() override;
const OUString& GetName() const { return maName;}
@ -90,7 +90,7 @@ public:
bool IsUno() const { return (pUnoData != nullptr); }
virtual void Notify( const SfxHint& rHint ) override;
void StartListeningTo();
SC_DLLPUBLIC void StartListeningTo();
void EndListeningTo();
void ChangeListening( const ScRangeListRef& rRangeListRef,
bool bDirty );

10
sc/inc/clipcontext.hxx
View File

@ -44,7 +44,7 @@ public:
ColumnBlockPositionSet* getBlockPositionSet() { return mpSet.get(); }
};
class SC_DLLPUBLIC CopyFromClipContext final : public ClipContextBase
class CopyFromClipContext final : public ClipContextBase
{
/** Tracks modified formula group spans. */
sc::ColumnSpanSet maListeningFormulaSpans;
@ -83,18 +83,18 @@ public:
};
CopyFromClipContext() = delete;
CopyFromClipContext(ScDocument& rDoc,
SC_DLLPUBLIC CopyFromClipContext(ScDocument& rDoc,
ScDocument* pRefUndoDoc, ScDocument* pClipDoc, InsertDeleteFlags nInsertFlag,
bool bAsLink, bool bSkipAttrForEmptyCells);
virtual ~CopyFromClipContext() override;
SC_DLLPUBLIC virtual ~CopyFromClipContext() override;
void setTabRange(SCTAB nStart, SCTAB nEnd);
SC_DLLPUBLIC void setTabRange(SCTAB nStart, SCTAB nEnd);
SCTAB getTabStart() const;
SCTAB getTabEnd() const;
void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
SC_DLLPUBLIC void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
Range getDestRange() const;
ScDocument* getUndoDoc();

20
sc/inc/colorscale.hxx
View File

@ -39,7 +39,7 @@ enum ScColorScaleEntryType
COLORSCALE_FORMULA,
};
class SC_DLLPUBLIC ScColorScaleEntry
class ScColorScaleEntry
{
private:
double mnVal;
@ -52,17 +52,17 @@ private:
void setListener();
public:
ScColorScaleEntry(double nVal, const Color& rCol, ScColorScaleEntryType eType = COLORSCALE_VALUE);
ScColorScaleEntry();
SC_DLLPUBLIC ScColorScaleEntry(double nVal, const Color& rCol, ScColorScaleEntryType eType = COLORSCALE_VALUE);
SC_DLLPUBLIC ScColorScaleEntry();
ScColorScaleEntry(const ScColorScaleEntry& rEntry);
ScColorScaleEntry(ScDocument* pDoc, const ScColorScaleEntry& rEntry);
~ScColorScaleEntry() COVERITY_NOEXCEPT_FALSE;
SC_DLLPUBLIC ~ScColorScaleEntry() COVERITY_NOEXCEPT_FALSE;
const Color& GetColor() const { return maColor;}
void SetColor(const Color&);
double GetValue() const;
void SetValue(double nValue);
void SetFormula(const OUString& rFormula, ScDocument& rDoc, const ScAddress& rAddr,
SC_DLLPUBLIC double GetValue() const;
SC_DLLPUBLIC void SetValue(double nValue);
SC_DLLPUBLIC void SetFormula(const OUString& rFormula, ScDocument& rDoc, const ScAddress& rAddr,
formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT);
void UpdateReference( const sc::RefUpdateContext& rCxt );
@ -70,11 +70,11 @@ public:
void UpdateDeleteTab( const sc::RefUpdateDeleteTabContext& rCxt );
void UpdateMoveTab( const sc::RefUpdateMoveTabContext& rCxt );
const ScTokenArray* GetFormula() const;
OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const;
SC_DLLPUBLIC const ScTokenArray* GetFormula() const;
SC_DLLPUBLIC OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const;
ScColorScaleEntryType GetType() const { return meType;}
void SetType( ScColorScaleEntryType eType );
SC_DLLPUBLIC void SetType( ScColorScaleEntryType eType );
void SetRepaintCallback(ScConditionalFormat* pParent);
void SetRepaintCallback(const std::function<void()>& func);

26
sc/inc/compiler.hxx
View File

@ -177,7 +177,7 @@ public:
formula::FormulaToken* CreateToken(ScSheetLimits& rLimits) const; // create typified token
};
class SC_DLLPUBLIC ScCompiler final : public formula::FormulaCompiler
class ScCompiler final : public formula::FormulaCompiler
{
public:
@ -188,7 +188,7 @@ public:
EXTENDED_ERROR_DETECTION_NAME_NO_BREAK // name error on unknown symbols, don't break, continue
};
struct SAL_DLLPRIVATE Convention
struct Convention
{
const formula::FormulaGrammar::AddressConvention meConv;
@ -388,26 +388,26 @@ public:
/** If eGrammar == GRAM_UNSPECIFIED then the grammar of rDocument is used,
*/
ScCompiler( ScDocument& rDocument, const ScAddress&,
SC_DLLPUBLIC ScCompiler( ScDocument& rDocument, const ScAddress&,
formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED,
bool bComputeII = false, bool bMatrixFlag = false, const ScInterpreterContext* pContext = nullptr );
ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, ScTokenArray& rArr,
SC_DLLPUBLIC ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, ScTokenArray& rArr,
bool bComputeII = false, bool bMatrixFlag = false, const ScInterpreterContext* pContext = nullptr );
/** If eGrammar == GRAM_UNSPECIFIED then the grammar of rDocument is used,
*/
ScCompiler( ScDocument& rDocument, const ScAddress&, ScTokenArray& rArr,
SC_DLLPUBLIC ScCompiler( ScDocument& rDocument, const ScAddress&, ScTokenArray& rArr,
formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED,
bool bComputeII = false, bool bMatrixFlag = false, const ScInterpreterContext* pContext = nullptr );
virtual ~ScCompiler() override;
SC_DLLPUBLIC virtual ~ScCompiler() override;
public:
static void DeInit(); /// all
// for ScAddress::Format()
static void CheckTabQuotes( OUString& aTabName,
SC_DLLPUBLIC static void CheckTabQuotes( OUString& aTabName,
const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO );
/** Analyzes a string for a 'Doc'#Tab construct, or 'Do''c'#Tab etc...
@ -417,7 +417,7 @@ public:
static sal_Int32 GetDocTabPos( const OUString& rString );
// Check if it is a valid english function name
static bool IsEnglishSymbol( const OUString& rName );
SC_DLLPUBLIC static bool IsEnglishSymbol( const OUString& rName );
bool ParseErrorConstant( const OUString& );
bool ParseTableRefItem( const OUString& );
@ -445,9 +445,9 @@ public:
/// Set symbol map if not empty.
void SetFormulaLanguage( const OpCodeMapPtr & xMap );
void SetGrammar( const formula::FormulaGrammar::Grammar eGrammar );
SC_DLLPUBLIC void SetGrammar( const formula::FormulaGrammar::Grammar eGrammar );
void SetNumberFormatter( SvNumberFormatter* pFormatter );
SC_DLLPUBLIC void SetNumberFormatter( SvNumberFormatter* pFormatter );
private:
/** Set grammar and reference convention from within SetFormulaLanguage()
@ -487,18 +487,18 @@ public:
* @return heap allocated token array object. The caller <i>must</i>
* manage the life cycle of this object.
*/
std::unique_ptr<ScTokenArray> CompileString( const OUString& rFormula );
SC_DLLPUBLIC std::unique_ptr<ScTokenArray> CompileString( const OUString& rFormula );
std::unique_ptr<ScTokenArray> CompileString( const OUString& rFormula, const OUString& rFormulaNmsp );
const ScAddress& GetPos() const { return aPos; }
void MoveRelWrap();
static void MoveRelWrap( const ScTokenArray& rArr, const ScDocument& rDoc, const ScAddress& rPos,
SC_DLLPUBLIC static void MoveRelWrap( const ScTokenArray& rArr, const ScDocument& rDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow );
/** If the character is allowed as tested by nFlags (SC_COMPILER_C_...
bits) for all known address conventions. If more than one bit is given
in nFlags, all bits must match. */
static bool IsCharFlagAllConventions(
SC_DLLPUBLIC static bool IsCharFlagAllConventions(
OUString const & rStr, sal_Int32 nPos, ScCharFlags nFlags );
/** TODO : Move this to somewhere appropriate. */

40
sc/inc/conditio.hxx
View File

@ -553,7 +553,7 @@ public:
};
// complete conditional formatting
class SC_DLLPUBLIC ScConditionalFormat
class ScConditionalFormat
{
ScDocument* pDoc;
sal_uInt32 nKey; // Index in attributes
@ -564,23 +564,23 @@ class SC_DLLPUBLIC ScConditionalFormat
mutable std::unique_ptr<ScColorFormatCache> mpCache;
public:
ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
~ScConditionalFormat();
SC_DLLPUBLIC ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
SC_DLLPUBLIC ~ScConditionalFormat();
ScConditionalFormat(const ScConditionalFormat&) = delete;
const ScConditionalFormat& operator=(const ScConditionalFormat&) = delete;
// true copy of formulas (for Ref-Undo / between documents)
std::unique_ptr<ScConditionalFormat> Clone(ScDocument* pNewDoc = nullptr) const;
SC_DLLPUBLIC std::unique_ptr<ScConditionalFormat> Clone(ScDocument* pNewDoc = nullptr) const;
void AddEntry( ScFormatEntry* pNew );
SC_DLLPUBLIC void AddEntry( ScFormatEntry* pNew );
void RemoveEntry(size_t nIndex);
void SetRange( const ScRangeList& rRanges );
SC_DLLPUBLIC void SetRange( const ScRangeList& rRanges );
const ScRangeList& GetRange() const { return maRanges; }
// don't use the same name as for the const version
ScRangeList& GetRangeList() { return maRanges; }
bool IsEmpty() const;
size_t size() const;
SC_DLLPUBLIC size_t size() const;
ScDocument* GetDocument();
@ -597,11 +597,11 @@ public:
void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
void RenameCellStyle( std::u16string_view rOld, const OUString& rNew );
const ScFormatEntry* GetEntry( sal_uInt16 nPos ) const;
SC_DLLPUBLIC const ScFormatEntry* GetEntry( sal_uInt16 nPos ) const;
OUString GetCellStyle( ScRefCellValue& rCell, const ScAddress& rPos ) const;
SC_DLLPUBLIC OUString GetCellStyle( ScRefCellValue& rCell, const ScAddress& rPos ) const;
ScCondFormatData GetData( ScRefCellValue& rCell, const ScAddress& rPos ) const;
SC_DLLPUBLIC ScCondFormatData GetData( ScRefCellValue& rCell, const ScAddress& rPos ) const;
bool EqualEntries( const ScConditionalFormat& r, bool bIgnoreSrcPos = false ) const;
@ -664,7 +664,7 @@ struct CompareScConditionalFormat
};
// List of all conditional formats in a sheet
class SC_DLLPUBLIC ScConditionalFormatList
class ScConditionalFormatList
{
private:
typedef std::set<std::unique_ptr<ScConditionalFormat>,
@ -675,7 +675,7 @@ private:
public:
ScConditionalFormatList() {}
ScConditionalFormatList(const ScConditionalFormatList& rList);
SC_DLLPUBLIC ScConditionalFormatList(const ScConditionalFormatList& rList);
ScConditionalFormatList(ScDocument& rDoc, const ScConditionalFormatList& rList);
void InsertNew( std::unique_ptr<ScConditionalFormat> pNew );
@ -688,7 +688,7 @@ public:
*/
bool CheckAllEntries(const Link<ScConditionalFormat*,void>& rLink = Link<ScConditionalFormat*,void>());
ScConditionalFormat* GetFormat( sal_uInt32 nKey );
SC_DLLPUBLIC ScConditionalFormat* GetFormat( sal_uInt32 nKey );
const ScConditionalFormat* GetFormat( sal_uInt32 nKey ) const;
void CompileAll();
@ -712,15 +712,15 @@ public:
void RemoveFromDocument(ScDocument& rDoc) const;
void AddToDocument(ScDocument& rDoc) const;
iterator begin();
const_iterator begin() const;
iterator end();
const_iterator end() const;
SC_DLLPUBLIC iterator begin();
SC_DLLPUBLIC const_iterator begin() const;
SC_DLLPUBLIC iterator end();
SC_DLLPUBLIC const_iterator end() const;
size_t size() const;
bool empty() const;
SC_DLLPUBLIC size_t size() const;
SC_DLLPUBLIC bool empty() const;
void erase(sal_uLong nIndex);
SC_DLLPUBLIC void erase(sal_uLong nIndex);
void clear();
void startRendering();

12
sc/inc/dbdata.hxx
View File

@ -232,7 +232,7 @@ private:
void InvalidateTableColumnNames( bool bSwapToEmptyNames );
};
class SC_DLLPUBLIC ScDBCollection
class ScDBCollection
{
public:
enum RangeType { GlobalNamed, GlobalAnonymous, SheetAnonymous };
@ -282,7 +282,7 @@ public:
/**
* Stores global anonymous database ranges.
*/
class SAL_DLLPRIVATE AnonDBs
class AnonDBs
{
typedef ::std::vector<std::unique_ptr<ScDBData>> DBsType;
DBsType m_DBs;
@ -331,9 +331,9 @@ public:
const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const;
ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion);
const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
std::vector<ScDBData*> GetAllDBsFromTab(SCTAB nTab);
SC_DLLPUBLIC ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
SC_DLLPUBLIC ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
SC_DLLPUBLIC std::vector<ScDBData*> GetAllDBsFromTab(SCTAB nTab);
void RefreshDirtyTableColumnNames();
@ -349,7 +349,7 @@ public:
{ aRefreshHandler = rLink; }
const Link<Timer *, void>& GetRefreshHandler() const { return aRefreshHandler; }
bool empty() const;
SC_DLLPUBLIC bool empty() const;
bool operator== (const ScDBCollection& r) const;
};

6
sc/source/ui/inc/csvcontrol.hxx
View File

@ -219,7 +219,7 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar
}
/** Base class for the CSV ruler and the data grid control. Implements command handling. */
class SC_DLLPUBLIC ScCsvControl : public weld::CustomWidgetController
class ScCsvControl : public weld::CustomWidgetController
{
private:
Link<ScCsvControl&,void> maCmdHdl; /// External command handler.
@ -284,7 +284,7 @@ public:
const ScCsvCmd& GetCmd() const { return maCmd; }
/** Executes a command by calling command handler. */
void Execute(
SC_DLLPUBLIC void Execute(
ScCsvCmdType eType,
sal_Int32 nParam1 = CSV_POS_INVALID,
sal_Int32 nParam2 = CSV_POS_INVALID );
@ -330,7 +330,7 @@ public:
/** Returns the number of data lines. */
sal_Int32 GetLineCount() const { return mrData.mnLineCount; }
/** Returns the number of visible lines (including partly visible bottom line). */
sal_Int32 GetVisLineCount() const;
SC_DLLPUBLIC sal_Int32 GetVisLineCount() const;
/** Returns index of first visible line. */
sal_Int32 GetFirstVisLine() const { return mrData.mnLineOffset; }
/** Returns index of last visible line. */

56
sc/source/ui/inc/csvgrid.hxx
View File

@ -54,7 +54,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec;
/** A data grid control for the CSV import dialog. The design of this control
simulates a Calc spreadsheet with row and column headers. */
class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
class ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
{
private:
ScCsvTableBox* mpTableBox; /// Grid Parent
@ -116,11 +116,11 @@ public:
private:
/** Reads colors from system settings. */
SAL_DLLPRIVATE void InitColors();
void InitColors();
/** Initializes all font settings. */
SAL_DLLPRIVATE void InitFonts();
void InitFonts();
/** Initializes all data dependent from the control's size. */
SAL_DLLPRIVATE void InitSizeData();
void InitSizeData();
// split handling ---------------------------------------------------------
public:
@ -137,11 +137,11 @@ public:
private:
/** Inserts a split and adjusts column data. */
SAL_DLLPRIVATE bool ImplInsertSplit( sal_Int32 nPos );
bool ImplInsertSplit( sal_Int32 nPos );
/** Removes a split and adjusts column data. */
SAL_DLLPRIVATE bool ImplRemoveSplit( sal_Int32 nPos );
bool ImplRemoveSplit( sal_Int32 nPos );
/** Clears the split array and re-inserts boundary splits. */
SAL_DLLPRIVATE void ImplClearSplits();
void ImplClearSplits();
// columns/column types ---------------------------------------------------
public:
@ -174,7 +174,7 @@ public:
/** Sets all column states to the values in the passed vector. */
void SetColumnStates( ScCsvColStateVec&& rColStates );
/** Returns the data type of the selected columns. */
sal_Int32 GetSelColumnType() const;
SC_DLLPUBLIC sal_Int32 GetSelColumnType() const;
/** Changes the data type of all selected columns. */
void SetSelColumnType( sal_Int32 nType );
/** Sets new UI data type names. */
@ -189,14 +189,14 @@ public:
private:
/** Returns the data type of the specified column. */
SAL_DLLPRIVATE sal_Int32 GetColumnType( sal_uInt32 nColIndex ) const;
sal_Int32 GetColumnType( sal_uInt32 nColIndex ) const;
/** Sets the data type of the specified column. */
SAL_DLLPRIVATE void SetColumnType( sal_uInt32 nColIndex, sal_Int32 nColType );
void SetColumnType( sal_uInt32 nColIndex, sal_Int32 nColType );
/** Scrolls data grid vertically. */
SAL_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir );
void ScrollVertRel( ScMoveMode eDir );
/** Executes the data type popup menu. */
SAL_DLLPRIVATE void ExecutePopup( const Point& rPos );
void ExecutePopup( const Point& rPos );
// selection handling -----------------------------------------------------
public:
@ -220,15 +220,15 @@ public:
private:
/** Moves column cursor to a new position. */
SAL_DLLPRIVATE void MoveCursor( sal_uInt32 nColIndex );
void MoveCursor( sal_uInt32 nColIndex );
/** Moves column cursor to the given direction. */
SAL_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir );
void MoveCursorRel( ScMoveMode eDir );
/** Clears the entire selection without notify. */
SAL_DLLPRIVATE void ImplClearSelection();
void ImplClearSelection();
/** Executes selection action for a specific column. */
SAL_DLLPRIVATE void DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier );
void DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier );
// cell contents ----------------------------------------------------------
public:
@ -277,34 +277,34 @@ private:
sal_Int32 GetHeight() const { return maWinSize.Height(); }
/** Sets a clip region in the specified output device for the specified column. */
SAL_DLLPRIVATE void ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
void ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
/** Draws the header of the specified column to the specified output device. */
SAL_DLLPRIVATE void ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor );
void ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor );
/** Draws the text at the specified position to maBackgrDev. */
SAL_DLLPRIVATE void ImplDrawCellText( const Point& rPos, const OUString& rText );
void ImplDrawCellText( const Point& rPos, const OUString& rText );
/** Draws the "first imported line" separator to maBackgrDev (or erases, if bSet is false). */
SAL_DLLPRIVATE void ImplDrawFirstLineSep( bool bSet );
void ImplDrawFirstLineSep( bool bSet );
/** Draws the column with index nColIndex to maBackgrDev. */
SAL_DLLPRIVATE void ImplDrawColumnBackgr( sal_uInt32 nColIndex );
void ImplDrawColumnBackgr( sal_uInt32 nColIndex );
/** Draws the row headers column to maBackgrDev. */
SAL_DLLPRIVATE void ImplDrawRowHeaders();
void ImplDrawRowHeaders();
/** Draws all columns and the row headers column to maBackgrDev. */
SAL_DLLPRIVATE void ImplDrawBackgrDev();
void ImplDrawBackgrDev();
/** Draws the column with index nColIndex with its selection state to maGridDev. */
SAL_DLLPRIVATE void ImplDrawColumnSelection( sal_uInt32 nColIndex );
void ImplDrawColumnSelection( sal_uInt32 nColIndex );
/** Draws all columns with selection and cursor to maGridDev. */
SAL_DLLPRIVATE void ImplDrawGridDev();
void ImplDrawGridDev();
/** Redraws the entire column (background and selection). */
SAL_DLLPRIVATE void ImplDrawColumn( sal_uInt32 nColIndex );
void ImplDrawColumn( sal_uInt32 nColIndex );
/** Optimized drawing: Scrolls horizontally and redraws only missing parts. */
SAL_DLLPRIVATE void ImplDrawHorzScrolled( sal_Int32 nOldPos );
void ImplDrawHorzScrolled( sal_Int32 nOldPos );
/** Inverts the cursor bar at the specified position in maGridDev. */
SAL_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos );
void ImplInvertCursor( sal_Int32 nPos );
// accessibility ----------------------------------------------------------
protected:

12
sd/inc/Annotation.hxx
View File

@ -73,7 +73,7 @@ struct SD_DLLPUBLIC CustomAnnotationMarker
std::vector<basegfx::B2DPolygon> maPolygons;
};
class SD_DLLPUBLIC Annotation final : private ::cppu::BaseMutex,
class Annotation final : private ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper<css::office::XAnnotation>,
public ::cppu::PropertySetMixin<css::office::XAnnotation>
{
@ -104,17 +104,17 @@ public:
// css::office::XAnnotation:
virtual css::uno::Any SAL_CALL getAnchor() override;
virtual css::geometry::RealPoint2D SAL_CALL getPosition() override;
SD_DLLPUBLIC virtual css::geometry::RealPoint2D SAL_CALL getPosition() override;
virtual void SAL_CALL setPosition(const css::geometry::RealPoint2D & the_value) override;
virtual css::geometry::RealSize2D SAL_CALL getSize() override;
virtual void SAL_CALL setSize(const css::geometry::RealSize2D& _size) override;
virtual OUString SAL_CALL getAuthor() override;
SD_DLLPUBLIC virtual OUString SAL_CALL getAuthor() override;
virtual void SAL_CALL setAuthor(const OUString & the_value) override;
virtual OUString SAL_CALL getInitials() override;
SD_DLLPUBLIC virtual OUString SAL_CALL getInitials() override;
virtual void SAL_CALL setInitials(const OUString & the_value) override;
virtual css::util::DateTime SAL_CALL getDateTime() override;
SD_DLLPUBLIC virtual css::util::DateTime SAL_CALL getDateTime() override;
virtual void SAL_CALL setDateTime(const css::util::DateTime & the_value) override;
virtual css::uno::Reference<css::text::XText> SAL_CALL getTextRange() override;
SD_DLLPUBLIC virtual css::uno::Reference<css::text::XText> SAL_CALL getTextRange() override;
void createChangeUndo();

132
sd/inc/CustomAnimationEffect.hxx
View File

@ -51,7 +51,7 @@ typedef std::list< CustomAnimationEffectPtr > EffectSequence;
class EffectSequenceHelper;
class SD_DLLPUBLIC CustomAnimationEffect final
class CustomAnimationEffect final
{
friend class MainSequence;
friend class EffectSequenceHelper;
@ -60,118 +60,118 @@ public:
CustomAnimationEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
~CustomAnimationEffect();
SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAnimationNode >& getNode() const { return mxNode; }
SAL_DLLPRIVATE void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE void replaceNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
const css::uno::Reference< css::animations::XAnimationNode >& getNode() const { return mxNode; }
void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
void replaceNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE CustomAnimationEffectPtr clone() const;
CustomAnimationEffectPtr clone() const;
// attributes
SAL_DLLPRIVATE const OUString& getPresetId() const { return maPresetId; }
SAL_DLLPRIVATE const OUString& getPresetSubType() const { return maPresetSubType; }
SAL_DLLPRIVATE const OUString& getProperty() const { return maProperty; }
const OUString& getPresetId() const { return maPresetId; }
const OUString& getPresetSubType() const { return maPresetSubType; }
const OUString& getProperty() const { return maProperty; }
SAL_DLLPRIVATE sal_Int16 getPresetClass() const { return mnPresetClass; }
SAL_DLLPRIVATE void setPresetClassAndId( sal_Int16 nPresetClass, const OUString& rPresetId );
sal_Int16 getPresetClass() const { return mnPresetClass; }
void setPresetClassAndId( sal_Int16 nPresetClass, const OUString& rPresetId );
SAL_DLLPRIVATE sal_Int16 getNodeType() const { return mnNodeType; }
sal_Int16 getNodeType() const { return mnNodeType; }
void setNodeType( sal_Int16 nNodeType );
SAL_DLLPRIVATE css::uno::Any getRepeatCount() const;
SAL_DLLPRIVATE void setRepeatCount( const css::uno::Any& rRepeatCount );
css::uno::Any getRepeatCount() const;
void setRepeatCount( const css::uno::Any& rRepeatCount );
SAL_DLLPRIVATE css::uno::Any getEnd() const;
SAL_DLLPRIVATE void setEnd( const css::uno::Any& rEnd );
css::uno::Any getEnd() const;
void setEnd( const css::uno::Any& rEnd );
SAL_DLLPRIVATE sal_Int16 getFill() const { return mnFill; }
SAL_DLLPRIVATE void setFill( sal_Int16 nFill );
sal_Int16 getFill() const { return mnFill; }
void setFill( sal_Int16 nFill );
SAL_DLLPRIVATE double getBegin() const { return mfBegin; }
double getBegin() const { return mfBegin; }
void setBegin( double fBegin );
SAL_DLLPRIVATE double getDuration() const { return mfDuration; }
double getDuration() const { return mfDuration; }
void setDuration( double fDuration );
SAL_DLLPRIVATE double getAbsoluteDuration() const { return mfAbsoluteDuration; }
double getAbsoluteDuration() const { return mfAbsoluteDuration; }
SAL_DLLPRIVATE sal_Int16 getIterateType() const { return mnIterateType; }
sal_Int16 getIterateType() const { return mnIterateType; }
void setIterateType( sal_Int16 nIterateType );
SAL_DLLPRIVATE double getIterateInterval() const { return mfIterateInterval; }
double getIterateInterval() const { return mfIterateInterval; }
void setIterateInterval( double fIterateInterval );
SAL_DLLPRIVATE const css::uno::Any& getTarget() const { return maTarget; }
const css::uno::Any& getTarget() const { return maTarget; }
void setTarget( const css::uno::Any& rTarget );
SAL_DLLPRIVATE bool hasAfterEffect() const { return mbHasAfterEffect; }
SAL_DLLPRIVATE void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
bool hasAfterEffect() const { return mbHasAfterEffect; }
void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
SAL_DLLPRIVATE const css::uno::Any& getDimColor() const { return maDimColor; }
SAL_DLLPRIVATE void setDimColor( const css::uno::Any& rDimColor ) { maDimColor = rDimColor; }
const css::uno::Any& getDimColor() const { return maDimColor; }
void setDimColor( const css::uno::Any& rDimColor ) { maDimColor = rDimColor; }
SAL_DLLPRIVATE bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
SAL_DLLPRIVATE void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; }
bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; }
SAL_DLLPRIVATE sal_Int32 getParaDepth() const { return mnParaDepth; }
sal_Int32 getParaDepth() const { return mnParaDepth; }
SAL_DLLPRIVATE bool hasText() const { return mbHasText; }
bool hasText() const { return mbHasText; }
SAL_DLLPRIVATE sal_Int16 getCommand() const { return mnCommand; }
sal_Int16 getCommand() const { return mnCommand; }
SAL_DLLPRIVATE double getAcceleration() const { return mfAcceleration; }
SAL_DLLPRIVATE void setAcceleration( double fAcceleration );
double getAcceleration() const { return mfAcceleration; }
void setAcceleration( double fAcceleration );
SAL_DLLPRIVATE double getDecelerate() const { return mfDecelerate; }
SAL_DLLPRIVATE void setDecelerate( double fDecelerate );
double getDecelerate() const { return mfDecelerate; }
void setDecelerate( double fDecelerate );
SAL_DLLPRIVATE bool getAutoReverse() const { return mbAutoReverse; }
SAL_DLLPRIVATE void setAutoReverse( bool bAutoReverse );
bool getAutoReverse() const { return mbAutoReverse; }
void setAutoReverse( bool bAutoReverse );
SAL_DLLPRIVATE css::uno::Any getProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue );
SAL_DLLPRIVATE bool setProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue, const css::uno::Any& rValue );
css::uno::Any getProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue );
bool setProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue, const css::uno::Any& rValue );
SAL_DLLPRIVATE css::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
SAL_DLLPRIVATE bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const css::uno::Any& rValue );
css::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const css::uno::Any& rValue );
SAL_DLLPRIVATE css::uno::Any getColor( sal_Int32 nIndex );
SAL_DLLPRIVATE void setColor( sal_Int32 nIndex, const css::uno::Any& rColor );
css::uno::Any getColor( sal_Int32 nIndex );
void setColor( sal_Int32 nIndex, const css::uno::Any& rColor );
SAL_DLLPRIVATE sal_Int32 getGroupId() const { return mnGroupId; }
SAL_DLLPRIVATE void setGroupId( sal_Int32 nGroupId );
sal_Int32 getGroupId() const { return mnGroupId; }
void setGroupId( sal_Int32 nGroupId );
SAL_DLLPRIVATE sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
void setTargetSubItem( sal_Int16 nSubItem );
SAL_DLLPRIVATE OUString getPath() const;
SAL_DLLPRIVATE void setPath( const OUString& rPath );
OUString getPath() const;
void setPath( const OUString& rPath );
SAL_DLLPRIVATE bool checkForText( const std::vector<sal_Int32>* paragraphNumberingLevel = nullptr );
SAL_DLLPRIVATE bool calculateIterateDuration();
bool checkForText( const std::vector<sal_Int32>* paragraphNumberingLevel = nullptr );
bool calculateIterateDuration();
SAL_DLLPRIVATE void setAudio( const css::uno::Reference< css::animations::XAudio >& xAudio );
SAL_DLLPRIVATE bool getStopAudio() const;
void setAudio( const css::uno::Reference< css::animations::XAudio >& xAudio );
bool getStopAudio() const;
void setStopAudio();
void createAudio( const css::uno::Any& rSource );
SAL_DLLPRIVATE void removeAudio();
SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAudio >& getAudio() const { return mxAudio; }
void removeAudio();
const css::uno::Reference< css::animations::XAudio >& getAudio() const { return mxAudio; }
SAL_DLLPRIVATE EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
// helper
/// @throws css::uno::Exception
SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNode() const;
SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTargetShape() const;
css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNode() const;
css::uno::Reference< css::drawing::XShape > getTargetShape() const;
// static helpers
SAL_DLLPRIVATE static sal_Int32 get_node_type( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE static sal_Int32 getNumberOfSubitems( const css::uno::Any& aTarget, sal_Int16 nIterateType );
static sal_Int32 get_node_type( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
static sal_Int32 getNumberOfSubitems( const css::uno::Any& aTarget, sal_Int16 nIterateType );
SAL_DLLPRIVATE rtl::Reference<SdrPathObj> createSdrPathObjFromPath(SdrModel& rTargetModel);
SAL_DLLPRIVATE void updateSdrPathObjFromPath( SdrPathObj& rPathObj );
SAL_DLLPRIVATE void updatePathFromSdrPathObj( const SdrPathObj& rPathObj );
rtl::Reference<SdrPathObj> createSdrPathObjFromPath(SdrModel& rTargetModel);
void updateSdrPathObjFromPath( SdrPathObj& rPathObj );
void updatePathFromSdrPathObj( const SdrPathObj& rPathObj );
private:
SAL_DLLPRIVATE void setEffectSequence( EffectSequenceHelper* pSequence ) { mpEffectSequence = pSequence; }
void setEffectSequence( EffectSequenceHelper* pSequence ) { mpEffectSequence = pSequence; }
sal_Int16 mnNodeType;
OUString maPresetId;
@ -368,7 +368,7 @@ private:
typedef std::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
typedef std::vector< InteractiveSequencePtr > InteractiveSequenceVector;
class SD_DLLPUBLIC MainSequence final : public EffectSequenceHelper, public ISequenceListener
class MainSequence final : public EffectSequenceHelper, public ISequenceListener
{
friend class UndoAnimation;
friend class MainSequenceRebuildGuard;
@ -414,7 +414,7 @@ private:
void lockRebuilds();
void unlockRebuilds();
DECL_DLLPRIVATE_LINK(onTimerHdl, Timer *, void);
DECL_LINK(onTimerHdl, Timer *, void);
virtual void implRebuild() override;

2
sd/source/ui/inc/FrameView.hxx
View File

@ -31,7 +31,7 @@ namespace sd {
/**
* View for MDIFrame
*/
class SD_DLLPUBLIC FrameView final
class FrameView final
: public SdrView
{
public:

44
sd/source/ui/inc/sdtreelb.hxx
View File

@ -68,10 +68,10 @@ public:
void SetOrderFrontToBack(bool bSet) { m_bOrderFrontToBack = bSet; }
};
class SD_DLLPUBLIC SdPageObjsTLV
class SdPageObjsTLV
{
private:
static bool SAL_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag
static bool bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag
std::unique_ptr<weld::TreeView> m_xTreeView;
std::unique_ptr<weld::TreeIter> m_xScratchIter;
@ -137,13 +137,13 @@ private:
void CloseBookmarkDoc();
DECL_DLLPRIVATE_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool);
DECL_DLLPRIVATE_LINK(SelectHdl, weld::TreeView&, void);
DECL_DLLPRIVATE_LINK(AsyncSelectHdl, void*, void);
DECL_DLLPRIVATE_LINK(RowActivatedHdl, weld::TreeView&, bool);
DECL_DLLPRIVATE_LINK(AsyncRowActivatedHdl, void*, void);
DECL_DLLPRIVATE_LINK(DragBeginHdl, bool&, bool);
DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool);
DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool);
DECL_LINK(SelectHdl, weld::TreeView&, void);
DECL_LINK(AsyncSelectHdl, void*, void);
DECL_LINK(RowActivatedHdl, weld::TreeView&, bool);
DECL_LINK(AsyncRowActivatedHdl, void*, void);
DECL_LINK(DragBeginHdl, bool&, bool);
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
DECL_LINK(EditingEntryHdl, const weld::TreeIter&, bool);
typedef std::pair<const weld::TreeIter&, OUString> IterString;
@ -171,8 +171,8 @@ private:
public:
SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeview);
~SdPageObjsTLV();
SD_DLLPUBLIC SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeview);
SD_DLLPUBLIC ~SdPageObjsTLV();
bool IsEditingActive() const {return m_bEditing;}
@ -206,10 +206,10 @@ public:
return m_xTreeView->get_approximate_digit_width();
}
DECL_LINK(MousePressHdl, const MouseEvent&, bool);
DECL_LINK(MouseReleaseHdl, const MouseEvent&, bool);
DECL_LINK(MousePressHdl, const MouseEvent&, SD_DLLPUBLIC bool);
DECL_LINK(MouseReleaseHdl, const MouseEvent&, SD_DLLPUBLIC bool);
void Select();
SD_DLLPUBLIC void Select();
int get_height_rows(int nRows) const
{
@ -248,7 +248,7 @@ public:
}
bool HasSelectedChildren(std::u16string_view rName);
bool SelectEntry(std::u16string_view rName);
SD_DLLPUBLIC bool SelectEntry(std::u16string_view rName);
void SelectEntry(const SdrObject* pObj);
OUString get_selected_text() const
@ -317,10 +317,10 @@ public:
return OUString();
}
void SetViewFrame(const SfxViewFrame* pViewFrame);
SD_DLLPUBLIC void SetViewFrame(const SfxViewFrame* pViewFrame);
void Fill(const SdDrawDocument*, bool bAllPages, const OUString& rDocName);
void Fill(const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName);
SD_DLLPUBLIC void Fill(const SdDrawDocument*, bool bAllPages, const OUString& rDocName);
SD_DLLPUBLIC void Fill(const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName);
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
bool GetShowAllShapes() const { return m_bShowAllShapes; }
@ -329,7 +329,7 @@ public:
bool GetOrderFrontToBack() const { return m_bOrderFrontToBack; }
bool IsNavigationGrabsFocus() const { return m_bNavigationGrabsFocus; }
bool IsEqualToDoc(const SdDrawDocument* pInDoc);
SD_DLLPUBLIC bool IsEqualToDoc(const SdDrawDocument* pInDoc);
/// Visits rList recursively and tries to advance rEntry accordingly.
bool IsEqualToShapeList(std::unique_ptr<weld::TreeIter>& rEntry, const SdrObjList& rList,
std::u16string_view rListName);
@ -377,11 +377,11 @@ public:
nDepth == 0 -> pages
nDepth == 1 -> objects */
std::vector<OUString> GetSelectEntryList(const int nDepth) const;
SD_DLLPUBLIC std::vector<OUString> GetSelectEntryList(const int nDepth) const;
std::vector<OUString> GetSelectedEntryIds() const;
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = nullptr);
SD_DLLPUBLIC SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = nullptr);
bool IsLinkableSelected() const { return m_bLinkableSelected; }
@ -413,7 +413,7 @@ public:
}
// nested class to implement the TransferableHelper
class SAL_DLLPRIVATE SdPageObjsTransferable final : public SdTransferable
class SdPageObjsTransferable final : public SdTransferable
{
public:
SdPageObjsTransferable(

2
sfx2/source/control/charwin.cxx
View File

@ -42,6 +42,8 @@ SvxCharView::SvxCharView(const VclPtr<VirtualDevice>& rVirDev)
{
}
SvxCharView::~SvxCharView() {}
void SvxCharView::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
CustomWidgetController::SetDrawingArea(pDrawingArea);

4
svx/inc/extrud3d.hxx
View File

@ -35,7 +35,7 @@ class E3dDefaultAttributes;
|*
\************************************************************************/
class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dExtrudeObj final : public E3dCompoundObject
class SAL_WARN_UNUSED E3dExtrudeObj final : public E3dCompoundObject
{
private:
// to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
@ -53,7 +53,7 @@ private:
virtual ~E3dExtrudeObj() override;
public:
E3dExtrudeObj(
SVXCORE_DLLPUBLIC E3dExtrudeObj(
SdrModel& rSdrModel,
const E3dDefaultAttributes& rDefault,
basegfx::B2DPolyPolygon aPP,

11
svx/inc/galleryfilestorage.hxx
View File

@ -41,7 +41,7 @@ class FmFormModel;
class GalleryTheme;
class GalleryThemeEntry;
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) GalleryFileStorage final
class GalleryFileStorage final
{
private:
tools::SvRef<SotStorage> m_aSvDrawStorageRef;
@ -58,22 +58,23 @@ private:
public:
GalleryFileStorage(const GalleryStorageLocations& rGalleryStorageLocations,
GalleryObjectCollection& rGalleryObjectCollection, bool bReadOnly);
SAL_DLLPRIVATE ~GalleryFileStorage();
~GalleryFileStorage();
void clearSotStorage();
void setDestDir(const OUString& rDestDir, bool bRelative);
SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
SAL_DLLPRIVATE const tools::SvRef<SotStorage>& GetSvDrawStorage() const;
void ImplCreateSvDrawStorage();
const tools::SvRef<SotStorage>& GetSvDrawStorage() const;
const INetURLObject& getThemeURL() const { return maGalleryStorageLocations.getThemeURL(); }
SAL_DLLPRIVATE bool implWrite(const GalleryTheme& rTheme, const GalleryThemeEntry* pThm);
bool implWrite(const GalleryTheme& rTheme, const GalleryThemeEntry* pThm);
void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, sal_uInt32 nInsertPos);
void removeObject(const std::unique_ptr<GalleryObject>& pEntry);
UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
std::unique_ptr<SgaObject> implReadSgaObject(GalleryObject const* pEntry);
bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, GalleryObject* pExistentEntry);

9
svx/inc/polygn3d.hxx
View File

@ -23,7 +23,7 @@
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompoundObject
class E3dPolygonObj final : public E3dCompoundObject
{
// parameters
basegfx::B3DPolyPolygon aPolyPoly3D;
@ -31,8 +31,8 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompou
basegfx::B2DPolyPolygon aPolyTexture2D;
bool bLineOnly;
SVX_DLLPRIVATE void CreateDefaultNormals();
SVX_DLLPRIVATE void CreateDefaultTexture();
void CreateDefaultNormals();
void CreateDefaultTexture();
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
@ -44,7 +44,8 @@ public:
void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
E3dPolygonObj(SdrModel& rSdrModel, const basegfx::B3DPolyPolygon& rPolyPoly3D);
SVXCORE_DLLPUBLIC E3dPolygonObj(SdrModel& rSdrModel,
const basegfx::B3DPolyPolygon& rPolyPoly3D);
E3dPolygonObj(SdrModel& rSdrModel);
E3dPolygonObj(SdrModel& rSdrModel, E3dPolygonObj const& rSource);

4
sw/inc/bparr.hxx
View File

@ -61,7 +61,7 @@ struct BlockInfo final
mvData; ///< data block
};
class SW_DLLPUBLIC BigPtrArray
class BigPtrArray
{
protected:
std::unique_ptr<BlockInfo*[]>
@ -91,7 +91,7 @@ public:
void Move( sal_Int32 from, sal_Int32 to );
void Replace( sal_Int32 pos, BigPtrEntry* p);
BigPtrEntry* operator[]( sal_Int32 ) const;
SW_DLLPUBLIC BigPtrEntry* operator[]( sal_Int32 ) const;
};
inline sal_Int32 BigPtrEntry::GetPos() const

174
sw/inc/crsrsh.hxx
View File

@ -144,7 +144,7 @@ bool GetRanges(std::vector<std::shared_ptr<SwUnoCursor>> & rRanges,
} // namespace sw
class SW_DLLPUBLIC SwCursorShell
class SwCursorShell
: public SwViewShell
, public sw::BroadcastingModify
, public ::sw::IShellCursorSupplier
@ -166,7 +166,7 @@ public:
READONLY = (1 << 3) ///< make visible in spite of Readonly
};
void UpdateCursor(
SW_DLLPUBLIC void UpdateCursor(
sal_uInt16 eFlags = SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE,
bool bIdleEnd = false );
@ -245,9 +245,9 @@ private:
SwFrame* m_oldColFrame;
SAL_DLLPRIVATE void MoveCursorToNum();
void MoveCursorToNum();
SAL_DLLPRIVATE void ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing );
void ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing );
/** Mark a certain list level of a certain list
@ -258,33 +258,33 @@ private:
An empty sListId denotes that no level of a list is marked.
*/
SAL_DLLPRIVATE void MarkListLevel( const OUString& sListId,
void MarkListLevel( const OUString& sListId,
const int nLevel );
// private method(s) accessed from public inline method(s) must be exported.
bool LeftRight( bool, sal_uInt16, SwCursorSkipMode, bool );
SAL_DLLPRIVATE bool UpDown( bool, sal_uInt16 );
SAL_DLLPRIVATE bool LRMargin( bool, bool bAPI = false );
SAL_DLLPRIVATE bool IsAtLRMargin( bool, bool bAPI = false ) const;
SW_DLLPUBLIC bool LeftRight( bool, sal_uInt16, SwCursorSkipMode, bool );
bool UpDown( bool, sal_uInt16 );
bool LRMargin( bool, bool bAPI = false );
bool IsAtLRMargin( bool, bool bAPI = false ) const;
SAL_DLLPRIVATE bool isInHiddenFrame(SwShellCursor* pShellCursor);
bool isInHiddenFrame(SwShellCursor* pShellCursor);
SAL_DLLPRIVATE bool GoStartWordImpl();
SAL_DLLPRIVATE bool GoEndWordImpl();
SAL_DLLPRIVATE bool GoNextWordImpl();
SAL_DLLPRIVATE bool GoPrevWordImpl();
SAL_DLLPRIVATE bool GoNextSentenceImpl();
SAL_DLLPRIVATE bool GoEndSentenceImpl();
SAL_DLLPRIVATE bool GoStartSentenceImpl();
bool GoStartWordImpl();
bool GoEndWordImpl();
bool GoNextWordImpl();
bool GoPrevWordImpl();
bool GoNextSentenceImpl();
bool GoEndSentenceImpl();
bool GoStartSentenceImpl();
typedef bool (SwCursor::*FNCursor)();
typedef bool (SwCursorShell::*FNCursorShell)();
SAL_DLLPRIVATE bool CallCursorFN( FNCursor );
SAL_DLLPRIVATE bool CallCursorShellFN( FNCursorShell );
bool CallCursorFN( FNCursor );
bool CallCursorShellFN( FNCursorShell );
SAL_DLLPRIVATE const SwRangeRedline* GotoRedline_( SwRedlineTable::size_type nArrPos, bool bSelect );
const SwRangeRedline* GotoRedline_( SwRedlineTable::size_type nArrPos, bool bSelect );
SAL_DLLPRIVATE void sendLOKCursorUpdates();
void sendLOKCursorUpdates();
protected:
inline SwMoveFnCollection const & MakeFindRange( SwDocPositions, SwDocPositions, SwPaM* ) const;
@ -295,7 +295,7 @@ protected:
*/
int CompareCursorStackMkCurrPt() const;
bool SelTableRowOrCol( bool bRow, bool bRowSimple = false );
SW_DLLPUBLIC bool SelTableRowOrCol( bool bRow, bool bRowSimple = false );
bool SetInFrontOfLabel( bool bNew );
@ -303,7 +303,7 @@ protected:
/** Updates the marked list level according to the cursor.
*/
SAL_DLLPRIVATE void UpdateMarkedListLevel();
void UpdateMarkedListLevel();
protected:
virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
@ -316,11 +316,11 @@ public:
// create new cursor and append the old one
virtual SwCursor & CreateNewShellCursor() override;
virtual SwCursor & GetCurrentShellCursor() override;
SW_DLLPUBLIC virtual SwCursor & GetCurrentShellCursor() override;
SwPaM * CreateCursor();
SW_DLLPUBLIC SwPaM * CreateCursor();
///< delete the current cursor and make the following into the current
void DestroyCursor();
SW_DLLPUBLIC void DestroyCursor();
///< transform TableCursor to normal cursor, nullify Tablemode
void TableCursorToCursor();
///< enter block mode, change normal cursor into block cursor
@ -338,7 +338,7 @@ public:
/// If document body starts with a table or starts/ends with hidden paragraph.
StartsWith StartsWith_();
SwCursor* GetCursor( bool bMakeTableCursor = true ) const;
SW_DLLPUBLIC SwCursor* GetCursor( bool bMakeTableCursor = true ) const;
// return only the current cursor
SwShellCursor* GetCursor_() { return m_pCurrentCursor; }
const SwShellCursor* GetCursor_() const { return m_pCurrentCursor; }
@ -354,9 +354,9 @@ public:
inline SwPaM* GetStackCursor() const;
// start parenthesing, hide SV-Cursor and selected areas
void StartAction();
SW_DLLPUBLIC void StartAction();
// end parenthesing, show SV-Cursor and selected areas
void EndAction( const bool bIdleEnd = false );
SW_DLLPUBLIC void EndAction( const bool bIdleEnd = false );
// basic cursor travelling
tools::Long GetUpDownX() const { return m_nUpDownX; }
@ -369,17 +369,17 @@ public:
bool Down( sal_uInt16 nCnt = 1 ) { return UpDown( false, nCnt ); }
bool LeftMargin() { return LRMargin( true ); }
bool RightMargin(bool bAPI = false) { return LRMargin( false, bAPI ); }
bool SttEndDoc( bool bStt );
SW_DLLPUBLIC bool SttEndDoc( bool bStt );
bool MovePage( SwWhichPage, SwPosPage );
bool MovePara( SwWhichPara, SwMoveFnCollection const & );
bool MoveSection( SwWhichSection, SwMoveFnCollection const & );
bool MoveTable( SwWhichTable, SwMoveFnCollection const & );
SW_DLLPUBLIC bool MovePara( SwWhichPara, SwMoveFnCollection const & );
SW_DLLPUBLIC bool MoveSection( SwWhichSection, SwMoveFnCollection const & );
SW_DLLPUBLIC bool MoveTable( SwWhichTable, SwMoveFnCollection const & );
void MoveColumn( SwWhichColumn, SwPosColumn );
bool MoveRegion( SwWhichRegion, SwMoveFnCollection const & );
// note: DO NOT call it FindText because windows.h
sal_Int32 Find_Text( const i18nutil::SearchOptions2& rSearchOpt,
SW_DLLPUBLIC sal_Int32 Find_Text( const i18nutil::SearchOptions2& rSearchOpt,
bool bSearchInNotes,
SwDocPositions eStart, SwDocPositions eEnd,
bool& bCancel,
@ -408,7 +408,7 @@ public:
* true: Place the cursor at the start of the character/field. This is used when setting
* the cursor is done in order to get at the properties under the mouse pointer.
*/
int SetCursor(const Point& rPt, bool bOnlyText = false, bool bBlock = true,
SW_DLLPUBLIC int SetCursor(const Point& rPt, bool bOnlyText = false, bool bBlock = true,
bool bFieldInfo = false);
/*
@ -427,7 +427,7 @@ public:
inline void SetMark();
inline bool HasMark() const;
void ClearMark();
SW_DLLPUBLIC void ClearMark();
/**
Ensure point and mark of the current PaM are in a specific order.
@ -436,15 +436,15 @@ public:
swap the PaM. false: If the mark is behind the point then swap
the PaM.
*/
void NormalizePam(bool bPointFirst = true);
SW_DLLPUBLIC void NormalizePam(bool bPointFirst = true);
void SwapPam();
bool TestCurrPam( const Point & rPt,
SW_DLLPUBLIC void SwapPam();
SW_DLLPUBLIC bool TestCurrPam( const Point & rPt,
bool bTstHit = false); // only exact matches
void KillPams();
/// store a copy of the current cursor on the cursor stack
void Push();
SW_DLLPUBLIC void Push();
enum class PopMode { DeleteCurrent, DeleteStack };
/*
* Delete a cursor
@ -454,15 +454,15 @@ public:
* @return <true> if there was one on the stack, <false> otherwise
*/
bool Pop(PopMode, ::std::optional<SwCallLink>& roLink);
bool Pop(PopMode);
SW_DLLPUBLIC bool Pop(PopMode);
/*
* Combine 2 Cursors.
* Delete the topmost from the stack and move its Mark into the current.
*/
void Combine();
void SttCursorMove();
void EndCursorMove( const bool bIdleEnd = false );
SW_DLLPUBLIC void SttCursorMove();
SW_DLLPUBLIC void EndCursorMove( const bool bIdleEnd = false );
/*
* When the focus is lost the selected ranges are not displayed anymore.
@ -474,8 +474,8 @@ public:
void ShellGetFocus();
// Methods for displaying or hiding the visible text cursor.
void ShowCursor();
void HideCursor();
SW_DLLPUBLIC void ShowCursor();
SW_DLLPUBLIC void HideCursor();
// Methods for displaying or hiding the selected ranges with visible cursor.
void ShowCursors( bool bCursorVis );
void HideCursors();
@ -487,15 +487,15 @@ public:
void SetSendAccessibleCursorEvents(bool bEnable) { m_bSendAccessibleCursorEvents = bEnable; };
// Return current frame in which the cursor is placed.
SwContentFrame *GetCurrFrame( const bool bCalcFrame = true ) const;
SW_DLLPUBLIC SwContentFrame *GetCurrFrame( const bool bCalcFrame = true ) const;
//true if cursor is hidden because of readonly.
//false if it is working despite readonly.
bool IsCursorReadonly() const;
SW_DLLPUBLIC bool IsCursorReadonly() const;
// Cursor is placed in something that is protected or selection contains
// something that is protected.
bool HasReadonlySel(bool isReplace = false) const;
SW_DLLPUBLIC bool HasReadonlySel(bool isReplace = false) const;
bool HasHiddenSections() const;
// Can the cursor be set to read only ranges?
@ -520,7 +520,7 @@ public:
// Check if the current cursor contains a selection, i.e.
// if Mark is set and SPoint and Mark are different.
bool HasSelection() const;
SW_DLLPUBLIC bool HasSelection() const;
// Check if a selection exists, i.e. if the current cursor comprises a selection.
inline bool IsSelection() const;
@ -554,11 +554,11 @@ public:
// Return current page number:
// true: in which cursor is located.
// false: which is visible at the upper margin.
void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
SW_DLLPUBLIC void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
bool bAtCursorPos = true, const bool bCalcFrame = true );
// Returns current page's sequential number (1-based),in which cursor is located, ignoring autoinserted empty pages.
// Returns 0 on error
sal_uInt16 GetPageNumSeqNonEmpty();
SW_DLLPUBLIC sal_uInt16 GetPageNumSeqNonEmpty();
// Determine how "empty pages" are handled
// (used in PhyPage).
sal_uInt16 GetNextPrevPageNum( bool bNext = true );
@ -566,7 +566,7 @@ public:
// Move cursor at the beginning of page "nPage".
bool GotoPage( sal_uInt16 nPage );
sal_uInt16 GetPageCnt();
SW_DLLPUBLIC sal_uInt16 GetPageCnt();
bool GoNextCursor();
@ -575,16 +575,16 @@ public:
void GoNextPrevCursorSetSearchLabel(const bool bNext);
// at CurrentCursor.SPoint
::sw::mark::IMark* SetBookmark(
SW_DLLPUBLIC ::sw::mark::IMark* SetBookmark(
const vcl::KeyCode&,
const OUString& rName,
IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::MarkType::BOOKMARK);
::sw::mark::IMark* SetBookmark2(
SW_DLLPUBLIC ::sw::mark::IMark* SetBookmark2(
const vcl::KeyCode&,
const OUString& rName,
bool bHide,
const OUString& rCondition);
bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint
SW_DLLPUBLIC bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint
bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart );
bool GoNextBookmark(); // true, if there was one
bool GoPrevBookmark();
@ -601,15 +601,15 @@ public:
// get the selected text at the current cursor. It will be filled with
// fields etc.
OUString GetSelText() const;
SW_DLLPUBLIC OUString GetSelText() const;
/// Check if Point of current cursor is placed within a table.
const SwTableNode* IsCursorInTable() const;
SW_DLLPUBLIC const SwTableNode* IsCursorInTable() const;
bool MoveOutOfTable();
bool TrySelectOuterTable();
bool MoveStartText();
bool IsCursorInFootnote() const;
SW_DLLPUBLIC bool IsCursorInFootnote() const;
inline Point& GetCursorDocPos() const;
// get cursor position relative to the page it is in
@ -624,8 +624,8 @@ public:
OUString GetBoxNms() const;
// set Cursor to the next/previous cell
bool GoNextCell( bool bAppendLine = true );
bool GoPrevCell();
SW_DLLPUBLIC bool GoNextCell( bool bAppendLine = true );
SW_DLLPUBLIC bool GoPrevCell();
// go to this box (if available and inside of table)
bool GotoTable( const OUString& rName );
@ -634,7 +634,7 @@ public:
bool SelTableCol() { return SelTableRowOrCol( false ); }
bool SelTableBox();
bool SelTable();
SW_DLLPUBLIC bool SelTable();
void GotoNextNum();
void GotoPrevNum();
@ -643,7 +643,7 @@ public:
// to the next/previous or the given OutlineNode
void GotoOutline( SwOutlineNodes::size_type nIdx );
// find the "outline position" in the nodes array of the current chapter
SwOutlineNodes::size_type GetOutlinePos(sal_uInt8 nLevel = UCHAR_MAX, SwPaM* pPaM = nullptr);
SW_DLLPUBLIC SwOutlineNodes::size_type GetOutlinePos(sal_uInt8 nLevel = UCHAR_MAX, SwPaM* pPaM = nullptr);
// select the given range of OutlineNodes. Optionally including the children
// the sal_uInt16s are the positions in OutlineNodes-Array (EditShell)
void MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineNodes::size_type nEndPos,
@ -666,7 +666,7 @@ public:
m_pBlockCursor if exist and of interest (param bBlock)
otherwise m_pCurrentCursor
*/
SwShellCursor* getShellCursor( bool bBlock );
SW_DLLPUBLIC SwShellCursor* getShellCursor( bool bBlock );
const SwShellCursor* getShellCursor( bool bBlock ) const
{ return const_cast<SwCursorShell*>(this)->getShellCursor( bBlock ); }
@ -679,19 +679,19 @@ public:
SwShellTableCursor* GetTableCursor() { return m_pTableCursor; }
size_t UpdateTableSelBoxes();
bool GotoFootnoteText(); ///< jump from content to footnote
SW_DLLPUBLIC bool GotoFootnoteText(); ///< jump from content to footnote
bool GotoFootnoteAnchor(); ///< jump from footnote to anchor
bool GotoPrevFootnoteAnchor();
bool GotoNextFootnoteAnchor();
SW_DLLPUBLIC bool GotoPrevFootnoteAnchor();
SW_DLLPUBLIC bool GotoNextFootnoteAnchor();
void GotoFlyAnchor(); ///< jump from the frame to the anchor
bool GotoHeaderText(); ///< jump from the content to the header
SW_DLLPUBLIC bool GotoHeaderText(); ///< jump from the content to the header
bool GotoFooterText(); ///< jump from the content to the footer
// jump to the header/footer of the given or current PageDesc
bool SetCursorInHdFt(size_t nDescNo, bool bInHeader, bool bEven = false, bool bFirst = false);
// is point of cursor in header/footer. pbInHeader return true if it is
// in a headerframe otherwise in a footerframe
bool IsInHeaderFooter( bool* pbInHeader = nullptr ) const;
SW_DLLPUBLIC bool IsInHeaderFooter( bool* pbInHeader = nullptr ) const;
bool GotoNextTOXBase( const OUString* = nullptr );
bool GotoPrevTOXBase( const OUString* = nullptr );
@ -699,7 +699,7 @@ public:
// jump to the next or previous index entry
bool GotoNxtPrvTOXMark( bool bNext = true );
// jump to the next/previous index mark of this type
const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir );
SW_DLLPUBLIC const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir );
// jump to the next or previous table formula
// optionally only to broken formulas
@ -721,7 +721,7 @@ public:
// (This is needed for displaying the Drag&Drop/Copy-Cursor.)
bool SetVisibleCursor( const Point &rPt );
inline void UnSetVisibleCursor();
SwVisibleCursor* GetVisibleCursor() const;
SW_DLLPUBLIC SwVisibleCursor* GetVisibleCursor() const;
// jump to the next or previous field of the corresponding type
bool MoveFieldType(
@ -742,29 +742,29 @@ public:
static SwTextField* GetTextFieldAtCursor(
const SwPaM* pCursor,
::sw::GetTextAttrMode eMode);
static SwField* GetFieldAtCursor(
SW_DLLPUBLIC static SwField* GetFieldAtCursor(
const SwPaM* pCursor,
const bool bIncludeInputFieldAtStart );
SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const;
bool CursorInsideInputField() const;
SwTextContentControl* CursorInsideContentControl() const;
static bool PosInsideInputField( const SwPosition& rPos );
SW_DLLPUBLIC SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const;
SW_DLLPUBLIC bool CursorInsideInputField() const;
SW_DLLPUBLIC SwTextContentControl* CursorInsideContentControl() const;
SW_DLLPUBLIC static bool PosInsideInputField( const SwPosition& rPos );
bool DocPtInsideInputField( const Point& rDocPt ) const;
static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos );
static sal_Int32 EndOfInputFieldAtPos( const SwPosition& rPos );
// Return number of cursors in ring (The flag indicates whether
// only cursors containing selections are requested).
sal_uInt16 GetCursorCnt( bool bAll = true ) const;
SW_DLLPUBLIC sal_uInt16 GetCursorCnt( bool bAll = true ) const;
// Char Travelling - methods (in crstrvl1.cxx)
bool GoStartWord();
bool GoEndWord();
bool GoNextWord();
bool GoPrevWord();
SW_DLLPUBLIC bool GoPrevWord();
bool GoNextSentence();
bool GoStartSentence();
bool GoEndSentence();
SW_DLLPUBLIC bool GoStartSentence();
SW_DLLPUBLIC bool GoEndSentence();
bool SelectWord( const Point* pPt );
void ExpandToSentenceBorders();
@ -774,11 +774,11 @@ public:
bool IsInWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
bool IsStartSentence() const;
bool IsEndSentence() const;
bool IsSttPara() const;
bool IsEndPara() const;
SW_DLLPUBLIC bool IsSttPara() const;
SW_DLLPUBLIC bool IsEndPara() const;
bool IsEndOfTable() const; ///< at the very last SwPosition inside a table
bool IsStartOfDoc() const;
bool IsEndOfDoc() const;
SW_DLLPUBLIC bool IsEndOfDoc() const;
bool IsInFrontOfLabel() const;
bool IsAtLeftMargin() const { return IsAtLRMargin( true ); }
bool IsAtRightMargin() const { return IsAtLRMargin( false, true/*bAPI*/ ); }
@ -805,7 +805,7 @@ public:
// set the cursor to a NOT protected/hidden node
bool FindValidContentNode( bool bOnlyText );
bool GetContentAtPos( const Point& rPt,
SW_DLLPUBLIC bool GetContentAtPos( const Point& rPt,
SwContentAtPos& rContentAtPos,
bool bSetCursor = false,
SwRect* pFieldRect = nullptr );
@ -826,7 +826,7 @@ public:
bool GotoINetAttr( const SwTextINetFormat& rAttr );
const SwFormatINetFormat* FindINetAttr( std::u16string_view rName ) const;
bool SelectTextModel(sal_Int32 nStart, sal_Int32 nEnd);
SW_DLLPUBLIC bool SelectTextModel(sal_Int32 nStart, sal_Int32 nEnd);
#ifdef SW_DLLIMPLEMENTATION
bool SelectTextView(TextFrameIndex nStart, TextFrameIndex nEnd);
// result is only valid while cursor isn't moved!
@ -849,15 +849,15 @@ public:
bool GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode,
SwRect& rRect, sal_Int16& rOrient );
bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode );
SW_DLLPUBLIC bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode );
const SwRangeRedline* SelNextRedline();
const SwRangeRedline* SelPrevRedline();
const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool bSelect );
SW_DLLPUBLIC const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool bSelect );
bool GotoFootnoteAnchor(const SwTextFootnote& rTextFootnote);
SAL_DLLPRIVATE SvxFrameDirection GetTextDirection( const Point* pPt = nullptr ) const;
SvxFrameDirection GetTextDirection( const Point* pPt = nullptr ) const;
// is cursor or the point in/over a vertical formatted text?
bool IsInVerticalText( const Point* pPt = nullptr ) const;
// is cursor or the point in/over a right to left formatted text?

202
sw/inc/doc.hxx
View File

@ -193,7 +193,7 @@ void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
using SwRubyList = std::vector<std::unique_ptr<SwRubyListEntry>>;
// Represents the model of a Writer document.
class SW_DLLPUBLIC SwDoc final
class SwDoc final
{
friend class ::sw::DocumentContentOperationsManager;
@ -354,7 +354,7 @@ private:
FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat );
void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase const & rDestArr,
FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat );
void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
SW_DLLPUBLIC void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat );
SwDoc( const SwDoc &) = delete;
@ -371,7 +371,7 @@ private:
const OUString& rFormula,
std::vector<OUString>& rUsedDBNames );
void EnsureNumberFormatter(); // must be called with mNumberFormatterMutex locked
SW_DLLPUBLIC void EnsureNumberFormatter(); // must be called with mNumberFormatterMutex locked
bool UnProtectTableCells( SwTable& rTable );
@ -387,10 +387,10 @@ private:
// CharTimer calls this method.
void DoUpdateAllCharts();
DECL_DLLPRIVATE_LINK( DoUpdateModifiedOLE, Timer *, void );
DECL_LINK( DoUpdateModifiedOLE, Timer *, void );
public:
SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool );
SW_DLLPUBLIC SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool );
SwFormat *MakeFrameFormat_(const OUString &, SwFormat *, bool, bool );
private:
@ -411,8 +411,8 @@ public:
void SetDocumentType( DocumentType eDocType ) { meDocType = eDocType; }
// Life cycle
SwDoc();
~SwDoc();
SW_DLLPUBLIC SwDoc();
SW_DLLPUBLIC ~SwDoc();
bool IsInDtor() const { return mbDtor; }
@ -432,7 +432,7 @@ private:
@returns
the current reference count of the instance for debugging purposes.
*/
sal_Int32 acquire();
SW_DLLPUBLIC sal_Int32 acquire();
/** Releases a reference to an instance. A caller has to call
'release' when a before acquired reference to an instance
is no longer needed. 'acquire' and 'release' calls need to
@ -441,7 +441,7 @@ private:
@returns
the current reference count of the instance for debugging purposes.
*/
sal_Int32 release();
SW_DLLPUBLIC sal_Int32 release();
/** Returns the current reference count. This method should be used for
debugging purposes. Using it otherwise is a signal of a design flaw.
*/
@ -449,8 +449,8 @@ public:
sal_Int32 getReferenceCount() const;
// IDocumentSettingAccess
IDocumentSettingAccess const & getIDocumentSettingAccess() const; //The IDocumentSettingAccess interface
IDocumentSettingAccess & getIDocumentSettingAccess();
SW_DLLPUBLIC IDocumentSettingAccess const & getIDocumentSettingAccess() const; //The IDocumentSettingAccess interface
SW_DLLPUBLIC IDocumentSettingAccess & getIDocumentSettingAccess();
::sw::DocumentSettingManager & GetDocumentSettingManager(); //The implementation of the interface with some additional methods
::sw::DocumentSettingManager const& GetDocumentSettingManager() const;
sal_uInt32 getRsid() const;
@ -460,33 +460,33 @@ public:
// IDocumentDeviceAccess
IDocumentDeviceAccess const & getIDocumentDeviceAccess() const;
IDocumentDeviceAccess & getIDocumentDeviceAccess();
SW_DLLPUBLIC IDocumentDeviceAccess & getIDocumentDeviceAccess();
// IDocumentMarkAccess
IDocumentMarkAccess* getIDocumentMarkAccess();
const IDocumentMarkAccess* getIDocumentMarkAccess() const;
SW_DLLPUBLIC IDocumentMarkAccess* getIDocumentMarkAccess();
SW_DLLPUBLIC const IDocumentMarkAccess* getIDocumentMarkAccess() const;
// IDocumentRedlineAccess
IDocumentRedlineAccess const& getIDocumentRedlineAccess() const;
IDocumentRedlineAccess& getIDocumentRedlineAccess();
SW_DLLPUBLIC IDocumentRedlineAccess& getIDocumentRedlineAccess();
::sw::DocumentRedlineManager const& GetDocumentRedlineManager() const;
::sw::DocumentRedlineManager& GetDocumentRedlineManager();
SW_DLLPUBLIC ::sw::DocumentRedlineManager& GetDocumentRedlineManager();
// IDocumentUndoRedo
IDocumentUndoRedo & GetIDocumentUndoRedo();
SW_DLLPUBLIC IDocumentUndoRedo & GetIDocumentUndoRedo();
IDocumentUndoRedo const& GetIDocumentUndoRedo() const;
// IDocumentLinksAdministration
IDocumentLinksAdministration const & getIDocumentLinksAdministration() const;
IDocumentLinksAdministration & getIDocumentLinksAdministration();
SW_DLLPUBLIC IDocumentLinksAdministration & getIDocumentLinksAdministration();
::sw::DocumentLinksAdministrationManager const & GetDocumentLinksAdministrationManager() const;
::sw::DocumentLinksAdministrationManager & GetDocumentLinksAdministrationManager();
// IDocumentFieldsAccess
IDocumentFieldsAccess const & getIDocumentFieldsAccess() const;
IDocumentFieldsAccess & getIDocumentFieldsAccess();
SW_DLLPUBLIC IDocumentFieldsAccess & getIDocumentFieldsAccess();
::sw::DocumentFieldsManager & GetDocumentFieldsManager();
@ -497,7 +497,7 @@ public:
// IDocumentContentOperations
IDocumentContentOperations const & getIDocumentContentOperations() const;
IDocumentContentOperations & getIDocumentContentOperations();
SW_DLLPUBLIC IDocumentContentOperations & getIDocumentContentOperations();
::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const;
::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager();
@ -506,34 +506,34 @@ public:
// IDocumentStylePoolAccess
IDocumentStylePoolAccess const & getIDocumentStylePoolAccess() const;
IDocumentStylePoolAccess & getIDocumentStylePoolAccess();
SW_DLLPUBLIC IDocumentStylePoolAccess & getIDocumentStylePoolAccess();
// SwLineNumberInfo
const SwLineNumberInfo& GetLineNumberInfo() const;
void SetLineNumberInfo(const SwLineNumberInfo& rInfo);
SW_DLLPUBLIC const SwLineNumberInfo& GetLineNumberInfo() const;
SW_DLLPUBLIC void SetLineNumberInfo(const SwLineNumberInfo& rInfo);
// IDocumentStatistics
IDocumentStatistics const & getIDocumentStatistics() const;
IDocumentStatistics & getIDocumentStatistics();
SW_DLLPUBLIC IDocumentStatistics & getIDocumentStatistics();
::sw::DocumentStatisticsManager const & GetDocumentStatisticsManager() const;
::sw::DocumentStatisticsManager & GetDocumentStatisticsManager();
// IDocumentState
IDocumentState const & getIDocumentState() const;
IDocumentState & getIDocumentState();
SW_DLLPUBLIC IDocumentState & getIDocumentState();
// IDocumentDrawModelAccess
void AddDrawUndo( std::unique_ptr<SdrUndoAction> );
IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const;
IDocumentDrawModelAccess & getIDocumentDrawModelAccess();
SW_DLLPUBLIC IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const;
SW_DLLPUBLIC IDocumentDrawModelAccess & getIDocumentDrawModelAccess();
::sw::DocumentDrawModelManager const & GetDocumentDrawModelManager() const;
::sw::DocumentDrawModelManager & GetDocumentDrawModelManager();
// IDocumentLayoutAccess
IDocumentLayoutAccess const & getIDocumentLayoutAccess() const;
IDocumentLayoutAccess & getIDocumentLayoutAccess();
SW_DLLPUBLIC IDocumentLayoutAccess const & getIDocumentLayoutAccess() const;
SW_DLLPUBLIC IDocumentLayoutAccess & getIDocumentLayoutAccess();
::sw::DocumentLayoutManager const & GetDocumentLayoutManager() const;
::sw::DocumentLayoutManager & GetDocumentLayoutManager();
@ -557,11 +557,11 @@ public:
// IDocumentListsAccess
IDocumentListsAccess const & getIDocumentListsAccess() const;
IDocumentListsAccess & getIDocumentListsAccess();
SW_DLLPUBLIC IDocumentListsAccess & getIDocumentListsAccess();
//IDocumentExternalData
IDocumentExternalData const & getIDocumentExternalData() const;
IDocumentExternalData & getIDocumentExternalData();
SW_DLLPUBLIC IDocumentExternalData & getIDocumentExternalData();
//End of Interfaces
@ -569,7 +569,7 @@ public:
const OUString& getDocAccTitle() const { return msDocAccTitle; }
// INextInterface here
DECL_DLLPRIVATE_LINK(CalcFieldValueHdl, EditFieldInfo*, void);
DECL_LINK(CalcFieldValueHdl, EditFieldInfo*, void);
// OLE ???
bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; }
@ -593,7 +593,7 @@ public:
have to be surrounded completely by css::awt::Selection.
( Start < Pos < End ) !!!
(Required for Writers.) */
SwPosFlyFrames GetAllFlyFormats( const SwPaM*,
SW_DLLPUBLIC SwPosFlyFrames GetAllFlyFormats( const SwPaM*,
bool bDrawAlso,
bool bAsCharAlso = false ) const;
@ -613,7 +613,7 @@ public:
false: no propagation
*/
SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType,
SW_DLLPUBLIC SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType,
const SwPosition* pAnchorPos,
const SfxItemSet* pSet = nullptr,
SwFrameFormat *pParent = nullptr,
@ -629,7 +629,7 @@ public:
// these items work for the UNO API and thus e.g. for ODF import/export)
void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
SW_DLLPUBLIC bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat,
SfxItemSet* pSet = nullptr, bool bKeepOrient = false );
@ -643,9 +643,9 @@ public:
// Footnotes
// Footnote information
const SwFootnoteInfo& GetFootnoteInfo() const { return *mpFootnoteInfo; }
void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
SW_DLLPUBLIC void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; }
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
SW_DLLPUBLIC void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
SwFootnoteIdxs& GetFootnoteIdxs() { return *mpFootnoteIdxs; }
const SwFootnoteIdxs& GetFootnoteIdxs() const { return *mpFootnoteIdxs; }
/// change footnotes in range
@ -676,35 +676,35 @@ public:
void ChangeAuthorityData(const SwAuthEntry* pNewData);
bool IsInHeaderFooter( const SwNode& ) const;
SvxFrameDirection GetTextDirection( const SwPosition& rPos,
SW_DLLPUBLIC SvxFrameDirection GetTextDirection( const SwPosition& rPos,
const Point* pPt = nullptr ) const;
bool IsInVerticalText( const SwPosition& rPos ) const;
SW_DLLPUBLIC bool IsInVerticalText( const SwPosition& rPos ) const;
// Database and DB-Manager
void SetDBManager( SwDBManager* pNewMgr ) { m_pDBManager = pNewMgr; }
SwDBManager* GetDBManager() const { return m_pDBManager; }
void ChangeDBFields( const std::vector<OUString>& rOldNames,
const OUString& rNewName );
void SetInitDBFields(bool b);
SW_DLLPUBLIC void SetInitDBFields(bool b);
// Find out which databases are used by fields.
void GetAllUsedDB( std::vector<OUString>& rDBNameList,
const std::vector<OUString>* pAllDBNames = nullptr );
void ChgDBData( const SwDBData& rNewData );
SwDBData const & GetDBData();
SW_DLLPUBLIC SwDBData const & GetDBData();
// Some helper functions
OUString GetUniqueGrfName(std::u16string_view rPrefix = std::u16string_view()) const;
OUString GetUniqueOLEName() const;
OUString GetUniqueFrameName() const;
SW_DLLPUBLIC OUString GetUniqueFrameName() const;
OUString GetUniqueShapeName() const;
OUString GetUniqueDrawObjectName() const;
SW_DLLPUBLIC OUString GetUniqueDrawObjectName() const;
o3tl::sorted_vector<SwRootFrame*> GetAllLayouts();
SW_DLLPUBLIC o3tl::sorted_vector<SwRootFrame*> GetAllLayouts();
void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName );
const SwFlyFrameFormat* FindFlyByName( const OUString& rName, SwNodeType nNdTyp = SwNodeType::NONE ) const;
SW_DLLPUBLIC const SwFlyFrameFormat* FindFlyByName( const OUString& rName, SwNodeType nNdTyp = SwNodeType::NONE ) const;
static void GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName, OUString* pFltName );
@ -725,10 +725,10 @@ public:
/** Set attribute in given format.1y
* If Undo is enabled, the old values is added to the Undo history. */
void SetAttr( const SfxPoolItem&, SwFormat& );
SW_DLLPUBLIC void SetAttr( const SfxPoolItem&, SwFormat& );
/** Set attribute in given format.1y
* If Undo is enabled, the old values is added to the Undo history. */
void SetAttr( const SfxItemSet&, SwFormat& );
SW_DLLPUBLIC void SetAttr( const SfxItemSet&, SwFormat& );
// method to reset a certain attribute at the given format
void ResetAttrAtFormat( const std::vector<sal_uInt16>& rIds,
@ -740,7 +740,7 @@ public:
void SetDefault( const SfxItemSet& );
// Query default attribute in this document.
const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
SW_DLLPUBLIC const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
template<class T> const T& GetDefault( TypedWhichId<T> nWhich ) const
{
return static_cast<const T&>(GetDefault(sal_uInt16(nWhich)));
@ -774,12 +774,12 @@ public:
// Remove all language dependencies from all existing formats
void RemoveAllFormatLanguageDependencies();
SwFrameFormat *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom,
SW_DLLPUBLIC SwFrameFormat* MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom,
bool bBroadcast = false, bool bAuto = true);
void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false );
SW_DLLPUBLIC void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false );
SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const;
SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom,
SW_DLLPUBLIC SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom,
bool bBroadcast = false );
void DelCharFormat(size_t nFormat, bool bBroadcast = false);
void DelCharFormat(SwCharFormat const * pFormat, bool bBroadcast = false);
@ -792,7 +792,7 @@ public:
SwTextFormatColl* GetDfltTextFormatColl() { return mpDfltTextFormatColl.get(); }
const SwTextFormatColls *GetTextFormatColls() const { return mpTextFormatCollTable.get(); }
SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable.get(); }
SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName,
SW_DLLPUBLIC SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName,
SwTextFormatColl *pDerivedFrom,
bool bBroadcast = false);
SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName,
@ -807,7 +807,7 @@ public:
The new parameter <bResetListAttrs> indicates, if the list attributes
(list style, restart at and restart with) are cleared as well in case
that <bReset = true> and the paragraph style has a list style attribute set. */
bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat,
SW_DLLPUBLIC bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat,
const bool bReset = true,
const bool bResetListAttrs = false,
SwRootFrame const* pLayout = nullptr);
@ -825,17 +825,17 @@ public:
// Table formatting
const sw::TableFrameFormats* GetTableFrameFormats() const { return mpTableFrameFormatTable.get(); }
sw::TableFrameFormats* GetTableFrameFormats() { return mpTableFrameFormatTable.get(); }
size_t GetTableFrameFormatCount( bool bUsed ) const;
SW_DLLPUBLIC size_t GetTableFrameFormatCount( bool bUsed ) const;
SwTableFormat& GetTableFrameFormat(size_t nFormat, bool bUsed ) const;
SwTableFormat* MakeTableFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
void DelTableFrameFormat( SwTableFormat* pFormat );
SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
SW_DLLPUBLIC SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
/** Access to frames.
Iterate over Flys - for Basic-Collections. */
size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const;
SW_DLLPUBLIC size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const;
SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes = false );
std::vector<SwFrameFormat const*> GetFlyFrameFormats(
SW_DLLPUBLIC std::vector<SwFrameFormat const*> GetFlyFrameFormats(
FlyCntType eType,
bool bIgnoreTextBoxes);
@ -849,10 +849,10 @@ public:
void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true );
// Replace all property defaults with those from rSource.
void ReplaceDefaults( const SwDoc& rSource );
SW_DLLPUBLIC void ReplaceDefaults( const SwDoc& rSource );
// Replace all compatibility options with those from rSource.
void ReplaceCompatibilityOptions( const SwDoc& rSource );
SW_DLLPUBLIC void ReplaceCompatibilityOptions( const SwDoc& rSource );
/** Replace all user defined document properties with xSourceDocProps.
Convenience function used by ReplaceDocumentProperties to skip some UNO calls.
@ -863,13 +863,13 @@ public:
This includes the user defined document properties!
*/
void ReplaceDocumentProperties(const SwDoc& rSource, bool mailMerge = false);
SW_DLLPUBLIC void ReplaceDocumentProperties(const SwDoc& rSource, bool mailMerge = false);
// Query if style (paragraph- / character- / frame- / page-) is used.
bool IsUsed( const sw::BroadcastingModify& ) const;
/// Query if table style is used.
bool IsUsed( const SwTableAutoFormat& ) const;
bool IsUsed( const SwNumRule& ) const;
SW_DLLPUBLIC bool IsUsed( const SwNumRule& ) const;
// Set name of newly loaded document template.
size_t SetDocPattern(const OUString& rPatternName);
@ -895,13 +895,13 @@ public:
size_t GetPageDescCnt() const { return m_PageDescs.size(); }
const SwPageDesc& GetPageDesc(const size_t i) const { return *m_PageDescs[i]; }
SwPageDesc& GetPageDesc(size_t const i) { return *m_PageDescs[i]; }
SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = nullptr) const;
SW_DLLPUBLIC SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = nullptr) const;
// Just searches the pointer in the m_PageDescs vector!
bool ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos) const;
/** Copy the complete PageDesc - beyond document and "deep"!
Optionally copying of PoolFormatId, -HlpId can be prevented. */
void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
SW_DLLPUBLIC void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
bool bCopyPoolIds = true );
/** Copy header (with contents) from SrcFormat to DestFormat
@ -915,12 +915,12 @@ public:
{ CopyPageDescHeaderFooterImpl( false, rSrcFormat, rDestFormat ); }
// For Reader
void ChgPageDesc( const OUString & rName, const SwPageDesc& );
void ChgPageDesc( size_t i, const SwPageDesc& );
SW_DLLPUBLIC void ChgPageDesc( const OUString & rName, const SwPageDesc& );
SW_DLLPUBLIC void ChgPageDesc( size_t i, const SwPageDesc& );
void DelPageDesc( const OUString & rName, bool bBroadcast = false);
void DelPageDesc( size_t i, bool bBroadcast = false );
void PreDelPageDesc(SwPageDesc const * pDel);
SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = nullptr,
SW_DLLPUBLIC SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = nullptr,
bool bRegardLanguage = true,
bool bBroadcast = false);
void BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamily,
@ -933,11 +933,11 @@ public:
// Methods for tables/indices
static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& );
void DeleteTOXMark( const SwTOXMark* pTOXMark );
const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark,
SW_DLLPUBLIC const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark,
SwTOXSearch eDir, bool bInReadOnly );
// Insert/Renew table/index
SwTOXBaseSection* InsertTableOf( const SwPosition& rPos,
SW_DLLPUBLIC SwTOXBaseSection* InsertTableOf( const SwPosition& rPos,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = nullptr,
bool bExpand = false,
@ -950,7 +950,7 @@ public:
void InsertTableOf( SwNodeOffset nSttNd, SwNodeOffset nEndNd,
const SwTOXBase& rTOX,
const SfxItemSet* pSet );
static SwTOXBase* GetCurTOX( const SwPosition& rPos );
SW_DLLPUBLIC static SwTOXBase* GetCurTOX( const SwPosition& rPos );
static const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX);
bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes );
@ -988,8 +988,8 @@ public:
void SetInWriterfilterImport(bool const b) { mbInWriterfilterImport = b; }
// Manage types of tables/indices
sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const;
const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const;
SW_DLLPUBLIC sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const;
SW_DLLPUBLIC const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const;
const SwTOXType* InsertTOXType( const SwTOXType& rTyp );
const SwTOXTypes& GetTOXTypes() const { return *mpTOXTypes; }
@ -1040,8 +1040,8 @@ public:
{
return mpOutlineRule;
}
void SetOutlineNumRule( const SwNumRule& rRule );
void PropagateOutlineRule();
SW_DLLPUBLIC void SetOutlineNumRule( const SwNumRule& rRule );
SW_DLLPUBLIC void PropagateOutlineRule();
// Outline - promote / demote.
bool OutlineUpDown(const SwPaM& rPam, short nOffset, SwRootFrame const* pLayout = nullptr);
@ -1049,7 +1049,7 @@ public:
/// Outline - move up / move down.
bool MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type nOffset);
bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame const* = nullptr) const;
SW_DLLPUBLIC bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame const* = nullptr) const;
/** Accept changes of outline styles for OutlineRule.
@param bResetIndentAttrs Optional parameter - default value false:
@ -1088,19 +1088,19 @@ public:
void AddNumRule(SwNumRule * pRule);
// add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
sal_uInt16 MakeNumRule( const OUString &rName,
SW_DLLPUBLIC sal_uInt16 MakeNumRule( const OUString &rName,
const SwNumRule* pCpy = nullptr,
bool bBroadcast = false,
const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode =
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
sal_uInt16 FindNumRule( std::u16string_view rName ) const;
SwNumRule* FindNumRulePtr( const OUString& rName ) const;
SW_DLLPUBLIC SwNumRule* FindNumRulePtr( const OUString& rName ) const;
// Deletion only possible if Rule is not used!
bool RenameNumRule(const OUString & aOldName, const OUString & aNewName,
bool bBroadcast = false);
bool DelNumRule( const OUString& rName, bool bBroadCast = false );
OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const;
SW_DLLPUBLIC bool DelNumRule( const OUString& rName, bool bBroadCast = false );
SW_DLLPUBLIC OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const;
void UpdateNumRule(); // Update all invalids.
void ChgNumRuleFormats( const SwNumRule& rRule );
@ -1176,7 +1176,7 @@ public:
propagation.
false: do not propagate
*/
const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder
SW_DLLPUBLIC const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder
const SwPosition& rPos, sal_uInt16 nRows,
sal_uInt16 nCols, sal_Int16 eAdjust,
const SwTableAutoFormat* pTAFormat = nullptr,
@ -1207,7 +1207,7 @@ public:
sal_uInt16 nCnt = 1, bool bBehind = true, bool bInsertDummy = true );
void InsertRow( const SwCursor& rCursor,
sal_uInt16 nCnt = 1, bool bBehind = true );
bool InsertRow( const SwSelBoxes& rBoxes,
SW_DLLPUBLIC bool InsertRow( const SwSelBoxes& rBoxes,
sal_uInt16 nCnt = 1, bool bBehind = true, bool bInsertDummy = true );
// Delete Columns/Rows in table.
@ -1251,7 +1251,7 @@ public:
bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet );
/// Return the available table styles.
SwTableAutoFormatTable& GetTableStyles();
SW_DLLPUBLIC SwTableAutoFormatTable& GetTableStyles();
const SwTableAutoFormatTable& GetTableStyles() const
{
return const_cast<SwDoc*>(this)->GetTableStyles();
@ -1259,11 +1259,11 @@ public:
/// Counts table styles without triggering lazy-load of them.
bool HasTableStyles() const { return m_pTableStyles != nullptr; }
// Create a new table style. Tracked by Undo.
SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast = false);
SW_DLLPUBLIC SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast = false);
// Delete table style named rName. Tracked by undo.
std::unique_ptr<SwTableAutoFormat> DelTableStyle(const OUString& rName, bool bBroadcast = false);
SW_DLLPUBLIC std::unique_ptr<SwTableAutoFormat> DelTableStyle(const OUString& rName, bool bBroadcast = false);
// Change (replace) a table style named rName. Tracked by undo.
void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat);
SW_DLLPUBLIC void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat);
const SwCellStyleTable& GetCellStyles() const { return *mpCellStyles; }
SwCellStyleTable& GetCellStyles() { return *mpCellStyles; }
@ -1319,7 +1319,7 @@ public:
/** @return names of all references that are set in document.
If array pointer is 0 return only whether a RefMark is set in document. */
sal_uInt16 GetRefMarks( std::vector<OUString>* = nullptr ) const;
SW_DLLPUBLIC sal_uInt16 GetRefMarks( std::vector<OUString>* = nullptr ) const;
void DeleteFormatRefMark(const SwFormatRefMark* pFormatRefMark);
@ -1339,7 +1339,7 @@ public:
// Search for an EditShell.
SwEditShell const * GetEditShell() const;
SwEditShell* GetEditShell();
SW_DLLPUBLIC SwEditShell* GetEditShell();
::sw::IShellCursorSupplier * GetIShellCursorSupplier();
// OLE 2.0-notification.
@ -1347,7 +1347,7 @@ public:
const Link<bool,void>& GetOle2Link() const {return maOle2Link;}
// insert section (the ODF kind of section, not the nodesarray kind)
SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
SW_DLLPUBLIC SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
std::tuple<SwTOXBase const*, sw::RedlineMode, sw::FieldmarkMode, sw::ParagraphBreakMode> const* pTOXBase,
SfxItemSet const*const pAttr, bool const bUpdate = true);
static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
@ -1359,7 +1359,7 @@ public:
void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false );
void UpdateSection(size_t const nSect, SwSectionData &,
SfxItemSet const*const = nullptr, bool const bPreventLinkUpdate = false);
OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const;
SW_DLLPUBLIC OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const;
/* @@@MAINTAINABILITY-HORROR@@@
The model should not have anything to do with a shell.
@ -1377,10 +1377,10 @@ public:
const SfxObjectShellLock& GetTmpDocShell() const { return mxTmpDocShell; }
// For Autotexts? (text modules) They have only one SVPersist at their disposal.
SfxObjectShell* GetPersist() const;
SW_DLLPUBLIC SfxObjectShell* GetPersist() const;
// Pointer to storage of SfxDocShells. Can be 0!!!
css::uno::Reference< css::embed::XStorage > GetDocStorage();
SW_DLLPUBLIC css::uno::Reference< css::embed::XStorage > GetDocStorage();
// Query / set flag indicating if document is loaded asynchronously at this moment.
bool IsInLoadAsynchron() const { return mbInLoadAsynchron; }
@ -1441,12 +1441,12 @@ public:
bool HasInvisibleContent() const;
// delete invisible content, like hidden sections and paragraphs
bool RemoveInvisibleContent();
SW_DLLPUBLIC bool RemoveInvisibleContent();
// restore the invisible content if it's available on the undo stack
bool RestoreInvisibleContent();
// Replace fields by text - mailmerge support
SAL_DLLPRIVATE bool ConvertFieldsToText(SwRootFrame const& rLayout);
bool ConvertFieldsToText(SwRootFrame const& rLayout);
// Create sub-documents according to given collection.
// If no collection is given, use chapter styles for 1st level.
@ -1487,7 +1487,7 @@ public:
void SetOLEObjModified();
// Uno - Interfaces
std::shared_ptr<SwUnoCursor> CreateUnoCursor( const SwPosition& rPos, bool bTableCursor = false );
SW_DLLPUBLIC std::shared_ptr<SwUnoCursor> CreateUnoCursor( const SwPosition& rPos, bool bTableCursor = false );
// FeShell - Interfaces
// !!! These assume always an existing layout !!!
@ -1538,7 +1538,7 @@ public:
/// bNoShrink keeps table size the same by distributing excess space proportionately.
void AdjustCellWidth( const SwCursor& rCursor, const bool bBalance, const bool bNoShrink );
SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest );
SW_DLLPUBLIC SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest );
SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
void Unchain( SwFrameFormat &rFormat );
@ -1595,7 +1595,7 @@ public:
const bool bValue );
// Change a format undoable.
void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet);
SW_DLLPUBLIC void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet);
void RenameFormat(SwFormat & rFormat, const OUString & sNewName,
bool bBroadcast = false);
@ -1642,19 +1642,19 @@ public:
void disposeXForms( );
//Update all the page masters
void SetDefaultPageMode(bool bSquaredPageMode);
bool IsSquaredPageMode() const;
SW_DLLPUBLIC void SetDefaultPageMode(bool bSquaredPageMode);
SW_DLLPUBLIC bool IsSquaredPageMode() const;
const css::uno::Reference< ooo::vba::word::XFind >& getVbaFind() const { return mxVbaFind; }
void setVbaFind( const css::uno::Reference< ooo::vba::word::XFind > &xFind) { mxVbaFind = xFind; }
css::uno::Reference< css::script::vba::XVBAEventProcessor > const & GetVbaEventProcessor();
void SetVbaEventProcessor();
SW_DLLPUBLIC void SetVbaEventProcessor();
void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer > const & xCache ) { m_xTemplateToProjectCache = xCache; };
const css::uno::Reference< css::container::XNameContainer >& GetVBATemplateToProjectCache() const { return m_xTemplateToProjectCache; };
::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
::sw::MetaFieldManager & GetMetaFieldManager();
::SwContentControlManager& GetContentControlManager();
::sw::UndoManager & GetUndoManager();
SW_DLLPUBLIC ::sw::MetaFieldManager & GetMetaFieldManager();
SW_DLLPUBLIC ::SwContentControlManager& GetContentControlManager();
SW_DLLPUBLIC ::sw::UndoManager & GetUndoManager();
::sw::UndoManager const& GetUndoManager() const;
SfxObjectShell* CreateCopy(bool bCallInitNew, bool bEmpty) const;

260
sw/inc/editsh.hxx
View File

@ -137,7 +137,7 @@ typedef std::vector<SwGetINetAttr> SwGetINetAttrs;
#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
class SW_DLLPUBLIC SwEditShell : public SwCursorShell
class SwEditShell : public SwCursorShell
{
static SvxSwAutoFormatFlags* s_pAutoFormatFlags;
@ -150,11 +150,11 @@ class SW_DLLPUBLIC SwEditShell : public SwCursorShell
/** Returns pointer to a SwGrfNode
that will be used by GetGraphic() and GetGraphicSize(). */
SAL_DLLPRIVATE SwGrfNode *GetGrfNode_() const ;
SwGrfNode *GetGrfNode_() const ;
SAL_DLLPRIVATE void DeleteSel(SwPaM& rPam, bool isArtificialSelection, bool goLeft = false, bool* pUndo = nullptr);
void DeleteSel(SwPaM& rPam, bool isArtificialSelection, bool goLeft = false, bool* pUndo = nullptr);
SAL_DLLPRIVATE void SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet );
void SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet );
using SwViewShell::UpdateFields;
using sw::BroadcastingModify::GetInfo;
@ -162,7 +162,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCursorShell
public:
/// Edit (all selected ranges).
void Insert( sal_Unicode, bool bOnlyCurrCursor = false );
void Insert2( const OUString &, const bool bForceExpandHints = false );
SW_DLLPUBLIC void Insert2( const OUString &, const bool bForceExpandHints = false );
void Overwrite( const OUString & );
/** Replace a selected range in a TextNode by given string.
@ -170,7 +170,7 @@ public:
bRegExpRplc - replace tabs (\\t) and insert found string (not \&).
E.g.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
--> "xx\t<Tab>..zzz..&" */
bool Replace( const OUString& rNewStr, bool bRegExpRplc );
SW_DLLPUBLIC bool Replace( const OUString& rNewStr, bool bRegExpRplc );
/** Replace a selected range in a TextNode by given string.
Possible comments will be kept (moved to the end of the selection). */
@ -178,26 +178,26 @@ public:
/** Delete content of all ranges.
If whole nodes are selected, these nodes get deleted. */
bool Delete(bool isArtificialSelection = false, bool goLeft = false);
SW_DLLPUBLIC bool Delete(bool isArtificialSelection = false, bool goLeft = false);
/// Remove a complete paragraph.
bool DelFullPara();
SW_DLLPUBLIC bool DelFullPara();
/// Change text to Upper/Lower/Hiragana/Katakana/...
void TransliterateText( TransliterationFlags nType );
/// Count words in current selection.
void CountWords( SwDocStat& rStat ) const;
SW_DLLPUBLIC void CountWords( SwDocStat& rStat ) const;
/// Replace fields by text - mailmerge support.
SAL_DLLPRIVATE bool ConvertFieldsToText();
bool ConvertFieldsToText();
/// Set all numbering start points to a fixed value - mailmerge support.
void SetNumberingRestart();
/// Embeds all local links (ranges/graphics).
sal_uInt16 GetLinkUpdMode() const;
void SetLinkUpdMode( sal_uInt16 nMode );
SW_DLLPUBLIC sal_uInt16 GetLinkUpdMode() const;
SW_DLLPUBLIC void SetLinkUpdMode( sal_uInt16 nMode );
/// Copy content of all ranges at current position of cursor to given Shell.
bool Copy( SwEditShell& rDestShell );
@ -208,8 +208,8 @@ public:
Copy all selections to the document. */
bool CopySelToDoc( SwDoc& rInsDoc );
void SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true );
bool AppendTextNode();
SW_DLLPUBLIC void SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true );
SW_DLLPUBLIC bool AppendTextNode();
void AutoFormatBySplitNode();
/** If cursor is in an INetAttribute it will be deleted completely
@ -231,11 +231,11 @@ public:
level is SvxNumberFormat::LABEL_ALIGNMENT. */
bool GetPaMAttr( SwPaM* pPaM, SfxItemSet& ,
const bool bMergeIndentValuesOfNumRule = false ) const;
bool GetCurAttr( SfxItemSet& ,
SW_DLLPUBLIC bool GetCurAttr( SfxItemSet& ,
const bool bMergeIndentValuesOfNumRule = false ) const;
void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT,
SW_DLLPUBLIC void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT,
const bool bParagraphSetting = false );
void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT,
SW_DLLPUBLIC void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT,
SwPaM* pCursor = nullptr, const bool bParagraphSetting = false );
/** Get RES_CHRATR_* items of one type in the current selection.
@ -253,7 +253,7 @@ public:
* output parameter - the SfxItemSet where the automatic paragraph format attribute(s) will be store.
* The attributes aren't invalidated or cleared if the function reach the getMaxLookup limit.
*/
void GetCurParAttr( SfxItemSet& rSet ) const;
SW_DLLPUBLIC void GetCurParAttr( SfxItemSet& rSet ) const;
/**
* Get the paragraph format attribute(s) of the selection(s) described by a SwPaM.
*
@ -267,10 +267,10 @@ public:
void GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const;
/// Set attribute as new default attribute in document.
void SetDefault( const SfxPoolItem& );
SW_DLLPUBLIC void SetDefault( const SfxPoolItem& );
/// Query default attribute of document.
const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
SW_DLLPUBLIC const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
template<class T> const T& GetDefault( TypedWhichId<T> nWhich ) const
{
return static_cast<const T&>(GetDefault(sal_uInt16(nWhich)));
@ -280,23 +280,23 @@ public:
void GCAttr();
/// @return the scripttype of the selection.
SvtScriptType GetScriptType() const;
SW_DLLPUBLIC SvtScriptType GetScriptType() const;
/// @return the language at current cursor position.
LanguageType GetCurLang() const;
SW_DLLPUBLIC LanguageType GetCurLang() const;
/// TABLE
size_t GetTableFrameFormatCount( bool bUsed = false ) const;
SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed = false ) const;
OUString GetUniqueTableName() const;
SW_DLLPUBLIC OUString GetUniqueTableName() const;
/// CHAR
sal_uInt16 GetCharFormatCount() const;
SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const;
SW_DLLPUBLIC sal_uInt16 GetCharFormatCount() const;
SW_DLLPUBLIC SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const;
SwCharFormat* GetCurCharFormat() const;
void FillByEx(SwCharFormat*);
SwCharFormat* MakeCharFormat( const OUString& rName );
SwCharFormat* FindCharFormatByName( const OUString& rName ) const;
SW_DLLPUBLIC SwCharFormat* FindCharFormatByName( const OUString& rName ) const;
/* FormatCollections (new) - Explaining the general naming pattern:
* GetXXXCount() returns the count of xxx in the document.
@ -310,8 +310,8 @@ public:
// TXT
SwTextFormatColl& GetDfltTextFormatColl() const;
sal_uInt16 GetTextFormatCollCount() const;
SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const;
SW_DLLPUBLIC sal_uInt16 GetTextFormatCollCount() const;
SW_DLLPUBLIC SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const;
/**
* Get the named paragraph format of the current selection.
*
@ -322,7 +322,7 @@ public:
* selections are sort by their order of creation
* (last created selection first, oldest selection at last).
*/
SwTextFormatColl* GetCurTextFormatColl() const;
SW_DLLPUBLIC SwTextFormatColl* GetCurTextFormatColl() const;
/**
* Get the named paragraph format of the selection(s) described by a SwPaM.
*
@ -335,23 +335,23 @@ public:
// #i62675#
/// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)>
void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false);
SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName,
SW_DLLPUBLIC void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false);
SW_DLLPUBLIC SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName,
SwTextFormatColl *pDerivedFrom = nullptr);
void FillByEx(SwTextFormatColl*);
SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const;
SW_DLLPUBLIC SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const;
/// @return "Auto-Collection" with given Id. If it does not exist create it.
SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId );
SW_DLLPUBLIC SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId );
/// @return required automatic format base class.
SwFormat* GetFormatFromPool( sal_uInt16 nId );
/// @return required automatic page style.
SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
SW_DLLPUBLIC SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
/// Query if the paragraph-/character-/frame-/page-style is used.
bool IsUsed( const sw::BroadcastingModify& ) const;
SW_DLLPUBLIC bool IsUsed( const sw::BroadcastingModify& ) const;
/// @return required automatic format.
SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId )
@ -364,7 +364,7 @@ public:
std::vector<svx::ClassificationResult> CollectAdvancedClassification();
SfxWatermarkItem GetWatermark() const;
void SetWatermark(const SfxWatermarkItem& rText);
SW_DLLPUBLIC void SetWatermark(const SfxWatermarkItem& rText);
/// Sign the paragraph at the cursor.
void SignParagraph();
@ -403,53 +403,53 @@ public:
bool InsertField(SwField const &, const bool bForceExpandHints);
void UpdateOneField(SwField &); ///< One single field.
SW_DLLPUBLIC void UpdateOneField(SwField &); ///< One single field.
size_t GetFieldTypeCount(SwFieldIds nResId = SwFieldIds::Unknown) const;
SwFieldType* GetFieldType(size_t nField, SwFieldIds nResId = SwFieldIds::Unknown) const;
SwFieldType* GetFieldType(SwFieldIds nResId, const OUString& rName) const;
SW_DLLPUBLIC size_t GetFieldTypeCount(SwFieldIds nResId = SwFieldIds::Unknown) const;
SW_DLLPUBLIC SwFieldType* GetFieldType(size_t nField, SwFieldIds nResId = SwFieldIds::Unknown) const;
SW_DLLPUBLIC SwFieldType* GetFieldType(SwFieldIds nResId, const OUString& rName) const;
void RemoveFieldType(size_t nField);
void RemoveFieldType(SwFieldIds nResId, const OUString& rName);
void FieldToText( SwFieldType const * pType );
void ChangeAuthorityData(const SwAuthEntry* pNewData);
SW_DLLPUBLIC void ChangeAuthorityData(const SwAuthEntry* pNewData);
/// Database information.
SwDBData const & GetDBData() const;
SW_DLLPUBLIC SwDBData const & GetDBData() const;
void ChgDBData(const SwDBData& SwDBData);
void ChangeDBFields( const std::vector<OUString>& rOldNames,
SW_DLLPUBLIC void ChangeDBFields( const std::vector<OUString>& rOldNames,
const OUString& rNewName );
void GetAllUsedDB( std::vector<OUString>& rDBNameList,
SW_DLLPUBLIC void GetAllUsedDB( std::vector<OUString>& rDBNameList,
std::vector<OUString> const * pAllDBNames );
bool IsAnyDatabaseFieldInDoc()const;
/// Check whether DB fields point to an available data source and returns it.
bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const;
void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update
void LockExpFields();
void UnlockExpFields();
SW_DLLPUBLIC void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update
SW_DLLPUBLIC void LockExpFields();
SW_DLLPUBLIC void UnlockExpFields();
bool IsExpFieldsLocked() const;
SwFieldUpdateFlags GetFieldUpdateFlags() const;
void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags );
SW_DLLPUBLIC SwFieldUpdateFlags GetFieldUpdateFlags() const;
SW_DLLPUBLIC void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags );
/// For evaluation of DB fields (new DB-manager).
SwDBManager* GetDBManager() const;
SW_DLLPUBLIC SwDBManager* GetDBManager() const;
SwFieldType* InsertFieldType(const SwFieldType &);
SW_DLLPUBLIC SwFieldType* InsertFieldType(const SwFieldType &);
/// Changes in document?
bool IsModified() const;
void SetModified();
void ResetModified();
void SetUndoNoResetModified();
SW_DLLPUBLIC bool IsModified() const;
SW_DLLPUBLIC void SetModified();
SW_DLLPUBLIC void ResetModified();
SW_DLLPUBLIC void SetUndoNoResetModified();
/// Document - Statistics
void UpdateDocStat();
const SwDocStat &GetUpdatedDocStat();
SW_DLLPUBLIC const SwDocStat &GetUpdatedDocStat();
void Insert(const SwTOXMark& rMark);
@ -463,36 +463,36 @@ public:
const SfxItemSet* pSet = nullptr);
void UpdateTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = nullptr);
const SwTOXBase* GetCurTOX() const;
const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
void SetDefaultTOXBase(const SwTOXBase& rBase);
SW_DLLPUBLIC const SwTOXBase* GetCurTOX() const;
SW_DLLPUBLIC const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
SW_DLLPUBLIC void SetDefaultTOXBase(const SwTOXBase& rBase);
static bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase);
void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly);
sal_uInt16 GetTOXCount() const;
const SwTOXBase* GetTOX( sal_uInt16 nPos ) const;
bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes );
SW_DLLPUBLIC sal_uInt16 GetTOXCount() const;
SW_DLLPUBLIC const SwTOXBase* GetTOX( sal_uInt16 nPos ) const;
SW_DLLPUBLIC bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes );
/// After reading file update all content tables.
void SetUpdateTOX( bool bFlag );
bool IsUpdateTOX() const;
/// Manage types of content tables.
sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const;
const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const;
SW_DLLPUBLIC sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const;
SW_DLLPUBLIC const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const;
void InsertTOXType(const SwTOXType& rTyp);
/// AutoMark file
OUString const & GetTOIAutoMarkURL() const;
SW_DLLPUBLIC OUString const & GetTOIAutoMarkURL() const;
void SetTOIAutoMarkURL(const OUString& rSet);
void ApplyAutoMark();
/// Key for managing index.
void GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
SW_DLLPUBLIC void GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
void SetOutlineNumRule(const SwNumRule&);
const SwNumRule* GetOutlineNumRule() const;
SW_DLLPUBLIC void SetOutlineNumRule(const SwNumRule&);
SW_DLLPUBLIC const SwNumRule* GetOutlineNumRule() const;
bool OutlineUpDown( short nOffset = 1 );
@ -500,7 +500,7 @@ public:
bool IsProtectedOutlinePara() const;
const SwNumRule* GetNumRuleAtCurrCursorPos() const;
SW_DLLPUBLIC const SwNumRule* GetNumRuleAtCurrCursorPos() const;
/** Returns the numbering rule found at the paragraphs of the current selection,
if all paragraphs of the current selection have the same or none numbering rule applied. */
@ -527,11 +527,11 @@ public:
void NumUpDown( bool bDown = true );
bool MoveParagraph( SwNodeOffset nOffset = SwNodeOffset(1));
SW_DLLPUBLIC bool MoveParagraph( SwNodeOffset nOffset = SwNodeOffset(1));
bool MoveNumParas( bool bUpperLower, bool bUpperLeft );
/// Switch on/off of numbering via Delete/Backspace.
bool NumOrNoNum(bool bDelete = false, bool bChkStart = true);
SW_DLLPUBLIC bool NumOrNoNum(bool bDelete = false, bool bChkStart = true);
// #i23726#
// #i90078#
@ -561,7 +561,7 @@ public:
bool SelectionHasNumber() const;
bool SelectionHasBullet() const;
OUString GetUniqueNumRuleName() const;
SW_DLLPUBLIC OUString GetUniqueNumRuleName() const;
void ChgNumRuleFormats( const SwNumRule& rRule );
/// Set (and query if) a numbering with StartFlag starts at current PointPos.
@ -582,19 +582,19 @@ public:
/** Undo.
Maintain UndoHistory in Document.
Reset UndoHistory at Save, SaveAs, Create ??? */
void DoUndo( bool bOn = true );
bool DoesUndo() const;
SW_DLLPUBLIC void DoUndo( bool bOn = true );
SW_DLLPUBLIC bool DoesUndo() const;
void DoGroupUndo( bool bUn );
bool DoesGroupUndo() const;
void DelAllUndoObj();
/// Undo: set up Undo parenthesis, return nUndoId of this parenthesis.
SwUndoId StartUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr );
SW_DLLPUBLIC SwUndoId StartUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr );
/// Closes parenthesis of nUndoId, not used by UI.
SwUndoId EndUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr );
SW_DLLPUBLIC SwUndoId EndUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr );
bool GetLastUndoInfo(OUString *const o_pStr,
SW_DLLPUBLIC bool GetLastUndoInfo(OUString *const o_pStr,
SwUndoId *const o_pId,
const SwView* pView = nullptr) const;
bool GetFirstRedoInfo(OUString *const o_pStr,
@ -608,16 +608,16 @@ public:
/// should only be called by sw::UndoManager!
void HandleUndoRedoContext(::sw::UndoRedoContext & rContext);
void Undo(sal_uInt16 const nCount = 1, sal_uInt16 nOffset = 0);
void Redo(sal_uInt16 const nCount = 1);
SW_DLLPUBLIC void Undo(sal_uInt16 const nCount = 1, sal_uInt16 nOffset = 0);
SW_DLLPUBLIC void Redo(sal_uInt16 const nCount = 1);
void Repeat(sal_uInt16 const nCount);
/// For all views of this document.
void StartAllAction();
void EndAllAction();
SW_DLLPUBLIC void StartAllAction();
SW_DLLPUBLIC void EndAllAction();
/// To enable set up of StartActions and EndActions.
virtual void CalcLayout() override;
SW_DLLPUBLIC virtual void CalcLayout() override;
/// Determine form of content. Return Type at CurrentCursor->SPoint.
sal_uInt16 GetCntType() const;
@ -649,7 +649,7 @@ public:
}
/** Query text within selection. */
void GetSelectedText( OUString &rBuf,
SW_DLLPUBLIC void GetSelectedText( OUString &rBuf,
ParaBreakType nHndlParaBreak = ParaBreakType::ToBlank );
/** @return graphic, if CurrentCursor->Point() points to a SwGrfNode
@ -670,7 +670,7 @@ public:
void ClearAutomaticContour();
/// @return the size of a graphic in Twips if cursor is in a graphic.
bool GetGrfSize(Size&) const;
SW_DLLPUBLIC bool GetGrfSize(Size&) const;
/** @return name and filter of a graphic if the cursor is in a graphic,
else give a rap on the knuckles!
@ -687,13 +687,13 @@ public:
// #i73788#
/// Remove default parameter, because method always called this default value.
Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
SW_DLLPUBLIC Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
const SwFlyFrameFormat* FindFlyByName( const OUString& rName ) const;
/** @return a ClientObject, if CurrentCursor->Point() points to a SwOLENode
(and mark is neither set not pointint to same ClientObject)
else give rap on the knuckles. */
svt::EmbeddedObjectRef& GetOLEObject() const;
SW_DLLPUBLIC svt::EmbeddedObjectRef& GetOLEObject() const;
/// Is there an OLEObject with this name (SwFormat)?
bool HasOLEObj( std::u16string_view rName ) const;
@ -741,7 +741,7 @@ public:
* function does not move the user's cursor to the first cell of the just inserted table, use
* `MoveTable(GotoPrevTable, fnTableStart)` to do that.
*/
const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< All
SW_DLLPUBLIC const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< All
sal_uInt16 nRows, sal_uInt16 nCols,
const SwTableAutoFormat* pTAFormat = nullptr );
@ -750,26 +750,26 @@ public:
sal_uInt16 nRows, sal_uInt16 nCols );
void UpdateTable();
void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
SW_DLLPUBLIC void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
SwFrameFormat *GetTableFormat();
bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< All
SW_DLLPUBLIC SwFrameFormat *GetTableFormat();
SW_DLLPUBLIC bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< All
sal_Unicode cCh,
const SwTableAutoFormat* pTAFormat = nullptr );
bool TableToText( sal_Unicode cCh );
SW_DLLPUBLIC bool TableToText( sal_Unicode cCh );
bool IsTextToTableAvailable() const;
bool GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const;
void SetTableBoxFormulaAttrs( const SfxItemSet& rSet );
SW_DLLPUBLIC void SetTableBoxFormulaAttrs( const SfxItemSet& rSet );
bool IsTableBoxTextFormat() const;
OUString GetTableBoxText() const;
TableChgMode GetTableChgMode() const;
void SetTableChgMode( TableChgMode eMode );
SW_DLLPUBLIC void SetTableChgMode( TableChgMode eMode );
/// Split table at cursor position.
void SplitTable( SplitTable_HeadlineOption eMode );
SW_DLLPUBLIC void SplitTable( SplitTable_HeadlineOption eMode );
/** Merge tables.
@ -779,7 +779,7 @@ public:
bool MergeTable( bool bWithPrev );
/// Set up InsertDB as table Undo.
void AppendUndoForInsertFromDB( bool bIsTable );
SW_DLLPUBLIC void AppendUndoForInsertFromDB( bool bIsTable );
/// Functions used for spell checking and text conversion.
@ -849,8 +849,8 @@ public:
/// Set our styles according to the respective rules.
void AutoFormat( const SvxSwAutoFormatFlags* pAFlags, bool bCurrentParagraphOnly );
static SvxSwAutoFormatFlags* GetAutoFormatFlags();
static void SetAutoFormatFlags(SvxSwAutoFormatFlags const *);
SW_DLLPUBLIC static SvxSwAutoFormatFlags* GetAutoFormatFlags();
SW_DLLPUBLIC static void SetAutoFormatFlags(SvxSwAutoFormatFlags const *);
/// Calculates selection.
OUString Calculate();
@ -859,7 +859,7 @@ public:
bool bKeepSelection = false );
void GetINetAttrs(SwGetINetAttrs& rArr , bool bIncludeInToxContent = true);
OUString GetDropText( const sal_Int32 nChars ) const;
SW_DLLPUBLIC OUString GetDropText( const sal_Int32 nChars ) const;
void ReplaceDropText( const OUString &rStr, SwPaM* pPaM = nullptr );
/** May an outline be moved or copied?
@ -867,20 +867,20 @@ public:
bool IsOutlineMovable( SwOutlineNodes::size_type nIdx ) const;
bool IsOutlineCopyable( SwOutlineNodes::size_type nIdx ) const;
sal_Int32 GetLineCount();
SW_DLLPUBLIC sal_Int32 GetLineCount();
/// Query and set footnote-text/number. Set... to current SSelection!
bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = nullptr );
bool SetCurFootnote( const SwFormatFootnote& rFillFootnote );
bool HasFootnotes( bool bEndNotes = false ) const;
SW_DLLPUBLIC bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = nullptr );
SW_DLLPUBLIC bool SetCurFootnote( const SwFormatFootnote& rFillFootnote );
SW_DLLPUBLIC bool HasFootnotes( bool bEndNotes = false ) const;
size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false );
SW_DLLPUBLIC size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false );
/// @return list of all footnotes and their first portions of text.
SwSection const* InsertSection(
SW_DLLPUBLIC SwSection const* InsertSection(
SwSectionData & rNewData, SfxItemSet const*const = nullptr );
bool IsInsRegionAvailable() const;
const SwSection* GetCurrSection() const;
SW_DLLPUBLIC bool IsInsRegionAvailable() const;
SW_DLLPUBLIC const SwSection* GetCurrSection() const;
/** @return current range like Cet CurrSection(). But this function iterates
also over frames and catches the range even if the cursor is positioned in
@ -889,23 +889,23 @@ public:
and not an inner one. */
SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = nullptr );
size_t GetSectionFormatCount() const;
size_t GetSectionFormatPos(const SwSectionFormat&) const;
const SwSectionFormat& GetSectionFormat(size_t nFormat) const;
void DelSectionFormat( size_t nFormat);
void UpdateSection( size_t const nSect, SwSectionData &,
SW_DLLPUBLIC size_t GetSectionFormatCount() const;
SW_DLLPUBLIC size_t GetSectionFormatPos(const SwSectionFormat&) const;
SW_DLLPUBLIC const SwSectionFormat& GetSectionFormat(size_t nFormat) const;
SW_DLLPUBLIC void DelSectionFormat( size_t nFormat);
SW_DLLPUBLIC void UpdateSection( size_t const nSect, SwSectionData &,
SfxItemSet const*const = nullptr);
bool IsAnySectionInDoc() const;
OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const;
SW_DLLPUBLIC OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const;
/// Set attributes.
void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = nullptr);
SW_DLLPUBLIC void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = nullptr);
/** Search inside the cursor selection for full selected sections.
if any part of section in the selection @return 0.
if more than one in the selection return the count. */
sal_uInt16 GetFullSelectedSectionCount() const;
SW_DLLPUBLIC sal_uInt16 GetFullSelectedSectionCount() const;
/** Special insert: Insert a new text node just before or after a section or
table, if the cursor is positioned at the start/end of said
@ -918,7 +918,7 @@ public:
/// Optimizing UI.
void SetNewDoc();
sfx2::LinkManager& GetLinkManager();
SW_DLLPUBLIC sfx2::LinkManager& GetLinkManager();
inline const sfx2::LinkManager& GetLinkManager() const;
/** Adjust left margin via object bar (similar to adjustment of numerations).
@ -928,7 +928,7 @@ public:
void MoveLeftMargin( bool bRight, bool bModulus = true );
/// Query NumberFormatter from document.
SvNumberFormatter* GetNumberFormatter();
SW_DLLPUBLIC SvNumberFormatter* GetNumberFormatter();
const SvNumberFormatter* GetNumberFormatter() const
{ return const_cast<SwEditShell*>(this)->GetNumberFormatter(); }
@ -950,13 +950,13 @@ public:
void GotoGlobalDocContent( const SwGlblDocContent& rPos );
/// For Redlining.
RedlineFlags GetRedlineFlags() const;
void SetRedlineFlags( RedlineFlags eMode );
SW_DLLPUBLIC RedlineFlags GetRedlineFlags() const;
SW_DLLPUBLIC void SetRedlineFlags( RedlineFlags eMode );
bool IsRedlineOn() const;
SwRedlineTable::size_type GetRedlineCount() const;
SW_DLLPUBLIC SwRedlineTable::size_type GetRedlineCount() const;
const SwRangeRedline& GetRedline( SwRedlineTable::size_type nPos ) const;
bool AcceptRedline( SwRedlineTable::size_type nPos );
bool RejectRedline( SwRedlineTable::size_type nPos );
SW_DLLPUBLIC bool AcceptRedline( SwRedlineTable::size_type nPos );
SW_DLLPUBLIC bool RejectRedline( SwRedlineTable::size_type nPos );
bool AcceptRedlinesInSelection();
bool RejectRedlinesInSelection();
@ -969,26 +969,26 @@ public:
const SwRangeRedline* GetCurrRedline() const;
/// Redline attributes have been changed. Updated views.
void UpdateRedlineAttr();
SW_DLLPUBLIC void UpdateRedlineAttr();
/// Compare two documents.
tools::Long CompareDoc( const SwDoc& rDoc );
/// Merge two documents.
tools::Long MergeDoc( const SwDoc& rDoc );
SW_DLLPUBLIC tools::Long MergeDoc( const SwDoc& rDoc );
/// Footnote attributes global to document.
const SwFootnoteInfo& GetFootnoteInfo() const;
void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
const SwEndNoteInfo& GetEndNoteInfo() const;
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
SW_DLLPUBLIC const SwFootnoteInfo& GetFootnoteInfo() const;
SW_DLLPUBLIC void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
SW_DLLPUBLIC const SwEndNoteInfo& GetEndNoteInfo() const;
SW_DLLPUBLIC void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
const SwLineNumberInfo &GetLineNumberInfo() const;
void SetLineNumberInfo( const SwLineNumberInfo& rInfo);
SW_DLLPUBLIC const SwLineNumberInfo &GetLineNumberInfo() const;
SW_DLLPUBLIC void SetLineNumberInfo( const SwLineNumberInfo& rInfo);
/// Labels: Synchronize ranges.
void SetLabelDoc( bool bFlag );
bool IsLabelDoc() const;
SW_DLLPUBLIC bool IsLabelDoc() const;
/// Interface for TextInputData - (for input of Japanese/Chinese chars.)
void CreateExtTextInput(LanguageType eInputLanguage);

158
sw/inc/fesh.hxx
View File

@ -198,7 +198,7 @@ enum class SwTab
class SdrDropMarkerOverlay;
struct SwColCache;
class SW_DLLPUBLIC SwFEShell : public SwEditShell
class SwFEShell : public SwEditShell
{
private:
mutable std::unique_ptr<SwColCache> m_pColumnCache;
@ -212,38 +212,38 @@ private:
/// table copied to the clipboard by the last private copy
bool m_bTableCopied;
SAL_DLLPRIVATE SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const;
SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const;
/// Terminate actions for all shells and call ChangeLink.
SAL_DLLPRIVATE void EndAllActionAndCall();
void EndAllActionAndCall();
SAL_DLLPRIVATE void ScrollTo( const Point &rPt );
void ScrollTo( const Point &rPt );
SAL_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
void ChangeOpaque( SdrLayerID nLayerId );
/** Used for mouse operations on a table:
@return a cell frame that is 'close' to rPt. */
SAL_DLLPRIVATE const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const;
const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const;
// 0 == not in any column.
SAL_DLLPRIVATE static sal_uInt16 GetCurColNum_( const SwFrame *pFrame,
static sal_uInt16 GetCurColNum_( const SwFrame *pFrame,
SwGetCurColNumPara* pPara );
SAL_DLLPRIVATE void GetTabCols_(SwTabCols &rToFill, const SwFrame *pBox) const;
SAL_DLLPRIVATE void GetTabRows_(SwTabCols &rToFill, const SwFrame *pBox) const;
void GetTabCols_(SwTabCols &rToFill, const SwFrame *pBox) const;
void GetTabRows_(SwTabCols &rToFill, const SwFrame *pBox) const;
SAL_DLLPRIVATE bool ImpEndCreate();
bool ImpEndCreate();
/// Methods for copying of draw objects.
SAL_DLLPRIVATE bool CopyDrawSel( SwFEShell& rDestShell, const Point& rSttPt,
bool CopyDrawSel( SwFEShell& rDestShell, const Point& rSttPt,
const Point& rInsPt, bool bIsMove,
bool bSelectInsert );
/// Get list of marked SdrObjects;
/// helper method for GetSelFrameType, IsSelContainsControl.
SAL_DLLPRIVATE const SdrMarkList* GetMarkList_() const;
const SdrMarkList* GetMarkList_() const;
SAL_DLLPRIVATE bool CheckHeadline( bool bRepeat ) const;
bool CheckHeadline( bool bRepeat ) const;
using SwEditShell::Copy;
@ -256,27 +256,27 @@ public:
virtual ~SwFEShell() override;
/// Copy and Paste methods for internal clipboard.
void Copy( SwDoc& rClpDoc, const OUString* pNewClpText = nullptr );
bool Paste( SwDoc& rClpDoc, bool bNestedTable = false );
SW_DLLPUBLIC void Copy( SwDoc& rClpDoc, const OUString* pNewClpText = nullptr );
SW_DLLPUBLIC bool Paste( SwDoc& rClpDoc, bool bNestedTable = false );
/// Paste some pages into another doc - used in mailmerge.
void PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage);
SW_DLLPUBLIC void PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage);
/// Copy-Method for Drag&Drop
bool Copy( SwFEShell&, const Point& rSttPt, const Point& rInsPt,
SW_DLLPUBLIC bool Copy( SwFEShell&, const Point& rSttPt, const Point& rInsPt,
bool bIsMove = false, bool bSelectInsert = true );
void SelectFlyFrame( SwFlyFrame& rFrame );
void UnfloatFlyFrame();
SW_DLLPUBLIC void UnfloatFlyFrame();
/// Is selected frame within another frame?
const SwFrameFormat* IsFlyInFly();
SW_DLLPUBLIC const SwFrameFormat* IsFlyInFly();
/** If an object has been given, exactly this object is selected
(instead of searching over position). */
bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = nullptr );
void DelSelectedObj();
SW_DLLPUBLIC bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = nullptr );
SW_DLLPUBLIC void DelSelectedObj();
/** Move selection upwards or downwards (Z-Order).
TRUE = to top or bottom.
@ -304,13 +304,13 @@ public:
/** @return if Upper of frame at current position is section frame
Currently only used by the rules. To be replaced by something more
sophisticated one day. */
bool IsDirectlyInSection() const;
SW_DLLPUBLIC bool IsDirectlyInSection() const;
/** For return values see above FrameType.
pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor.
Although (0,TRUE) is kind of a standard, the parameters are not defaulted here
in order to force more conscious use especially of bStopAtFly. */
FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const;
SW_DLLPUBLIC FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const;
FrameTypeFlags GetSelFrameType() const; //Selection (Drawing)
/** check whether selected frame contains a control;
@ -326,12 +326,12 @@ public:
SwRect GetObjRect() const;
/// For moving flys with keyboard.
SwRect GetFlyRect() const;
SW_DLLPUBLIC SwRect GetFlyRect() const;
/** i#17567 - adjustments to allow negative vertical positions for fly frames anchored
to paragraph or to character.
i#18732 - adjustments for new option 'FollowTextFlow'
i#22341 - adjustments for new vertical alignment at top of line */
void CalcBoundRect( SwRect& _orRect,
SW_DLLPUBLIC void CalcBoundRect( SwRect& _orRect,
const RndStdIds _nAnchorId,
const sal_Int16 _eHoriRelOrient = css::text::RelOrientation::FRAME,
const sal_Int16 _eVertRelOrient = css::text::RelOrientation::FRAME,
@ -370,7 +370,7 @@ public:
const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const;
/** Which Protection is set at selected object? */
FlyProtectFlags IsSelObjProtected( FlyProtectFlags eType ) const;
SW_DLLPUBLIC FlyProtectFlags IsSelObjProtected( FlyProtectFlags eType ) const;
/** Deliver graphic in rName besides graphic name. If graphic is
linked give name with path. rbLink is TRUE if graphic is linked. */
@ -384,29 +384,29 @@ public:
bool IsObjDecorative() const;
void SetObjDecorative(bool isDecorative);
bool IsFrameSelected() const;
SW_DLLPUBLIC bool IsFrameSelected() const;
bool GetFlyFrameAttr( SfxItemSet &rSet ) const;
bool SetFlyFrameAttr( SfxItemSet &rSet );
SW_DLLPUBLIC bool SetFlyFrameAttr( SfxItemSet &rSet );
static SfxItemSetFixed<RES_VERT_ORIENT, RES_ANCHOR> makeItemSetFromFormatAnchor(SfxItemPool& rPool, const SwFormatAnchor &rAnchor);
void ResetFlyFrameAttr( const SfxItemSet* pSet );
const SwFrameFormat *NewFlyFrame( const SfxItemSet &rSet, bool bAnchValid = false,
SW_DLLPUBLIC const SwFrameFormat *NewFlyFrame( const SfxItemSet &rSet, bool bAnchValid = false,
SwFrameFormat *pParent = nullptr );
void SetFlyPos( const Point &rAbsPos);
Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
SW_DLLPUBLIC void SetFlyPos( const Point &rAbsPos);
SW_DLLPUBLIC Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
/** Determines whether a frame or its environment is vertically formatted and right-to-left.
also determines, if frame or its environment is in Mongolian layout (vertical left-to-right)
- add output parameter <bVertL2R> */
bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
SW_DLLPUBLIC bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
SwFrameFormat* GetSelectedFrameFormat() const; ///< If frame then frame style, else 0.
void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point const * pDocPos = nullptr ); ///< If frame then set frame style.
// Get selected fly
SwFlyFrame* GetSelectedFlyFrame() const;
SW_DLLPUBLIC SwFlyFrame* GetSelectedFlyFrame() const;
// Get current fly in which the cursor is positioned
SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const;
SW_DLLPUBLIC SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const;
// Get selected fly, but if none Get current fly in which the cursor is positioned
SwFlyFrame* GetSelectedOrCurrFlyFrame() const;
@ -421,7 +421,7 @@ public:
{ return GotoObj( false, eType); }
/// Iterate over flys - for Basic-collections.
size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const;
SW_DLLPUBLIC size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const;
const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes = false) const;
std::vector<SwFrameFormat const*> GetFlyFrameFormats(
@ -432,7 +432,7 @@ public:
/// Get FlyFrameFormat; for UI macro linkage at Flys
const SwFrameFormat* GetFlyFrameFormat() const;
SwFrameFormat* GetFlyFrameFormat();
SW_DLLPUBLIC SwFrameFormat* GetFlyFrameFormat();
/** OLE. Server requires new size. Desired values are adjusted as frame attributes.
If the values are not allowed, the formatting clips and determines scaling.
@ -463,16 +463,16 @@ public:
void SetCheckForOLEInCaption( bool bFlag ) { m_bCheckForOLEInCaption = bFlag; }
/// Set name at selected FlyFrame.
void SetFlyName( const OUString& rName );
SW_DLLPUBLIC void SetFlyName( const OUString& rName );
OUString GetFlyName() const;
/// get reference to OLE object (if there is one) for selected FlyFrame
css::uno::Reference < css::embed::XEmbeddedObject > GetOleRef() const;
/// Created unique name for frame.
OUString GetUniqueGrfName() const;
OUString GetUniqueOLEName() const;
OUString GetUniqueFrameName() const;
SW_DLLPUBLIC OUString GetUniqueGrfName() const;
SW_DLLPUBLIC OUString GetUniqueOLEName() const;
SW_DLLPUBLIC OUString GetUniqueFrameName() const;
/// Jump to named Fly (graphic/OLE).
bool GotoFly( const OUString& rName, FlyCntType eType,
@ -504,7 +504,7 @@ public:
const SdrObject* GetBestObject(bool bNext, GotoObjFlags eType, bool bFlat = true,
const svx::ISdrObjectFilter* pFilter = nullptr,
bool* pbWrapped = nullptr);
bool GotoObj( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny);
SW_DLLPUBLIC bool GotoObj( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny);
/// Set DragMode (e.g. Rotate), but do nothing when frame is selected.
void SetDragMode( SdrDragMode eSdrDragMode );
@ -518,12 +518,12 @@ public:
// RotGrfFlyFrame: check if RotationMode is possible
bool IsRotationOfSwGrfNodePossible() const;
size_t IsObjSelected() const; ///< @return object count, but doesn't count the objects in groups.
SW_DLLPUBLIC size_t IsObjSelected() const; ///< @return object count, but doesn't count the objects in groups.
bool IsObjSelected( const SdrObject& rObj ) const;
bool IsObjSameLevelWithMarked(const SdrObject* pObj) const;
const SdrMarkList* GetMarkList() const{ return GetMarkList_(); };
void EndTextEdit(); ///< Deletes object if required.
SW_DLLPUBLIC void EndTextEdit(); ///< Deletes object if required.
/** Anchor type of selected object, RndStdIds::UNKNOWN if ambiguous or in case of frame selection.
Else RndStdIds::FLY_AT_PAGE or RndStdIds::FLY_AT_PARA. */
@ -534,10 +534,10 @@ public:
or SdrCreateCmd::NextPoint for a polygon may be relevant.
After RESTRAINTEND the object is created and selected.
BreakCreate interrupts the process. In this case no object is selected. */
bool BeginCreate( SdrObjKind eSdrObjectKind, const Point &rPos );
SW_DLLPUBLIC bool BeginCreate( SdrObjKind eSdrObjectKind, const Point &rPos );
bool BeginCreate( SdrObjKind eSdrObjectKind, SdrInventor eObjInventor, const Point &);
void MoveCreate ( const Point &rPos );
bool EndCreate ( SdrCreateCmd eSdrCreateCmd );
SW_DLLPUBLIC void MoveCreate ( const Point &rPos );
SW_DLLPUBLIC bool EndCreate ( SdrCreateCmd eSdrCreateCmd );
void BreakCreate();
bool IsDrawCreate() const;
void CreateDefaultShape(SdrObjKind eSdrObjectKind, const tools::Rectangle& rRect, sal_uInt16 nSlotId);
@ -561,7 +561,7 @@ public:
/** frmatr.hxx. Here no enum because of dependencies.
bool value only for internal use! Anchor is newly set according
to current document position. Anchor is not re-set. */
void ChgAnchor( RndStdIds eAnchorId, bool bSameOnly = false,
SW_DLLPUBLIC void ChgAnchor( RndStdIds eAnchorId, bool bSameOnly = false,
bool bPosCorr = true );
bool SetDrawingAttr( SfxItemSet &rSet );
@ -578,7 +578,7 @@ public:
bool IsAlignPossible() const;
void SetCalcFieldValueHdl(Outliner* pOutliner);
void Insert(const OUString& rGrfName,
SW_DLLPUBLIC void Insert(const OUString& rGrfName,
const OUString& rFltName,
const Graphic* pGraphic,
const SfxItemSet* pFlyAttrSet );
@ -604,50 +604,50 @@ public:
Point GetRelativePagePosition(const Point& rDocPos);
/// Hide or show layout-selection and pass call to CursorSh.
void ShellLoseFocus();
SW_DLLPUBLIC void ShellLoseFocus();
void ShellGetFocus();
/// PageDescriptor-interface
void ChgCurPageDesc( const SwPageDesc& );
size_t GetCurPageDesc( const bool bCalcFrame = true ) const;
SW_DLLPUBLIC size_t GetCurPageDesc( const bool bCalcFrame = true ) const;
size_t GetMousePageDesc( const Point &rPt ) const;
size_t GetPageDescCnt() const;
SwPageDesc* FindPageDescByName( const OUString& rName,
SW_DLLPUBLIC size_t GetPageDescCnt() const;
SW_DLLPUBLIC SwPageDesc* FindPageDescByName( const OUString& rName,
bool bGetFromPool = false,
size_t* pPos = nullptr );
const SwPageDesc& GetPageDesc( size_t i ) const;
void ChgPageDesc( size_t i, const SwPageDesc& );
SW_DLLPUBLIC const SwPageDesc& GetPageDesc( size_t i ) const;
SW_DLLPUBLIC void ChgPageDesc( size_t i, const SwPageDesc& );
/** if inside all selection only one PageDesc, @return this.
Otherwise @return 0 pointer */
const SwPageDesc* GetSelectedPageDescs() const;
SW_DLLPUBLIC const SwPageDesc* GetSelectedPageDescs() const;
const SwRect& GetAnyCurRect( CurRectType eType,
SW_DLLPUBLIC const SwRect& GetAnyCurRect( CurRectType eType,
const Point* pPt = nullptr,
const css::uno::Reference < css::embed::XEmbeddedObject >& =
css::uno::Reference < css::embed::XEmbeddedObject >() ) const;
/// Page number of the page containing Point, O if no page.
sal_uInt16 GetPageNumber( const Point &rPoint ) const;
bool GetPageNumber( tools::Long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
SW_DLLPUBLIC bool GetPageNumber( tools::Long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&,
SfxItemSet* pFlyAttrSet );
bool FinishOLEObj(); ///< Shutdown server.
void GetTableAttr( SfxItemSet & ) const;
void SetTableAttr( const SfxItemSet & );
SW_DLLPUBLIC void SetTableAttr( const SfxItemSet & );
bool HasWholeTabSelection() const;
/// Is content of a table cell or at least a table cell completely selected?
bool HasBoxSelection() const;
void InsertRow( sal_uInt16 nCnt, bool bBehind );
void InsertCol( sal_uInt16 nCnt, bool bBehind ); // 0 == at the end.
bool DeleteCol();
SW_DLLPUBLIC void InsertRow( sal_uInt16 nCnt, bool bBehind );
SW_DLLPUBLIC void InsertCol( sal_uInt16 nCnt, bool bBehind ); // 0 == at the end.
SW_DLLPUBLIC bool DeleteCol();
void DeleteTable();
bool DeleteRow(bool bCompleteTable = false);
SW_DLLPUBLIC bool DeleteRow(bool bCompleteTable = false);
SwTable::SearchType GetTableInsertMode() const { return m_eTableInsertMode; }
void SetTableInsertMode( SwTable::SearchType eFlag ) { m_eTableInsertMode = eFlag; }
@ -661,12 +661,12 @@ public:
/// Split cell vertically or horizontally.
void SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight );
bool Sort(const SwSortOptions&); // sorting
SW_DLLPUBLIC bool Sort(const SwSortOptions&); // sorting
void SetRowHeight( const SwFormatFrameSize &rSz );
SW_DLLPUBLIC void SetRowHeight( const SwFormatFrameSize &rSz );
/// Pointer must be destroyed by caller != 0.
std::unique_ptr<SwFormatFrameSize> GetRowHeight() const;
SW_DLLPUBLIC std::unique_ptr<SwFormatFrameSize> GetRowHeight() const;
void SetRowSplit( const SwFormatRowSplit &rSz );
std::unique_ptr<SwFormatRowSplit> GetRowSplit() const;
@ -680,16 +680,16 @@ public:
void GetTabBorders( SfxItemSet& rSet) const;
void SetTabLineStyle(const Color* pColor, bool bSetLine = false, const editeng::SvxBorderLine* pBorderLine = nullptr);
void SetTabBackground( const SvxBrushItem &rNew );
SW_DLLPUBLIC void SetTabBackground( const SvxBrushItem &rNew );
void GetTabBackground( std::unique_ptr<SvxBrushItem>& rToFill ) const;
void SetBoxBackground( const SvxBrushItem &rNew );
SW_DLLPUBLIC void SetBoxBackground( const SvxBrushItem &rNew );
bool GetBoxBackground( std::unique_ptr<SvxBrushItem>& rToFill ) const; ///< FALSE ambiguous.
void SetBoxDirection( const SvxFrameDirectionItem& rNew );
bool GetBoxDirection( std::unique_ptr<SvxFrameDirectionItem>& rToFill ) const; ///< FALSE ambiguous.
void SetRowBackground( const SvxBrushItem &rNew );
SW_DLLPUBLIC void SetRowBackground( const SvxBrushItem &rNew );
bool GetRowBackground( std::unique_ptr<SvxBrushItem>& rToFill ) const; ///< FALSE ambiguous.
SwTab WhichMouseTabCol( const Point &rPt ) const;
@ -707,16 +707,16 @@ public:
void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const;
void SetMouseTabRows( const SwTabCols &rNew, bool bCurColOnly, const Point &rPt );
void ProtectCells(); /**< If a table selection exists it is destroyed in case
SW_DLLPUBLIC void ProtectCells(); /**< If a table selection exists it is destroyed in case
cursor is not allowed in readonly. */
void UnProtectCells(); ///< Refers to table selection.
SW_DLLPUBLIC void UnProtectCells(); ///< Refers to table selection.
void UnProtectTables(); ///< Unprotect all tables in selection.
bool HasTableAnyProtection( const OUString* pTableName,
bool* pFullTableProtection );
bool CanUnProtectCells() const;
sal_uInt16 GetRowsToRepeat() const;
void SetRowsToRepeat( sal_uInt16 nNumOfRows );
SW_DLLPUBLIC void SetRowsToRepeat( sal_uInt16 nNumOfRows );
sal_uInt16 GetVirtPageNum() const;
/** @return the number of table rows currently selected
@ -733,7 +733,7 @@ public:
/// Set table style of the current table.
void SetTableStyle(const OUString& rStyleName);
bool SetTableStyle(const SwTableAutoFormat& rNew);
SW_DLLPUBLIC bool SetTableStyle(const SwTableAutoFormat& rNew);
/// Update the direct formatting according to the current table style.
/// @param pTableNode Table node to update. When nullptr, current cursor position is used.
@ -741,7 +741,7 @@ public:
/// @param pStyleName new style to apply
bool UpdateTableStyleFormatting(SwTableNode *pTableNode = nullptr, bool bResetDirect = false, OUString const* pStyleName = nullptr);
bool GetTableAutoFormat( SwTableAutoFormat& rGet );
SW_DLLPUBLIC bool GetTableAutoFormat( SwTableAutoFormat& rGet );
void SetColRowWidthHeight( TableChgWidthHeightType eType, sal_uInt16 nDiff );
@ -749,7 +749,7 @@ public:
/** Phy: real page count.
Virt: consider offset that may have been set by user. */
sal_uInt16 GetPhyPageNum() const;
SW_DLLPUBLIC sal_uInt16 GetPhyPageNum() const;
void SetNewPageOffset( sal_uInt16 nOffset );
void SetPageOffset( sal_uInt16 nOffset ); ///< Changes last page offset.
@ -762,23 +762,23 @@ public:
const bool bCpyBrd );
/// The ruler needs some information too.
sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = nullptr ) const; //0 == not in any column.
SW_DLLPUBLIC sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = nullptr ) const; //0 == not in any column.
sal_uInt16 GetCurMouseColNum( const Point &rPt ) const;
size_t GetCurTabColNum() const; //0 == not in any table.
size_t GetCurMouseTabColNum( const Point &rPt ) const;
sal_uInt16 GetCurOutColNum() const; ///< Current outer column.
bool IsColRightToLeft() const;
bool IsTableRightToLeft() const;
SW_DLLPUBLIC bool IsTableRightToLeft() const;
bool IsMouseTableRightToLeft( const Point &rPt ) const;
bool IsTableVertical() const;
bool IsLastCellInRow() const;
/// Width of current range for column-dialog.
tools::Long GetSectionWidth( SwFormat const & rFormat ) const;
SW_DLLPUBLIC tools::Long GetSectionWidth( SwFormat const & rFormat ) const;
void GetConnectableFrameFormats
SW_DLLPUBLIC void GetConnectableFrameFormats
(SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors,
std::vector< OUString > & aPrevPageVec,
std::vector< OUString > & aThisPageVec,
@ -819,7 +819,7 @@ public:
void ToggleHeaderFooterEdit( );
static void SetLineEnds(SfxItemSet& rAttr, SdrObject const & rObj, sal_uInt16 nSlotId);
SAL_DLLPRIVATE void ClearColumnRowCache(SwTabFrame const*);
void ClearColumnRowCache(SwTabFrame const*);
};
void ClearFEShellTabCols(SwDoc & rDoc, SwTabFrame const*const pFrame);

4
sw/inc/unocoll.hxx
View File

@ -262,7 +262,7 @@ cppu::WeakImplHelper
css::lang::XServiceInfo
>
SwCollectionBaseClass;
class SW_DLLPUBLIC SwXTextTables final : public SwCollectionBaseClass,
class SwXTextTables final : public SwCollectionBaseClass,
public SwUnoCollection
{
virtual ~SwXTextTables() override;
@ -287,7 +287,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
SW_DLLPUBLIC static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
};
typedef

14
sw/source/core/inc/UndoManager.hxx
View File

@ -38,7 +38,7 @@ namespace sw {
* It contains a stack of SwUndo actions, each of which represents one user-visible
* undo / redo step.
*/
class SW_DLLPUBLIC UndoManager final
class UndoManager final
: public IDocumentUndoRedo
, public SdrUndoManager
{
@ -63,9 +63,9 @@ public:
virtual void SetUndoNoResetModified() override;
virtual bool IsUndoNoResetModified() const override;
virtual SwUndoId StartUndo(SwUndoId const eUndoId,
SW_DLLPUBLIC virtual SwUndoId StartUndo(SwUndoId const eUndoId,
SwRewriter const*const pRewriter) override;
virtual SwUndoId EndUndo(SwUndoId const eUndoId,
SW_DLLPUBLIC virtual SwUndoId EndUndo(SwUndoId const eUndoId,
SwRewriter const*const pRewriter) override;
virtual void DelAllUndoObj() override;
virtual bool GetLastUndoInfo(OUString *const o_pStr,
@ -82,16 +82,16 @@ public:
virtual void AppendUndo(std::unique_ptr<SwUndo> pUndo) override;
virtual void ClearRedo() override;
virtual bool IsUndoNodes(SwNodes const& rNodes) const override;
virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const override;
SW_DLLPUBLIC virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const override;
size_t GetRedoActionCount(const bool bCurrentLevel = true) const override;
void SetView(SwView* pView) override;
SW_DLLPUBLIC void SetView(SwView* pView) override;
bool UndoWithOffset(size_t nUndoOffset) override;
// SfxUndoManager
virtual void AddUndoAction(std::unique_ptr<SfxUndoAction> pAction,
bool bTryMerg = false) override;
virtual bool Undo() override;
virtual bool Redo() override;
SW_DLLPUBLIC virtual bool Undo() override;
SW_DLLPUBLIC virtual bool Redo() override;
void dumpAsXml(xmlTextWriterPtr pWriter) const;
SwUndo * RemoveLastUndo();

190
sw/source/uibase/inc/wrtsh.hxx
View File

@ -93,7 +93,7 @@ namespace o3tl {
Eg. the Insert() method will take the current cursor position, insert the
string, and take care of undo etc.
*/
class SW_DLLPUBLIC SwWrtShell final : public SwFEShell
class SwWrtShell final : public SwFEShell
{
private:
using SwCursorShell::Left;
@ -129,27 +129,27 @@ public:
void SetSplitVerticalByDefault(bool value);
// reset all selections
tools::Long ResetSelect( const Point *, bool );
SW_DLLPUBLIC tools::Long ResetSelect( const Point *, bool );
// resets the cursorstack after movement with PageUp/-Down if a stack is built up
inline void ResetCursorStack();
SelectionType GetSelectionType() const;
SW_DLLPUBLIC SelectionType GetSelectionType() const;
bool IsModePushed() const { return nullptr != m_pModeStack; }
void PushMode();
void PopMode();
void SttSelect();
void EndSelect();
SW_DLLPUBLIC void EndSelect();
bool IsInSelect() const { return m_bInSelect; }
void SetInSelect() { m_bInSelect = true; }
// is there a text- or frameselection?
bool HasSelection() const { return SwCursorShell::HasSelection() ||
IsMultiSelection() || IsSelFrameMode() || IsObjSelected(); }
bool Pop(SwCursorShell::PopMode, ::std::optional<SwCallLink>& roLink);
bool Pop(SwCursorShell::PopMode = SwCursorShell::PopMode::DeleteStack);
SW_DLLPUBLIC bool Pop(SwCursorShell::PopMode = SwCursorShell::PopMode::DeleteStack);
void EnterStdMode();
SW_DLLPUBLIC void EnterStdMode();
bool IsStdMode() const { return !m_bExtMode && !m_bAddMode && !m_bBlockMode; }
void AssureStdMode();
@ -172,13 +172,13 @@ public:
void SetInsMode( bool bOn = true );
void ToggleInsMode() { SetInsMode( !m_bIns ); }
bool IsInsMode() const { return m_bIns; }
void SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode );
SW_DLLPUBLIC void SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode );
void EnterSelFrameMode(const Point *pStartDrag = nullptr);
void LeaveSelFrameMode();
SW_DLLPUBLIC void EnterSelFrameMode(const Point *pStartDrag = nullptr);
SW_DLLPUBLIC void LeaveSelFrameMode();
bool IsSelFrameMode() const { return m_bLayoutMode; }
// reset selection of frames
void UnSelectFrame();
SW_DLLPUBLIC void UnSelectFrame();
void Invalidate();
@ -200,39 +200,39 @@ public:
// select word / sentence
bool SelNearestWrd();
bool SelWrd (const Point * = nullptr );
SW_DLLPUBLIC bool SelWrd(const Point * = nullptr );
// #i32329# Enhanced selection
void SelSentence (const Point *);
void SelPara (const Point *);
void SelAll();
SW_DLLPUBLIC void SelPara (const Point *);
SW_DLLPUBLIC void SelAll();
// basecursortravelling
typedef bool (SwWrtShell::*FNSimpleMove)();
bool SimpleMove( FNSimpleMove, bool bSelect );
SW_DLLPUBLIC bool SimpleMove( FNSimpleMove, bool bSelect );
bool Left ( SwCursorSkipMode nMode, bool bSelect,
SW_DLLPUBLIC bool Left( SwCursorSkipMode nMode, bool bSelect,
sal_uInt16 nCount, bool bBasicCall, bool bVisual = false );
bool Right ( SwCursorSkipMode nMode, bool bSelect,
SW_DLLPUBLIC bool Right( SwCursorSkipMode nMode, bool bSelect,
sal_uInt16 nCount, bool bBasicCall, bool bVisual = false );
bool Up ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false );
bool Down ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false );
SW_DLLPUBLIC bool Up ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false );
SW_DLLPUBLIC bool Down( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false );
void NxtWrd ( bool bSelect = false ) { SimpleMove( &SwWrtShell::NxtWrd_, bSelect ); }
bool PrvWrd ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::PrvWrd_, bSelect ); }
bool LeftMargin ( bool bSelect, bool bBasicCall );
bool RightMargin( bool bSelect, bool bBasicCall );
SW_DLLPUBLIC bool RightMargin( bool bSelect, bool bBasicCall );
bool StartOfSection( bool bSelect = false );
bool EndOfSection ( bool bSelect = false );
SW_DLLPUBLIC bool StartOfSection( bool bSelect = false );
SW_DLLPUBLIC bool EndOfSection ( bool bSelect = false );
bool SttNxtPg ( bool bSelect = false );
SW_DLLPUBLIC bool SttNxtPg ( bool bSelect = false );
void SttPrvPg ( bool bSelect = false );
void EndNxtPg ( bool bSelect = false );
bool EndPrvPg ( bool bSelect = false );
bool SttPg ( bool bSelect = false );
bool EndPg ( bool bSelect = false );
bool SttPara ( bool bSelect = false );
void EndPara ( bool bSelect = false );
SW_DLLPUBLIC bool EndPrvPg ( bool bSelect = false );
SW_DLLPUBLIC bool SttPg ( bool bSelect = false );
SW_DLLPUBLIC bool EndPg ( bool bSelect = false );
SW_DLLPUBLIC bool SttPara ( bool bSelect = false );
SW_DLLPUBLIC void EndPara ( bool bSelect = false );
bool FwdPara ()
{ return SimpleMove( &SwWrtShell::FwdPara_, false/*bSelect*/ ); }
void BwdPara ()
@ -243,12 +243,12 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
{ SimpleMove( &SwWrtShell::BwdSentence_, bSelect ); }
// #i20126# Enhanced table selection
bool SelectTableRowCol( const Point& rPt, const Point* pEnd = nullptr, bool bRowDrag = false );
SW_DLLPUBLIC bool SelectTableRowCol( const Point& rPt, const Point* pEnd = nullptr, bool bRowDrag = false );
void SelectTableRow();
void SelectTableCol();
void SelectTableCell();
bool SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr = nullptr );
SW_DLLPUBLIC bool SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr = nullptr );
// per column jumps
void StartOfColumn ();
@ -262,10 +262,10 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
// additionally to an identically named implementation in crsrsh.hxx
// here all existing selections are being reset before setting the
// cursor
bool GotoPage( sal_uInt16 nPage, bool bRecord );
SW_DLLPUBLIC bool GotoPage( sal_uInt16 nPage, bool bRecord );
// setting the cursor; remember the old position for turning back
DECL_DLLPRIVATE_LINK( ExecFlyMac, const SwFlyFrameFormat*, void );
DECL_LINK( ExecFlyMac, const SwFlyFrameFormat*, void );
bool PageCursor(SwTwips lOffset, bool bSelect);
@ -279,19 +279,19 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
void SetRetainSelection( bool bRet ) { m_bRetainSelection = bRet; }
// change current data base and notify
void ChgDBData(const SwDBData& SwDBData);
SW_DLLPUBLIC void ChgDBData(const SwDBData& SwDBData);
// delete
void DelToEndOfLine();
void DelToStartOfLine();
void DelLine();
bool DelLeft();
SW_DLLPUBLIC void DelToStartOfLine();
SW_DLLPUBLIC void DelLine();
SW_DLLPUBLIC bool DelLeft();
// also deletes the frame or sets the cursor in the frame when bDelFrame == false
bool DelRight(bool isReplaceHeuristic = false);
SW_DLLPUBLIC bool DelRight(bool isReplaceHeuristic = false);
void DelToEndOfPara();
void DelToStartOfPara();
bool DelToEndOfSentence();
SW_DLLPUBLIC bool DelToEndOfSentence();
void DelToStartOfSentence();
void DelNxtWord();
void DelPrvWord();
@ -309,25 +309,25 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
int IntelligentCut(SelectionType nSelectionType, bool bCut = true);
// edit
bool InsertField2(SwField const &, SwPaM* pAnnotationRange = nullptr);
void Insert(const OUString &);
SW_DLLPUBLIC bool InsertField2(SwField const &, SwPaM* pAnnotationRange = nullptr);
SW_DLLPUBLIC void Insert(const OUString &);
// graphic
void InsertGraphic( const OUString &rPath, const OUString &rFilter,
const Graphic &, SwFlyFrameAttrMgr * = nullptr,
RndStdIds nAnchorType = RndStdIds::FLY_AT_PARA);
void InsertByWord( const OUString & );
void InsertPageBreak(const OUString *pPageDesc = nullptr, const ::std::optional<sal_uInt16>& rPgNum = std::nullopt);
void InsertLineBreak(std::optional<SwLineBreakClear> oClear = std::nullopt);
SW_DLLPUBLIC void InsertPageBreak(const OUString *pPageDesc = nullptr, const ::std::optional<sal_uInt16>& rPgNum = std::nullopt);
SW_DLLPUBLIC void InsertLineBreak(std::optional<SwLineBreakClear> oClear = std::nullopt);
void InsertColumnBreak();
void InsertContentControl(SwContentControlType eType);
void InsertFootnote(const OUString &, bool bEndNote = false, bool bEdit = true );
void SplitNode( bool bAutoFormat = false );
SW_DLLPUBLIC void InsertContentControl(SwContentControlType eType);
SW_DLLPUBLIC void InsertFootnote(const OUString &, bool bEndNote = false, bool bEdit = true );
SW_DLLPUBLIC void SplitNode( bool bAutoFormat = false );
bool CanInsert();
// indexes
void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr);
void UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr);
SW_DLLPUBLIC void UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr);
// numbering and bullets
/**
@ -339,16 +339,16 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
void NumOrBulletOn(bool bNum); // #i29560#
void NumOrBulletOff(); // #i29560#
void NumOn();
void BulletOn();
SW_DLLPUBLIC void BulletOn();
//OLE
void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard
SW_DLLPUBLIC void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard
const svt::EmbeddedObjectRef&,
SvGlobalName const *pName, // != 0 create object accordingly
sal_uInt16 nSlotId = 0); // SlotId for dialog
bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = nullptr );
void LaunchOLEObj(sal_Int32 nVerb = css::embed::EmbedVerbs::MS_OLEVERB_PRIMARY); // start server
SW_DLLPUBLIC void LaunchOLEObj(sal_Int32 nVerb = css::embed::EmbedVerbs::MS_OLEVERB_PRIMARY); // start server
virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) override;
virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
const SwRect *pFlyPrtRect = nullptr,
@ -364,15 +364,15 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
GETSTYLE_CREATESOME, // if on PoolId create mapt
GETSTYLE_CREATEANY }; // return standard if applicable
SwTextFormatColl* GetParaStyle(const OUString &rCollName,
SW_DLLPUBLIC SwTextFormatColl* GetParaStyle(const OUString &rCollName,
GetStyle eCreate = GETSTYLE_NOCREATE);
SwCharFormat* GetCharStyle(const OUString &rFormatName,
SW_DLLPUBLIC SwCharFormat* GetCharStyle(const OUString &rFormatName,
GetStyle eCreate = GETSTYLE_NOCREATE);
SwFrameFormat* GetTableStyle(std::u16string_view rFormatName);
SW_DLLPUBLIC SwFrameFormat* GetTableStyle(std::u16string_view rFormatName);
void SetPageStyle(const OUString &rCollName);
OUString const & GetCurPageStyle() const;
SW_DLLPUBLIC OUString const & GetCurPageStyle() const;
// change current style using the attributes in effect
void QuickUpdateStyle();
@ -387,7 +387,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
void GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
// search and replace
sal_Int32 SearchPattern(const i18nutil::SearchOptions2& rSearchOpt,
SW_DLLPUBLIC sal_Int32 SearchPattern(const i18nutil::SearchOptions2& rSearchOpt,
bool bSearchInNotes,
SwDocPositions eStart, SwDocPositions eEnd,
FindRanges eFlags = FindRanges::InBody,
@ -405,7 +405,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
const i18nutil::SearchOptions2* pSearchOpt = nullptr,
const SfxItemSet* pReplaceSet = nullptr);
void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar );
SW_DLLPUBLIC void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar );
// action ahead of cursor movement
// resets selection if applicable, triggers timer and GCAttr()
@ -420,21 +420,21 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
virtual void DrawSelChanged( ) override;
// jump to bookmark and set the "selections-flags" correctly again
void GotoMark( const ::sw::mark::IMark* const pMark );
SW_DLLPUBLIC void GotoMark( const ::sw::mark::IMark* const pMark );
bool GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect );
void GotoMark( const OUString& rName );
SW_DLLPUBLIC void GotoMark( const OUString& rName );
bool GoNextBookmark(); // true when there still was one
bool GoPrevBookmark();
bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark, bool completeSelection = false);
bool GotoField( const SwFormatField& rField );
SW_DLLPUBLIC bool GotoField( const SwFormatField& rField );
/** @param bOnlyRefresh:
* false: run default actions (e.g. toggle checkbox, remove placeholder content)
* true: do not alter the content control, just refresh the doc model
*/
bool GotoContentControl(const SwFormatContentControl& rContentControl,
SW_DLLPUBLIC bool GotoContentControl(const SwFormatContentControl& rContentControl,
bool bOnlyRefresh = false);
// jump to the next / previous hyperlink - inside text and also
@ -463,8 +463,8 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
void NavigatorPaste(const NaviContentBookmark& rBkmk);
virtual void ApplyViewOptions( const SwViewOption &rOpt ) override;
virtual void SetReadonlyOption( bool bSet ) override;
SW_DLLPUBLIC virtual void ApplyViewOptions( const SwViewOption &rOpt ) override;
SW_DLLPUBLIC virtual void SetReadonlyOption( bool bSet ) override;
// automatic update of styles
void AutoUpdateFrame(SwFrameFormat* pFormat, const SfxItemSet& rStyleSet);
@ -486,7 +486,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
SwNavigationMgr& GetNavigationMgr() { return m_aNavigationMgr; }
void addCurrentPosition();
bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL,
SW_DLLPUBLIC bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL,
bool bSelFrame = true );
bool GotoINetAttr( const SwTextINetFormat& rAttr );
void GotoOutline( SwOutlineNodes::size_type nIdx );
@ -494,13 +494,13 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
bool GotoRegion( std::u16string_view rName );
bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
sal_uInt16 nSeqNo = 0, sal_uInt16 nFlags = 0 );
bool GotoNextTOXBase( const OUString* pName = nullptr);
bool GotoTable( const OUString& rName );
SW_DLLPUBLIC bool GotoNextTOXBase( const OUString* pName = nullptr);
SW_DLLPUBLIC bool GotoTable( const OUString& rName );
void GotoFormatField( const SwFormatField& rField );
const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool bSelect);
bool GotoDrawingObject(std::u16string_view rName);
void GotoFootnoteAnchor(const SwTextFootnote& rTextFootnote);
void ChangeHeaderOrFooter(std::u16string_view rStyleName, bool bHeader, bool bOn, bool bShowWarning);
SW_DLLPUBLIC void ChangeHeaderOrFooter(std::u16string_view rStyleName, bool bHeader, bool bOn, bool bShowWarning);
virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) override;
/// Inserts a new annotation/comment at the current cursor position / selection.
@ -523,8 +523,8 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
private:
SAL_DLLPRIVATE void OpenMark();
SAL_DLLPRIVATE void CloseMark( bool bOkFlag );
void OpenMark();
void CloseMark( bool bOkFlag );
struct ModeStack
{
@ -577,21 +577,21 @@ private:
Point m_aDest;
bool m_bDestOnStack = false;
bool HasCursorStack() const { return nullptr != m_pCursorStack; }
SAL_DLLPRIVATE bool PushCursor(SwTwips lOffset, bool bSelect);
SAL_DLLPRIVATE bool PopCursor(bool bUpdate, bool bSelect = false);
bool PushCursor(SwTwips lOffset, bool bSelect);
bool PopCursor(bool bUpdate, bool bSelect = false);
// take END cursor along when PageUp / -Down
SAL_DLLPRIVATE void SttWrd();
SAL_DLLPRIVATE void EndWrd();
SAL_DLLPRIVATE bool NxtWrd_();
SAL_DLLPRIVATE bool PrvWrd_();
void SttWrd();
void EndWrd();
bool NxtWrd_();
bool PrvWrd_();
// #i92468#
SAL_DLLPRIVATE bool NxtWrdForDelete();
SAL_DLLPRIVATE bool PrvWrdForDelete();
SAL_DLLPRIVATE bool FwdSentence_();
SAL_DLLPRIVATE bool BwdSentence_();
bool FwdPara_();
SAL_DLLPRIVATE bool BwdPara_();
bool NxtWrdForDelete();
bool PrvWrdForDelete();
bool FwdSentence_();
bool BwdSentence_();
SW_DLLPUBLIC bool FwdPara_();
bool BwdPara_();
// selections
bool m_bIns :1;
@ -610,34 +610,34 @@ private:
Link<SwWrtShell&,void> m_aSelTableLink;
// resets the cursor stack after movement by PageUp/-Down
SAL_DLLPRIVATE void ResetCursorStack_();
void ResetCursorStack_();
using SwCursorShell::SetCursor;
SAL_DLLPRIVATE tools::Long SetCursor(const Point *, bool bProp=false );
tools::Long SetCursor(const Point *, bool bProp=false );
SAL_DLLPRIVATE tools::Long SetCursorKillSel(const Point *, bool bProp );
tools::Long SetCursorKillSel(const Point *, bool bProp );
SAL_DLLPRIVATE void BeginDrag(const Point *, bool bProp );
SAL_DLLPRIVATE void DefaultDrag(const Point *, bool bProp );
SAL_DLLPRIVATE void DefaultEndDrag(const Point *, bool bProp );
void BeginDrag(const Point *, bool bProp );
void DefaultDrag(const Point *, bool bProp );
void DefaultEndDrag(const Point *, bool bProp );
SAL_DLLPRIVATE void ExtSelWrd(const Point *, bool bProp );
SAL_DLLPRIVATE void ExtSelLn(const Point *, bool bProp );
void ExtSelWrd(const Point *, bool bProp );
void ExtSelLn(const Point *, bool bProp );
SAL_DLLPRIVATE void BeginFrameDrag(const Point *, bool bProp );
void BeginFrameDrag(const Point *, bool bProp );
// after SSize/Move of a frame update; Point is destination.
SAL_DLLPRIVATE void UpdateLayoutFrame(const Point *, bool bProp );
void UpdateLayoutFrame(const Point *, bool bProp );
SAL_DLLPRIVATE void SttLeaveSelect();
SAL_DLLPRIVATE void AddLeaveSelect();
SAL_DLLPRIVATE tools::Long Ignore(const Point *, bool bProp );
void SttLeaveSelect();
void AddLeaveSelect();
tools::Long Ignore(const Point *, bool bProp );
SAL_DLLPRIVATE void LeaveExtSel() { m_bSelWrd = m_bSelLn = false;}
void LeaveExtSel() { m_bSelWrd = m_bSelLn = false;}
SAL_DLLPRIVATE bool GoStart(bool KeepArea, bool *,
bool GoStart(bool KeepArea, bool *,
bool bSelect, bool bDontMoveRegion = false);
SAL_DLLPRIVATE bool GoEnd(bool KeepArea = false, const bool * = nullptr);
bool GoEnd(bool KeepArea = false, const bool * = nullptr);
enum BookMarkMove
{
@ -646,7 +646,7 @@ private:
BOOKMARK_PREV
};
SAL_DLLPRIVATE bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=nullptr);
bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=nullptr);
};
inline void SwWrtShell::ResetCursorStack()

6
vcl/headless/CairoCommon.cxx
View File

@ -143,9 +143,9 @@ basegfx::B2DRange getClippedStrokeDamage(cairo_t* cr)
// for Chart-content visualization. CAUTION: It's not the same as PixelSnap (!)
// tdf#129845 add reply value to allow counting a point/byte/size measurement to
// be included
size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon,
const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap,
bool bPixelSnapHairline)
static size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon,
const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap,
bool bPixelSnapHairline)
{
// short circuit if there is nothing to do
const sal_uInt32 nPointCount(rPolygon.count());

26
vcl/inc/canvasbitmap.hxx
View File

@ -30,7 +30,7 @@
namespace vcl::unotools
{
class VCL_DLLPUBLIC VclCanvasBitmap final :
class VclCanvasBitmap final :
public cppu::WeakImplHelper< css::rendering::XIntegerReadOnlyBitmap,
css::rendering::XBitmapPalette,
css::rendering::XIntegerBitmapColorSpace >
@ -55,7 +55,7 @@ namespace vcl::unotools
sal_Int32 m_nIndexIndex;
bool m_bPalette;
SAL_DLLPRIVATE void setComponentInfo( sal_uInt32 redShift, sal_uInt32 greenShift, sal_uInt32 blueShift );
void setComponentInfo( sal_uInt32 redShift, sal_uInt32 greenShift, sal_uInt32 blueShift );
BitmapScopedReadAccess& getBitmapReadAccess();
BitmapScopedReadAccess& getAlphaReadAccess();
@ -63,15 +63,15 @@ namespace vcl::unotools
public:
// XBitmap
virtual css::geometry::IntegerSize2D SAL_CALL getSize() override;
virtual sal_Bool SAL_CALL hasAlpha( ) override;
virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) override;
VCL_DLLPUBLIC virtual css::geometry::IntegerSize2D SAL_CALL getSize() override;
VCL_DLLPUBLIC virtual sal_Bool SAL_CALL hasAlpha( ) override;
VCL_DLLPUBLIC virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) override;
// XIntegerReadOnlyBitmap
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override;
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override;
VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override;
VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override;
/// @throws css::uno::RuntimeException
css::uno::Reference< css::rendering::XBitmapPalette > getPalette( );
VCL_DLLPUBLIC css::uno::Reference< css::rendering::XBitmapPalette > getPalette( );
virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) override;
// XBitmapPalette
@ -97,11 +97,11 @@ namespace vcl::unotools
virtual ::sal_Int8 SAL_CALL getEndianness( ) override;
virtual css::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) override;
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override;
virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
VCL_DLLPUBLIC virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
VCL_DLLPUBLIC virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override;
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override;
VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
/** Create API wrapper for given BitmapEx
@ -110,7 +110,7 @@ namespace vcl::unotools
Bitmap to wrap. As usual, changes to the original bitmap
are not reflected in this object (copy on write).
*/
explicit VclCanvasBitmap( const BitmapEx& rBitmap );
VCL_DLLPUBLIC explicit VclCanvasBitmap( const BitmapEx& rBitmap );
/// Retrieve contained bitmap. Call me with locked Solar mutex!
const BitmapEx& getBitmapEx() const { return m_aBmpEx; }

4
vcl/inc/headless/CairoCommon.hxx
View File

@ -85,10 +85,6 @@ public:
virtual sal_Int64 estimateUsageInBytes() const override;
};
VCL_DLLPUBLIC size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon,
const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap,
bool bPixelSnapHairline);
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PixelSnapper
{
public:

6
vcl/inc/headless/SvpGraphicsBackend.hxx
View File

@ -27,7 +27,7 @@
#include <headless/CairoCommon.hxx>
class VCL_DLLPUBLIC SvpGraphicsBackend final : public SalGraphicsImpl
class SvpGraphicsBackend final : public SalGraphicsImpl
{
CairoCommon& m_rCairoCommon;
@ -132,8 +132,8 @@ public:
bool supportsOperation(OutDevSupportType eType) const override;
void drawBitmapBuffer(const SalTwoRect& rPosAry, const BitmapBuffer* pBuffer,
cairo_operator_t eOp);
void VCL_DLLPUBLIC drawBitmapBuffer(const SalTwoRect& rPosAry, const BitmapBuffer* pBuffer,
cairo_operator_t eOp);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
vcl/inc/impgraph.hxx
View File

@ -56,7 +56,7 @@ enum class GraphicContentType : sal_Int32
Vector
};
class VCL_DLLPUBLIC ImpGraphic final
class ImpGraphic final
{
friend class Graphic;
friend class GraphicID;
@ -215,9 +215,9 @@ private:
public:
void resetChecksum() { mnChecksum = 0; }
bool swapIn();
bool swapOut();
VCL_DLLPUBLIC bool swapOut();
bool isSwappedOut() const { return mbSwapOut; }
SvStream* getSwapFileStream() const;
VCL_DLLPUBLIC SvStream* getSwapFileStream() const;
// public only because of use in GraphicFilter
void updateFromLoadedGraphic(const ImpGraphic* graphic);
void dumpState(rtl::OStringBuffer &rState);

7
vcl/source/accessibility/AccessibleTextAttributeHelper.cxx
View File

@ -241,7 +241,7 @@ OUString lcl_ConvertParagraphAdjust(css::style::ParagraphAdjust eParaAdjust)
}
}
OUString AccessibleTextAttributeHelper::ConvertUnoToIAccessible2TextAttributes(
static OUString ConvertUnoToIAccessible2TextAttributes(
const css::uno::Sequence<css::beans::PropertyValue>& rUnoAttributes,
IA2AttributeType eAttributeType)
{
@ -336,8 +336,9 @@ OUString AccessibleTextAttributeHelper::ConvertUnoToIAccessible2TextAttributes(
}
OUString AccessibleTextAttributeHelper::GetIAccessible2TextAttributes(
css::uno::Reference<css::accessibility::XAccessibleText> xText, IA2AttributeType eAttributeType,
sal_Int32 nOffset, sal_Int32& rStartOffset, sal_Int32& rEndOffset)
const css::uno::Reference<css::accessibility::XAccessibleText>& xText,
IA2AttributeType eAttributeType, sal_Int32 nOffset, sal_Int32& rStartOffset,
sal_Int32& rEndOffset)
{
assert(xText.is());

4
xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
View File

@ -33,7 +33,7 @@
#include <libxml/tree.h>
class XSECXMLSEC_DLLPUBLIC XMLDocumentWrapper_XmlSecImpl final : public cppu::WeakImplHelper
class XMLDocumentWrapper_XmlSecImpl final : public cppu::WeakImplHelper
<
css::xml::wrapper::XXMLDocumentWrapper,
css::xml::sax::XDocumentHandler,
@ -116,7 +116,7 @@ private:
void rebuildIDLink( xmlNodePtr pNode ) const;
public:
XMLDocumentWrapper_XmlSecImpl();
XSECXMLSEC_DLLPUBLIC XMLDocumentWrapper_XmlSecImpl();
virtual ~XMLDocumentWrapper_XmlSecImpl() override;
/* css::xml::wrapper::XXMLDocumentWrapper */

4
xmlsecurity/inc/xmlsignaturehelper.hxx
View File

@ -60,7 +60,7 @@ namespace com::sun::star::xml::sax { class XWriter; }
**********************************************************/
class XMLSECURITY_DLLPUBLIC XMLSignatureHelper
class XMLSignatureHelper
{
private:
css::uno::Reference< css::uno::XComponentContext > mxCtx;
@ -83,7 +83,7 @@ public:
// Set the storage which should be used by the default UriBinding
// Must be set before StartMission().
//sODFVersion indicates the ODF version
void SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStorage, std::u16string_view sODFVersion );
XMLSECURITY_DLLPUBLIC void SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStorage, std::u16string_view sODFVersion );
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
// Return 1 to verify, 0 to skip.