Remove SC_DLLPRIVATE -> SAL_DLLPRIVATE indirection
Change-Id: I1360a96ebe33bd6d70ac7728844c4ba1137e51ab
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 9c12752..6b5e322 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -269,8 +269,8 @@ private:
ScAutoFormatDataField** ppDataField;
SC_DLLPRIVATE ScAutoFormatDataField& GetField( sal_uInt16 nIndex );
SC_DLLPRIVATE const ScAutoFormatDataField& GetField( sal_uInt16 nIndex ) const;
SAL_DLLPRIVATE ScAutoFormatDataField& GetField( sal_uInt16 nIndex );
SAL_DLLPRIVATE const ScAutoFormatDataField& GetField( sal_uInt16 nIndex ) const;
public:
ScAutoFormatData();
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 05a063d..39cdd7b 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -104,11 +104,11 @@ private:
bool bSettingsChanged:1;
bool mbEnableGetPivotData:1;
SC_DLLPRIVATE ScDPTableData* GetTableData();
SC_DLLPRIVATE void CreateObjects();
SC_DLLPRIVATE void CreateOutput();
SC_DLLPRIVATE void ClearSource();
SC_DLLPRIVATE bool FillLabelDataForDimension(
SAL_DLLPRIVATE ScDPTableData* GetTableData();
SAL_DLLPRIVATE void CreateObjects();
SAL_DLLPRIVATE void CreateOutput();
SAL_DLLPRIVATE void ClearSource();
SAL_DLLPRIVATE bool FillLabelDataForDimension(
const com::sun::star::uno::Reference<
com::sun::star::container::XIndexAccess>& xDims,
sal_Int32 nDim, ScDPLabelData& rLabelData);
diff --git a/sc/inc/scdllapi.h b/sc/inc/scdllapi.h
index a768b79..bbd6e49 100644
--- a/sc/inc/scdllapi.h
+++ b/sc/inc/scdllapi.h
@@ -27,7 +27,6 @@
#else
#define SC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define SC_DLLPRIVATE SAL_DLLPRIVATE
#endif /* INCLUDED_SCDLLAPI_H */
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 23c6819..15637f3 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -42,7 +42,7 @@ private:
SubStringsType maSubStrings;
OUString aStr;
SC_DLLPRIVATE void InitTokens();
SAL_DLLPRIVATE void InitTokens();
public:
ScUserListData(const OUString& rStr);
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 775522b..1db19c4 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -78,31 +78,31 @@ private:
const OUString aStrSum;
SvNumberFormatter* pNumFmt;
//-------------------------------------------
SC_DLLPRIVATE void Init ();
SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect );
SC_DLLPRIVATE void CalcCellArray ( bool bFitWidth );
SC_DLLPRIVATE void CalcLineMap ();
SC_DLLPRIVATE void PaintCells ();
SAL_DLLPRIVATE void Init ();
SAL_DLLPRIVATE void DoPaint ( const Rectangle& rRect );
SAL_DLLPRIVATE void CalcCellArray ( bool bFitWidth );
SAL_DLLPRIVATE void CalcLineMap ();
SAL_DLLPRIVATE void PaintCells ();
/* Usage of type size_t instead of SCCOL/SCROW is correct here - used in
conjunction with class svx::frame::Array (svx/framelinkarray.hxx), which
expects size_t coordinates. */
SC_DLLPRIVATE sal_uInt16 GetFormatIndex( size_t nCol, size_t nRow ) const;
SC_DLLPRIVATE const SvxBoxItem& GetBoxItem( size_t nCol, size_t nRow ) const;
SC_DLLPRIVATE const SvxLineItem& GetDiagItem( size_t nCol, size_t nRow, bool bTLBR ) const;
SAL_DLLPRIVATE sal_uInt16 GetFormatIndex( size_t nCol, size_t nRow ) const;
SAL_DLLPRIVATE const SvxBoxItem& GetBoxItem( size_t nCol, size_t nRow ) const;
SAL_DLLPRIVATE const SvxLineItem& GetDiagItem( size_t nCol, size_t nRow, bool bTLBR ) const;
SC_DLLPRIVATE void DrawString( size_t nCol, size_t nRow );
SC_DLLPRIVATE void DrawStrings();
SC_DLLPRIVATE void DrawBackground();
SAL_DLLPRIVATE void DrawString( size_t nCol, size_t nRow );
SAL_DLLPRIVATE void DrawStrings();
SAL_DLLPRIVATE void DrawBackground();
SC_DLLPRIVATE void MakeFonts ( sal_uInt16 nIndex,
SAL_DLLPRIVATE void MakeFonts ( sal_uInt16 nIndex,
Font& rFont,
Font& rCJKFont,
Font& rCTLFont );
SC_DLLPRIVATE OUString MakeNumberString( OUString cellString, sal_Bool bAddDec );
SC_DLLPRIVATE void DrawFrameLine ( const ::editeng::SvxBorderLine& rLineD,
SAL_DLLPRIVATE OUString MakeNumberString( OUString cellString, sal_Bool bAddDec );
SAL_DLLPRIVATE void DrawFrameLine ( const ::editeng::SvxBorderLine& rLineD,
Point from,
Point to,
sal_Bool bHorizontal,
@@ -112,10 +112,10 @@ private:
const ::editeng::SvxBorderLine& rLineRT,
const ::editeng::SvxBorderLine& rLineR,
const ::editeng::SvxBorderLine& rLineRB );
SC_DLLPRIVATE void CheckPriority ( sal_uInt16 nCurLine,
SAL_DLLPRIVATE void CheckPriority ( sal_uInt16 nCurLine,
AutoFmtLine eLine,
::editeng::SvxBorderLine& rLine );
SC_DLLPRIVATE void GetLines ( sal_uInt16 nIndex, AutoFmtLine eLine,
SAL_DLLPRIVATE void GetLines ( sal_uInt16 nIndex, AutoFmtLine eLine,
::editeng::SvxBorderLine& rLineD,
::editeng::SvxBorderLine& rLineLT,
::editeng::SvxBorderLine& rLineL,
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index 0e2b4eb..769d274 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -147,11 +147,11 @@ public:
private:
/** Reads colors from system settings. */
SC_DLLPRIVATE void InitColors();
SAL_DLLPRIVATE void InitColors();
/** Initializes all font settings. */
SC_DLLPRIVATE void InitFonts();
SAL_DLLPRIVATE void InitFonts();
/** Initializes all data dependent from the control's size. */
SC_DLLPRIVATE void InitSizeData();
SAL_DLLPRIVATE void InitSizeData();
// split handling ---------------------------------------------------------
public:
@@ -168,11 +168,11 @@ public:
private:
/** Inserts a split and adjusts column data. */
SC_DLLPRIVATE bool ImplInsertSplit( sal_Int32 nPos );
SAL_DLLPRIVATE bool ImplInsertSplit( sal_Int32 nPos );
/** Removes a split and adjusts column data. */
SC_DLLPRIVATE bool ImplRemoveSplit( sal_Int32 nPos );
SAL_DLLPRIVATE bool ImplRemoveSplit( sal_Int32 nPos );
/** Clears the split array and re-inserts boundary splits. */
SC_DLLPRIVATE void ImplClearSplits();
SAL_DLLPRIVATE void ImplClearSplits();
// columns/column types ---------------------------------------------------
public:
@@ -220,14 +220,14 @@ public:
private:
/** Returns the data type of the specified column. */
SC_DLLPRIVATE sal_Int32 GetColumnType( sal_uInt32 nColIndex ) const;
SAL_DLLPRIVATE sal_Int32 GetColumnType( sal_uInt32 nColIndex ) const;
/** Returns the data type of the specified column. */
SC_DLLPRIVATE void SetColumnType( sal_uInt32 nColIndex, sal_Int32 nColType );
SAL_DLLPRIVATE void SetColumnType( sal_uInt32 nColIndex, sal_Int32 nColType );
/** Scrolls data grid vertically. */
SC_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir );
SAL_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir );
/** Executes the data type popup menu. */
SC_DLLPRIVATE void ExecutePopup( const Point& rPos );
SAL_DLLPRIVATE void ExecutePopup( const Point& rPos );
// selection handling -----------------------------------------------------
public:
@@ -254,15 +254,15 @@ public:
private:
/** Moves column cursor to a new position. */
SC_DLLPRIVATE void MoveCursor( sal_uInt32 nColIndex );
SAL_DLLPRIVATE void MoveCursor( sal_uInt32 nColIndex );
/** Moves column cursor to the given direction. */
SC_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir );
SAL_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir );
/** Clears the entire selection without notify. */
SC_DLLPRIVATE void ImplClearSelection();
SAL_DLLPRIVATE void ImplClearSelection();
/** Executes selection action for a specific column. */
SC_DLLPRIVATE void DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier );
SAL_DLLPRIVATE void DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier );
// cell contents ----------------------------------------------------------
public:
@@ -308,37 +308,37 @@ private:
inline sal_Int32 GetHeight() const { return maWinSize.Height(); }
/** Sets a clip region in the specified output device for the specified column. */
SC_DLLPRIVATE void ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
SAL_DLLPRIVATE void ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
/** Draws the header of the specified column to the specified output device. */
SC_DLLPRIVATE void ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor );
SAL_DLLPRIVATE void ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor );
/** Draws the text at the specified position to maBackgrDev. */
SC_DLLPRIVATE void ImplDrawCellText( const Point& rPos, const OUString& rText );
SAL_DLLPRIVATE void ImplDrawCellText( const Point& rPos, const OUString& rText );
/** Draws the "first imported line" separator to maBackgrDev (or erases, if bSet is false). */
SC_DLLPRIVATE void ImplDrawFirstLineSep( bool bSet );
SAL_DLLPRIVATE void ImplDrawFirstLineSep( bool bSet );
/** Draws the column with index nColIndex to maBackgrDev. */
SC_DLLPRIVATE void ImplDrawColumnBackgr( sal_uInt32 nColIndex );
SAL_DLLPRIVATE void ImplDrawColumnBackgr( sal_uInt32 nColIndex );
/** Draws the row headers column to maBackgrDev. */
SC_DLLPRIVATE void ImplDrawRowHeaders();
SAL_DLLPRIVATE void ImplDrawRowHeaders();
/** Draws all columns and the row headers column to maBackgrDev. */
SC_DLLPRIVATE void ImplDrawBackgrDev();
SAL_DLLPRIVATE void ImplDrawBackgrDev();
/** Draws the column with index nColIndex with its selection state to maGridDev. */
SC_DLLPRIVATE void ImplDrawColumnSelection( sal_uInt32 nColIndex );
SAL_DLLPRIVATE void ImplDrawColumnSelection( sal_uInt32 nColIndex );
/** Draws all columns with selection and cursor to maGridDev. */
SC_DLLPRIVATE void ImplDrawGridDev();
SAL_DLLPRIVATE void ImplDrawGridDev();
/** Redraws the entire column (background and selection). */
SC_DLLPRIVATE void ImplDrawColumn( sal_uInt32 nColIndex );
SAL_DLLPRIVATE void ImplDrawColumn( sal_uInt32 nColIndex );
/** Optimized drawing: Scrolls horizontally and redraws only missing parts. */
SC_DLLPRIVATE void ImplDrawHorzScrolled( sal_Int32 nOldPos );
SAL_DLLPRIVATE void ImplDrawHorzScrolled( sal_Int32 nOldPos );
/** Inverts the cursor bar at the specified position in maGridDev. */
SC_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos );
SAL_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos );
/** Draws directly tracking rectangle to the column with the specified index. */
SC_DLLPRIVATE void ImplDrawTrackingRect( sal_uInt32 nColIndex );
SAL_DLLPRIVATE void ImplDrawTrackingRect( sal_uInt32 nColIndex );
// accessibility ----------------------------------------------------------
protected:
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index dcd2faf..b7d7eb5 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -75,19 +75,19 @@ public:
private:
/** Reads colors from system settings. */
SC_DLLPRIVATE void InitColors();
SAL_DLLPRIVATE void InitColors();
/** Initializes all data dependent from the control's size. */
SC_DLLPRIVATE void InitSizeData();
SAL_DLLPRIVATE void InitSizeData();
/** Moves cursor to a new position.
@param bScroll sal_True = The method may scroll the ruler. */
SC_DLLPRIVATE void MoveCursor( sal_Int32 nPos, bool bScroll = true );
SAL_DLLPRIVATE void MoveCursor( sal_Int32 nPos, bool bScroll = true );
/** Moves cursor to the given direction. */
SC_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir );
SAL_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir );
/** Sets cursor to an existing split, according to eDir. */
SC_DLLPRIVATE void MoveCursorToSplit( ScMoveMode eDir );
SAL_DLLPRIVATE void MoveCursorToSplit( ScMoveMode eDir );
/** Scrolls data grid vertically. */
SC_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir );
SAL_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir );
// split handling ---------------------------------------------------------
public:
@@ -115,12 +115,12 @@ public:
private:
/** Finds next position without a split. */
SC_DLLPRIVATE sal_Int32 FindEmptyPos( sal_Int32 nPos, ScMoveMode eDir ) const;
SAL_DLLPRIVATE sal_Int32 FindEmptyPos( sal_Int32 nPos, ScMoveMode eDir ) const;
/** Moves split and cursor to nNewPos and commits event. */
SC_DLLPRIVATE void MoveCurrSplit( sal_Int32 nNewPos );
SAL_DLLPRIVATE void MoveCurrSplit( sal_Int32 nNewPos );
/** Moves split and cursor to the given direction and commits event. */
SC_DLLPRIVATE void MoveCurrSplitRel( ScMoveMode eDir );
SAL_DLLPRIVATE void MoveCurrSplitRel( ScMoveMode eDir );
// event handling ---------------------------------------------------------
protected:
@@ -137,12 +137,12 @@ protected:
private:
/** Starts tracking at the specified position. */
SC_DLLPRIVATE void StartMouseTracking( sal_Int32 nPos );
SAL_DLLPRIVATE void StartMouseTracking( sal_Int32 nPos );
/** Moves tracking to a new position. */
SC_DLLPRIVATE void MoveMouseTracking( sal_Int32 nPos );
SAL_DLLPRIVATE void MoveMouseTracking( sal_Int32 nPos );
/** Applies tracking action for the current tracking position.
@param bApply sal_True = apply action, sal_False = cancel action. */
SC_DLLPRIVATE void EndMouseTracking( bool bApply );
SAL_DLLPRIVATE void EndMouseTracking( bool bApply );
// painting ---------------------------------------------------------------
protected:
@@ -159,24 +159,24 @@ private:
inline sal_Int32 GetHeight() const { return maWinSize.Height(); }
/** Draws the background and active area to maBackgrDev (only the given X range). */
SC_DLLPRIVATE void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth );
SAL_DLLPRIVATE void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth );
/** Draws the entire ruler background with scaling to maBackgrDev. */
SC_DLLPRIVATE void ImplDrawBackgrDev();
SAL_DLLPRIVATE void ImplDrawBackgrDev();
/** Draws a split to maRulerDev. */
SC_DLLPRIVATE void ImplDrawSplit( sal_Int32 nPos );
SAL_DLLPRIVATE void ImplDrawSplit( sal_Int32 nPos );
/** Erases a split from maRulerDev. */
SC_DLLPRIVATE void ImplEraseSplit( sal_Int32 nPos );
SAL_DLLPRIVATE void ImplEraseSplit( sal_Int32 nPos );
/** Draws the ruler background, all splits and the cursor to maRulerDev. */
SC_DLLPRIVATE void ImplDrawRulerDev();
SAL_DLLPRIVATE void ImplDrawRulerDev();
/** Inverts the cursor bar at the specified position in maRulerDev. */
SC_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos );
SAL_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos );
/** Draws directly tracking rectangle to the column with the specified index. */
SC_DLLPRIVATE void ImplDrawTrackingRect();
SAL_DLLPRIVATE void ImplDrawTrackingRect();
/** Sets arrow or horizontal split pointer. */
SC_DLLPRIVATE void ImplSetMousePointer( sal_Int32 nPos );
SAL_DLLPRIVATE void ImplSetMousePointer( sal_Int32 nPos );
// accessibility ----------------------------------------------------------
protected:
diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 14661e4..3fb5db7 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -80,20 +80,20 @@ public:
private:
/** Initializes the children controls (pos/size, scroll bars, ...). */
SC_DLLPRIVATE void InitControls();
SAL_DLLPRIVATE void InitControls();
/** Initializes size and position data of horizontal scrollbar. */
SC_DLLPRIVATE void InitHScrollBar();
SAL_DLLPRIVATE void InitHScrollBar();
/** Initializes size and position data of vertical scrollbar. */
SC_DLLPRIVATE void InitVScrollBar();
SAL_DLLPRIVATE void InitVScrollBar();
/** Calculates and sets valid position offset nearest to nPos. */
SC_DLLPRIVATE inline void ImplSetPosOffset( sal_Int32 nPos )
SAL_DLLPRIVATE inline void ImplSetPosOffset( sal_Int32 nPos )
{ maData.mnPosOffset = std::max( std::min( nPos, GetMaxPosOffset() ), sal_Int32( 0 ) ); }
/** Calculates and sets valid line offset nearest to nLine. */
SC_DLLPRIVATE inline void ImplSetLineOffset( sal_Int32 nLine )
SAL_DLLPRIVATE inline void ImplSetLineOffset( sal_Int32 nLine )
{ maData.mnLineOffset = std::max( std::min( nLine, GetMaxLineOffset() ), sal_Int32( 0 ) ); }
/** Moves controls (not cursors!) so that nPos becomes visible. */
SC_DLLPRIVATE void MakePosVisible( sal_Int32 nPos );
SAL_DLLPRIVATE void MakePosVisible( sal_Int32 nPos );
// cell contents ----------------------------------------------------------
public:
@@ -129,9 +129,9 @@ protected:
virtual Size GetOptimalSize() const;
private:
SC_DLLPRIVATE DECL_LINK( CsvCmdHdl, ScCsvControl* );
SC_DLLPRIVATE DECL_LINK( ScrollHdl, ScrollBar* );
SC_DLLPRIVATE DECL_LINK( ScrollEndHdl, ScrollBar* );
SAL_DLLPRIVATE DECL_LINK( CsvCmdHdl, ScCsvControl* );
SAL_DLLPRIVATE DECL_LINK( ScrollHdl, ScrollBar* );
SAL_DLLPRIVATE DECL_LINK( ScrollEndHdl, ScrollBar* );
// accessibility ----------------------------------------------------------
public:
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 5072f56..28fe4c7 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -119,10 +119,10 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
ScCollaboration* mpCollaboration;
#endif
SC_DLLPRIVATE void InitItems();
SC_DLLPRIVATE void DoEnterHandler();
SC_DLLPRIVATE void InitOptions(bool bForLoading);
SC_DLLPRIVATE void ResetDrawObjectShell();
SAL_DLLPRIVATE void InitItems();
SAL_DLLPRIVATE void DoEnterHandler();
SAL_DLLPRIVATE void InitOptions(bool bForLoading);
SAL_DLLPRIVATE void ResetDrawObjectShell();
// SUNWS needs a forward declared friend, otherwise types and members
// of the outer class are not accessible.
@@ -139,32 +139,32 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
ScDocShell & mrDocShell;
};
SC_DLLPRIVATE sal_Bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
SC_DLLPRIVATE sal_Bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
SC_DLLPRIVATE SCTAB GetSaveTab();
SAL_DLLPRIVATE sal_Bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
SAL_DLLPRIVATE sal_Bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
SAL_DLLPRIVATE SCTAB GetSaveTab();
SC_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
SAL_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
SC_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
SAL_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
SC_DLLPRIVATE sal_uLong DBaseExport(
SAL_DLLPRIVATE sal_uLong DBaseExport(
const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo );
SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL );
SC_DLLPRIVATE static bool IsDocument( const INetURLObject& rURL );
SAL_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
SAL_DLLPRIVATE static bool KillFile( const INetURLObject& rURL );
SAL_DLLPRIVATE static bool IsDocument( const INetURLObject& rURL );
SC_DLLPRIVATE void LockPaint_Impl(sal_Bool bDoc);
SC_DLLPRIVATE void UnlockPaint_Impl(sal_Bool bDoc);
SC_DLLPRIVATE void LockDocument_Impl(sal_uInt16 nNew);
SC_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew);
SAL_DLLPRIVATE void LockPaint_Impl(sal_Bool bDoc);
SAL_DLLPRIVATE void UnlockPaint_Impl(sal_Bool bDoc);
SAL_DLLPRIVATE void LockDocument_Impl(sal_uInt16 nNew);
SAL_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew);
SC_DLLPRIVATE void EnableSharedSettings( bool bEnable );
SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
SAL_DLLPRIVATE void EnableSharedSettings( bool bEnable );
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
SC_DLLPRIVATE void UseSheetSaveEntries();
SAL_DLLPRIVATE void UseSheetSaveEntries();
SC_DLLPRIVATE ScDocFunc *CreateDocFunc();
SAL_DLLPRIVATE ScDocFunc *CreateDocFunc();
protected:
@@ -185,7 +185,7 @@ public:
using SfxShell::Deactivate; // with sal_Bool bMDI
#if ENABLE_TELEPATHY
SC_DLLPRIVATE ScCollaboration* GetCollaboration();
SAL_DLLPRIVATE ScCollaboration* GetCollaboration();
#endif
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index af07769..c4e523c 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -109,7 +109,7 @@ private:
sal_uInt16 nSelected;
OString aSelectedIdent;
SC_DLLPRIVATE DECL_LINK( TimerHdl, void*);
SAL_DLLPRIVATE DECL_LINK( TimerHdl, void*);
protected:
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index c6c748a..64b92d5 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -216,15 +216,15 @@ private:
bool bPagebreak:1; // Page break preview mode
bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click
SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, void*);
SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*);
SAL_DLLPRIVATE DECL_LINK (EmptyEditHdl, void*);
SAL_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*);
SC_DLLPRIVATE void CalcPPT();
SC_DLLPRIVATE void CreateTabData( SCTAB nNewTab );
SC_DLLPRIVATE void CreateTabData( std::vector< SCTAB >& rvTabs );
SC_DLLPRIVATE void CreateSelectedTabData();
SC_DLLPRIVATE void EnsureTabDataSize(size_t nSize);
SC_DLLPRIVATE void UpdateCurrentTab();
SAL_DLLPRIVATE void CalcPPT();
SAL_DLLPRIVATE void CreateTabData( SCTAB nNewTab );
SAL_DLLPRIVATE void CreateTabData( std::vector< SCTAB >& rvTabs );
SAL_DLLPRIVATE void CreateSelectedTabData();
SAL_DLLPRIVATE void EnsureTabDataSize(size_t nSize);
SAL_DLLPRIVATE void UpdateCurrentTab();
public:
ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh );
