summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basegfx/inc/basegfx/matrix/b3dhommatrix.hxx3
-rw-r--r--basegfx/source/matrix/b3dhommatrix.cxx5
-rw-r--r--svtools/inc/svtools/treelist.hxx3
-rw-r--r--svtools/source/contnr/imivctl.hxx10
-rw-r--r--svtools/source/contnr/imivctl1.cxx133
-rw-r--r--svtools/source/contnr/treelist.cxx25
-rw-r--r--svtools/source/dialogs/filedlg2.cxx25
-rw-r--r--svtools/source/dialogs/filedlg2.hxx2
-rw-r--r--tools/inc/tools/b3dtrans.hxx4
-rw-r--r--tools/inc/tools/config.hxx7
-rw-r--r--tools/inc/tools/fsys.hxx1
-rw-r--r--tools/source/fsys/tdir.cxx109
-rw-r--r--tools/source/generic/b3dtrans.cxx14
-rw-r--r--tools/source/generic/config.cxx64
-rw-r--r--vcl/inc/glyphcache.hxx1
-rw-r--r--vcl/inc/unx/sm.hxx2
-rw-r--r--vcl/source/glyphs/glyphcache.cxx19
-rw-r--r--vcl/unx/generic/app/sm.cxx14
18 files changed, 4 insertions, 437 deletions
diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
index a3eb8d311ec4..35b506f4022a 100644
--- a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
@@ -70,9 +70,6 @@ namespace basegfx
/// Calc the matrix determinant
double determinant() const;
- /// Transpose the matrix
- void transpose();
-
/// Rotation
void rotate(double fAngleX,double fAngleY,double fAngleZ);
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index 80a5024893b4..1c1952270e72 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -114,11 +114,6 @@ namespace basegfx
return mpImpl->doDeterminant();
}
- void B3DHomMatrix::transpose()
- {
- mpImpl->doTranspose();
- }
-
B3DHomMatrix& B3DHomMatrix::operator+=(const B3DHomMatrix& rMat)
{
mpImpl->doAddMatrix(*rMat.mpImpl);
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 8c78c990f56a..63545ed30cc1 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -289,6 +289,7 @@ class SVT_DLLPUBLIC SvTreeList
SvListEntry* LastSelected( const SvListView*) const;
sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True );
+ sal_uLong SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect );
void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl
sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
@@ -354,6 +355,7 @@ public:
sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
{ return Insert(pEntry, pRootItem, nRootPos ); }
+ void InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, sal_uLong nListPos );
// Entries muessen im gleichen Model stehen!
@@ -361,6 +363,7 @@ public:
// erzeugt ggf. Child-List
sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
+ void Copy( SvListEntry* pSource, SvListEntry* pTarget );
sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
sal_Bool Remove( SvListEntry* pEntry );
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 2d9f04241589..021f6577df17 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -483,7 +483,6 @@ public:
const Size& GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const;
void HideDDIcon();
- void ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos );
sal_Bool IsOver(
SvPtrarr* pSelectedRectList,
@@ -496,14 +495,6 @@ public:
SvPtrarr* pOtherRects = 0
);
- void CalcScrollOffsets(
- const Point& rRefPosPixel,
- long& rX,
- long& rY,
- sal_Bool bDragDrop = sal_False,
- sal_uInt16 nBorderWidth = 10
- );
-
sal_Bool IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos );
void MakeVisible(
const Rectangle& rDocPos,
@@ -531,7 +522,6 @@ public:
return aEntries[ nPos ];
}
SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( sal_uLong& ) const;
- SvxIconChoiceCtrlEntry* GetNextSelectedEntry( sal_uLong& ) const;
SvxIconChoiceCtrlEntry* GetHdlEntry() const { return pHdlEntry; }
void SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; }
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 625b04a0d7a2..56a15574e29b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2414,57 +2414,6 @@ void SvxIconChoiceCtrl_Impl::ImpHideDDIcon()
}
}
-
-void SvxIconChoiceCtrl_Impl::ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPosPix )
-{
- pView->Update();
- if( pRefEntry != pDDRefEntry )
- {
- DELETEZ(pDDDev);
- DELETEZ(pDDBufDev);
- }
- sal_Bool bSelected = pRefEntry->IsSelected();
- pRefEntry->ClearFlags( ICNVIEW_FLAG_SELECTED );
- if( !pDDDev )
- {
- if( pDDBufDev )
- {
- // nicht bei jedem Move ein Device anlegen, da dies besonders
- // auf Remote-Clients zu langsam ist
- pDDDev = pDDBufDev;
- pDDBufDev = 0;
- }
- else
- {
- pDDDev = new VirtualDevice( *pView );
- pDDDev->SetFont( pView->GetFont() );
- }
- }
- else
- {
- ImpHideDDIcon();
- }
- const Rectangle& rRect = GetEntryBoundRect( pRefEntry );
- pDDDev->SetOutputSizePixel( rRect.GetSize() );
-
- Point aPos( rPosPix );
- ToDocPos( aPos );
-
- Size aSize( pDDDev->GetOutputSizePixel() );
- pDDRefEntry = pRefEntry;
- aDDLastEntryPos = aPos;
- aDDLastRectPos = aPos;
-
- // Hintergrund sichern
- pDDDev->DrawOutDev( Point(), aSize, aPos, aSize, *pView );
- // Icon in pView malen
- pRefEntry->SetFlags( ICNVIEW_FLAG_BLOCK_EMPHASIS );
- PaintEntry( pRefEntry, aPos );
- pRefEntry->ClearFlags( ICNVIEW_FLAG_BLOCK_EMPHASIS );
- if( bSelected )
- pRefEntry->SetFlags( ICNVIEW_FLAG_SELECTED );
-}
-
sal_Bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
{
Rectangle aDocRect( GetDocumentRect() );
@@ -3125,51 +3074,6 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList()
aSelectedRectList.Remove( 0, aSelectedRectList.Count() );
}
-void SvxIconChoiceCtrl_Impl::CalcScrollOffsets( const Point& rPosPixel,
- long& rX, long& rY, sal_Bool isInDragDrop, sal_uInt16 nBorderWidth)
-{
- // Scrolling der View, falls sich der Mauszeiger im Grenzbereich des
- // Fensters befindet
- long nPixelToScrollX = 0;
- long nPixelToScrollY = 0;
- Size aWndSize = aOutputSize;
-
- nBorderWidth = (sal_uInt16)(Min( (long)(aWndSize.Height()-1), (long)nBorderWidth ));
- nBorderWidth = (sal_uInt16)(Min( (long)(aWndSize.Width()-1), (long)nBorderWidth ));
-
- if ( rPosPixel.X() < nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollX = -DD_SCROLL_PIXEL;
- else
- nPixelToScrollX = rPosPixel.X()- nBorderWidth;
- }
- else if ( rPosPixel.X() > aWndSize.Width() - nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollX = DD_SCROLL_PIXEL;
- else
- nPixelToScrollX = rPosPixel.X() - (aWndSize.Width() - nBorderWidth);
- }
- if ( rPosPixel.Y() < nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollY = -DD_SCROLL_PIXEL;
- else
- nPixelToScrollY = rPosPixel.Y() - nBorderWidth;
- }
- else if ( rPosPixel.Y() > aWndSize.Height() - nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollY = DD_SCROLL_PIXEL;
- else
- nPixelToScrollY = rPosPixel.Y() - (aWndSize.Height() - nBorderWidth);
- }
-
- rX = nPixelToScrollX;
- rY = nPixelToScrollY;
-}
-
IMPL_LINK(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, void*, EMPTYARG )
{
aAutoArrangeTimer.Stop();
@@ -3548,43 +3452,6 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( sal_uLong
return 0;
}
-// kein Round Robin!
-SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetNextSelectedEntry( sal_uLong& rStartPos ) const
-{
- size_t nCount = aEntries.size();
- if( rStartPos > nCount || !GetSelectionCount() )
- return 0;
- if( !pHead )
- {
- for( size_t nCur = rStartPos+1; nCur < nCount; nCur++ )
- {
- SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
- if( pEntry->IsSelected() )
- {
- rStartPos = nCur;
- return pEntry;
- }
- }
- }
- else
- {
- SvxIconChoiceCtrlEntry* pEntry = aEntries[ rStartPos ];
- pEntry = pEntry->pflink;
- while( pEntry != pHead )
- {
- if( pEntry->IsSelected() )
- {
- rStartPos = GetEntryListPos( pEntry );
- return pEntry;
- }
- pEntry = pEntry->pflink;
- }
- }
-
- rStartPos = 0xffffffff;
- return 0;
-}
-
void SvxIconChoiceCtrl_Impl::SelectAll( sal_Bool bSelect, sal_Bool bPaint )
{
bPaint = sal_True;
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index d1f2941a0de3..0b00dc3e15e9 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1326,31 +1326,6 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
|*
*************************************************************************/
-sal_uLong SvTreeList::SelectChilds(SvListView* pView, SvListEntry* pParent,sal_Bool bSelect )
-{
- DBG_ASSERT(pView&&pParent,"SelChilds:View/Parent?");
- if ( !pParent->pChilds )
- return 0;
- if ( pParent->pChilds->empty() )
- return 0;
-
- sal_uInt16 nRefDepth = GetDepth( pParent );
- sal_uInt16 nDepth = nRefDepth;
- sal_uLong nCount = 0;
- pParent = Next( pParent );
- do
- {
- if ( Select( pView, pParent, bSelect ) )
- nCount++; // nur die tatsaechlichen Selektierungen zaehlen
- pParent = Next( pParent, &nDepth );
- }
- while( pParent && nDepth > nRefDepth );
-#ifdef CHECK_INTEGRITY
- CheckIntegrity();
-#endif
- return nCount;
-}
-
void SvTreeList::SelectAll( SvListView* pView, sal_Bool bSelect )
{
DBG_ASSERT(pView,"SelectAll:NoView");
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index e7bf845a03ea..b8cf2d8a81bf 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -1184,31 +1184,6 @@ void ImpFileDialog::AddFilter( const UniString& rFilter, const UniString& rMask
SetCurFilter( rFilter );
}
-void ImpFileDialog::RemoveFilter( const UniString& rFilter )
-{
- for ( ImpFilterList::iterator it = aFilterList.begin(); it < aFilterList.end(); ++it ) {
- if ( (*it)->aName == rFilter ) {
- delete *it;
- aFilterList.erase( it );
- if ( pTypeList ) {
- pTypeList->RemoveEntry( rFilter );
- }
- break;
- }
- }
-}
-
-void ImpFileDialog::RemoveAllFilter()
-{
- for ( size_t i = 0, n = aFilterList.size(); i < n ; ++i ) {
- delete aFilterList[ i ];
- }
- aFilterList.clear();
-
- if( pTypeList )
- pTypeList->Clear();
-}
-
void ImpFileDialog::SetCurFilter( const UniString& rFilter )
{
if( !pTypeList )
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index e65bebe6f155..a7bba2013f55 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -159,8 +159,6 @@ public:
virtual ~ImpFileDialog();
void AddFilter( const String& rFilter, const String& rMask );
- void RemoveFilter( const String& rFilter );
- void RemoveAllFilter();
void SetCurFilter( const String& rFilter );
String GetCurFilter() const;
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 6385cbad507c..b97debabe863 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -183,10 +183,6 @@ public:
const Rectangle& GetViewportRectangle() { return maViewportRectangle; }
void CalcViewport();
- // Bounds des Viewports lesen
- const basegfx::B3DVector& GetScale();
- const basegfx::B3DVector& GetTranslate();
-
// Direkter Zugriff auf verschiedene Transformationen
const basegfx::B3DPoint WorldToEyeCoor(const basegfx::B3DPoint& rVec);
const basegfx::B3DPoint EyeToWorldCoor(const basegfx::B3DPoint& rVec);
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index fae05fb8bc42..b09e6aadc0da 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -56,7 +56,6 @@ private:
#endif
public:
- Config();
Config( const XubString& rFileName );
~Config();
@@ -81,19 +80,13 @@ public:
ByteString ReadKey( sal_uInt16 nKey ) const;
sal_uInt16 GetKeyCount() const;
- void EnterLock();
- void LeaveLock();
sal_Bool IsLocked() const { return (mnLockCount != 0); }
- sal_Bool Update();
void Flush();
void EnablePersistence( sal_Bool bPersistence = sal_True )
{ mbPersistence = bPersistence; }
sal_Bool IsPersistenceEnabled() const { return mbPersistence; }
- void SetLineEnd( LineEnd eLineEnd );
- LineEnd GetLineEnd() const;
-
private:
TOOLS_DLLPRIVATE Config( const Config& rConfig );
TOOLS_DLLPRIVATE Config& operator = ( const Config& rConfig );
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index d63dee9801dc..faa454d451cc 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -429,7 +429,6 @@ private:
TOOLS_DLLPRIVATE Dir& operator=( const Dir& ); // not allowed
#ifdef _DIR_CXX
- TOOLS_DLLPRIVATE FSysError ImpSetSort( std::va_list pArgs, FSysSort nSort );
TOOLS_DLLPRIVATE void Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE );
#endif
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index db811f35e76b..d500a3896de7 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -439,115 +439,6 @@ Dir::~Dir()
/*************************************************************************
|*
-|* Dir::ImpSetSort()
-|*
-*************************************************************************/
-
-FSysError Dir::ImpSetSort( std::va_list pArgs, int nFirstSort )
-{
- sal_Bool bLast;
- FSysSort aSort;
- FSysSortList *pNewSortLst = new FSysSortList;
-
- aSort = nFirstSort;
- do
- {
- // letztes Kriterium?
- bLast = FSYS_SORT_END == (aSort & FSYS_SORT_END);
- aSort &= ~FSYS_SORT_END;
-
- FSysSort nSort = aSort & ~(sal_uInt16)FSYS_SORT_ASCENDING
- & ~(sal_uInt16)FSYS_SORT_DESCENDING;
-
- // g"utliges Sortierkriterium?
- if ( ( nSort == FSYS_SORT_NAME ) ||
- ( nSort == FSYS_SORT_SIZE ) ||
- ( nSort == FSYS_SORT_EXT ) ||
- ( nSort == FSYS_SORT_CREATED ) ||
- ( nSort == FSYS_SORT_MODIFYED ) ||
- ( nSort == FSYS_SORT_ACCESSED ) ||
- ( nSort == FSYS_SORT_KIND ) )
- {
- pNewSortLst->push_back( aSort );
- aSort = va_arg( pArgs, FSysSort );
- }
- else
- { // ungueltiger Sort oder FSYS_SORT_NONE
- pNewSortLst->clear();
- delete pNewSortLst;
- if ( aSort == FSYS_SORT_NONE )
- {
- if ( pSortLst ) {
- delete pSortLst;
- pSortLst = NULL;
- }
- return FSYS_ERR_OK;
- }
- else
- {
- return FSYS_ERR_NOTSUPPORTED;
- }
- }
- } while ( !bLast );
-
- va_end( pArgs );
-
- //Enfernen der alten Sort-Elemente
- if ( pSortLst )
- {
- pSortLst->clear();
- delete pSortLst;
- }
- pSortLst = pNewSortLst;
-
- //Jetzt noch neu Sortieren...
-
- //Wenn keine FileStats da sind, aber nun welche gebraucht werden,
- //ist der Aufruf von Update() die einfachste Moeglichkeit
- if ( !pStatLst && pSortLst )
- {
- for ( size_t i = 0, n = pSortLst->size(); i < n && !pStatLst; ++i )
- {
- if ( (*pSortLst)[ i ]
- & ( FSYS_SORT_CREATED | FSYS_SORT_MODIFYED | FSYS_SORT_SIZE
- | FSYS_SORT_ACCESSED | FSYS_SORT_KIND
- )
- ) {
- Update();
- return FSYS_ERR_OK;
- }
- }
- }
-
- if ( pLst ) { //Keine DirEntry's, kein Sort.
- DirEntryList *pOldLst = pLst; //alte Liste merken
- pLst = new DirEntryList(); //neue Liste (zu Sortieren)
-
- FileStatList *pOldStatLst = NULL; //alte StatListe merken
- if ( pStatLst ) {
- pOldStatLst = pStatLst;
- pStatLst = new FileStatList(); //neue StatListe (zu Sortieren)
- }
-
- for ( size_t i = 0, n = pOldLst->size(); i < n; ++i )
- {
- //Sortiertes Einfuegen der Elemente aus den gemerkten Listen
- //in die 'richtigen' Listen
- if ( pOldStatLst )
- ImpSortedInsert( (*pOldLst)[ i ], (*pOldStatLst)[ i ] );
- else
- ImpSortedInsert( (*pOldLst)[ i ], NULL );
- }
-
- delete pOldLst;
- if ( pOldStatLst )
- delete pOldStatLst;
- }
- return FSYS_ERR_OK;
-}
-
-/*************************************************************************
-|*
|* Dir::operator[]()
|*
*************************************************************************/
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 7a086f5a6166..de642ed941b2 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -433,20 +433,6 @@ void B3dTransformationSet::PostSetViewport()
{
}
-const basegfx::B3DVector& B3dTransformationSet::GetScale()
-{
- if(!mbProjectionValid)
- CalcViewport();
- return maScale;
-}
-
-const basegfx::B3DVector& B3dTransformationSet::GetTranslate()
-{
- if(!mbProjectionValid)
- CalcViewport();
- return maTranslate;
-}
-
/*************************************************************************
|*
|* Direkter Zugriff auf verschiedene Transformationen
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 2075bf49e300..7df9dd8b2c52 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -726,7 +726,7 @@ sal_Bool Config::ImplUpdateConfig() const
return sal_False;
}
-// -----------------------------------------------------------------------
+// =======================================================================
ImplGroupData* Config::ImplGetGroup() const
{
@@ -769,23 +769,6 @@ ImplGroupData* Config::ImplGetGroup() const
// =======================================================================
-Config::Config()
-{
- // Daten initialisieren und einlesen
- maFileName = ImplMakeConfigName( NULL, NULL );
- mpData = ImplGetConfigData( maFileName );
- mpActGroup = NULL;
- mnDataUpdateId = 0;
- mnLockCount = 1;
- mbPersistence = sal_True;
-
-#ifdef DBG_UTIL
- OSL_TRACE( "Config::Config()" );
-#endif
-}
-
-// -----------------------------------------------------------------------
-
Config::Config( const XubString& rFileName )
{
// Daten initialisieren und einlesen
@@ -1258,55 +1241,10 @@ ByteString Config::ReadKey( sal_uInt16 nKey ) const
return getEmptyByteString();
}
-// -----------------------------------------------------------------------
-
-void Config::EnterLock()
-{
- // Config-Daten evt. updaten
- if ( !mnLockCount )
- ImplUpdateConfig();
-
- mnLockCount++;
-}
-
-// -----------------------------------------------------------------------
-
-void Config::LeaveLock()
-{
- DBG_ASSERT( mnLockCount, "Config::LeaveLook() without Config::EnterLook()" );
- mnLockCount--;
-
- if ( (mnLockCount == 0) && mpData->mbModified && mbPersistence )
- ImplWriteConfig( mpData );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool Config::Update()
-{
- return ImplUpdateConfig();
-}
-
-// -----------------------------------------------------------------------
-
void Config::Flush()
{
if ( mpData->mbModified && mbPersistence )
ImplWriteConfig( mpData );
}
-// -----------------------------------------------------------------------
-
-void Config::SetLineEnd( LineEnd eLineEnd )
-{
- mpData->meLineEnd = eLineEnd;
-}
-
-// -----------------------------------------------------------------------
-
-LineEnd Config::GetLineEnd() const
-{
- return mpData->meLineEnd;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index 6cd958d0cb11..3368d3004bb7 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -72,7 +72,6 @@ public:
static GlyphCache& GetInstance();
- void AddFontPath( const String& rFontPath );
void AddFontFile( const rtl::OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&,
const ExtraKernInfo* = NULL );
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index de3ac5a04f6c..d940bcf96d98 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -87,8 +87,6 @@ public:
virtual void interactionDone();
virtual void saveDone();
virtual bool cancelShutdown();
-
- static void handleOldX11SaveYourself( SalFrame* pFrame );
};
#endif
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index b857c0824975..8201a3200ff5 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -175,25 +175,6 @@ GlyphCache& GlyphCache::GetInstance()
// -----------------------------------------------------------------------
-void GlyphCache::AddFontPath( const String& rFontPath )
-{
- if( !mpFtManager )
- return;
-
- for( xub_StrLen nBreaker1 = 0, nBreaker2 = 0; nBreaker2 != STRING_LEN; nBreaker1 = nBreaker2 + 1 )
- {
- nBreaker2 = rFontPath.Search( ';', nBreaker1 );
- if( nBreaker2 == STRING_NOTFOUND )
- nBreaker2 = STRING_LEN;
-
- ::rtl::OUString aUrlName;
- osl::FileBase::getFileURLFromSystemPath( rFontPath.Copy( nBreaker1, nBreaker2 ), aUrlName );
- mpFtManager->AddFontDir( aUrlName );
- }
-}
-
-// -----------------------------------------------------------------------
-
void GlyphCache::AddFontFile( const rtl::OString& rNormalizedName, int nFaceNum,
sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA, const ExtraKernInfo* pExtraKern )
{
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 0d1b084b74a5..77b2e6f7b060 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -135,20 +135,6 @@ bool IceSalSession::cancelShutdown()
return false;
}
-void IceSalSession::handleOldX11SaveYourself( SalFrame* pFrame )
-{
- // do this only once
- if( ! pOldStyleSaveFrame )
- {
- pOldStyleSaveFrame = static_cast<X11SalFrame*>(pFrame);
- if( pOneInstance )
- {
- SalSessionSaveRequestEvent aEvent( true, false );
- pOneInstance->CallCallback( &aEvent );
- }
- }
-}
-
extern "C" void SAL_CALL ICEConnectionWorker( void* );
class ICEConnectionObserver
generated by cgit (git 2.34.1) at 2024-07-03 06:01:30 +0000