[Libreoffice-commits] .: 11 commits - basegfx/inc basegfx/source svl/inc svl/Library_svl.mk svl/Package_inc.mk svl/source svtools/inc svtools/source tools/inc tools/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source vcl/unx
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Jul 26 14:39:25 PDT 2011
basegfx/inc/basegfx/curve/b2dbeziertools.hxx | 1
basegfx/inc/basegfx/curve/b2dcubicbezier.hxx | 16 -
basegfx/inc/basegfx/matrix/b3dhommatrix.hxx | 3
basegfx/inc/basegfx/vector/b3dvector.hxx | 13 -
basegfx/source/curve/b2dbeziertools.cxx | 31 --
basegfx/source/curve/b2dcubicbezier.cxx | 59 ----
basegfx/source/matrix/b3dhommatrix.cxx | 5
basegfx/source/vector/b3dvector.cxx | 13 -
svl/Library_svl.mk | 1
svl/Package_inc.mk | 1
svl/inc/svl/srchcfg.hxx | 84 ------
svl/source/config/srchcfg.cxx | 268 ---------------------
svtools/inc/svtools/svtreebx.hxx | 18 -
svtools/source/contnr/imivctl.hxx | 10
svtools/source/contnr/imivctl1.cxx | 133 ----------
svtools/source/contnr/svtreebx.cxx | 175 --------------
svtools/source/contnr/treelist.cxx | 91 -------
svtools/source/dialogs/filedlg2.cxx | 25 --
svtools/source/dialogs/filedlg2.hxx | 2
tools/inc/tools/b3dtrans.hxx | 4
tools/inc/tools/config.hxx | 7
tools/inc/tools/fsys.hxx | 1
tools/source/fsys/tdir.cxx | 109 --------
tools/source/generic/b3dtrans.cxx | 14 -
tools/source/generic/config.cxx | 64 -----
unotools/Library_utl.mk | 1
unotools/Package_inc.mk | 1
unotools/inc/unotools/javaoptions.hxx | 75 ------
unotools/source/config/javaoptions.cxx | 334 ---------------------------
vcl/Library_vcl.mk | 1
vcl/Package_inc.mk | 1
vcl/inc/glyphcache.hxx | 1
vcl/inc/image.h | 13 -
vcl/inc/unx/sm.hxx | 2
vcl/inc/vcl/javachild.hxx | 58 ----
vcl/inc/vcl/splitwin.hxx | 20 -
vcl/inc/vcl/window.hxx | 54 ----
vcl/source/gdi/impimage.cxx | 145 -----------
vcl/source/glyphs/glyphcache.cxx | 19 -
vcl/source/window/dlgctrl.cxx | 56 ----
vcl/source/window/javachild.cxx | 66 -----
vcl/source/window/splitwin.cxx | 312 -------------------------
vcl/source/window/window.cxx | 162 -------------
vcl/source/window/window2.cxx | 95 -------
vcl/source/window/window4.cxx | 28 --
vcl/unx/generic/app/sm.cxx | 14 -
46 files changed, 3 insertions(+), 2603 deletions(-)
New commits:
commit 990d078013eaca0f82e67b3e2994cad449641711
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 23:32:40 2011 +0200
callcatcher: remove unused methods
diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
index e88e3e4..192e6fe 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 d05f424..0b88e02 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 8c78c99..63545ed 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 2d9f042..021f657 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 edcedaf..64e0e41 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 d1f2941..0b00dc3 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 f58389e..2ff1007 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 1db1534..24f1f01 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 db6e725..ba65b66 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 c52f13c..9f8eac1 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 6d97612..5e28161 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 f20a58e..650d8fe 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 c38711b..930dc19 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 d8e3abe..da795e0 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 053476d..425c80b 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 5614138..17b7ae9 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 9a33cff..30cb900 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 8723ac2..1cde19f 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
commit 8057424a337d5fdd0f55b9680b0601c2873cde03
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 21:57:03 2011 +0200
callcatcher: bring SplitWindow::GetItemWindow back
Needed by reportdesign/source/ui/report/DesignView.cxx
diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx
index 50c3f74..780aa2e 100644
--- a/vcl/inc/vcl/splitwin.hxx
+++ b/vcl/inc/vcl/splitwin.hxx
@@ -201,6 +201,7 @@ public:
/** Return the current size limits for the specified item.
*/
long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const;
+ Window* GetItemWindow( sal_uInt16 nId ) const;
sal_uInt16 GetSet( sal_uInt16 nId ) const;
sal_uInt16 GetItemId( Window* pWindow ) const;
sal_uInt16 GetItemId( const Point& rPos ) const;
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index e578c15..271d0da 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -3346,6 +3346,19 @@ void SplitWindow::SetItemSizeRange (sal_uInt16 nId, const Range aRange)
// -----------------------------------------------------------------------
+Window* SplitWindow::GetItemWindow( sal_uInt16 nId ) const
+{
+ sal_uInt16 nPos;
+ ImplSplitSet* pSet = ImplFindItem( mpBaseSet, nId, nPos );
+
+ if ( pSet )
+ return pSet->mpItems[nPos].mpWindow;
+ else
+ return NULL;
+}
+
+// -----------------------------------------------------------------------
+
sal_uInt16 SplitWindow::GetSet( sal_uInt16 nId ) const
{
sal_uInt16 nPos;
commit a59d3765d27c0202acf9947ee651177d8a7e4b6c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 16:21:55 2011 +0200
callcatcher: actually remove the right one
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 60feb09..ca6f907 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -427,7 +427,7 @@ public:
SAL_DLLPRIVATE void ImplPointToLogic( Font& rFont ) const;
SAL_DLLPRIVATE void ImplLogicToPoint( Font& rFont ) const;
SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos );
- SAL_DLLPRIVATE void ImplFrameToOutput( Rectangle& rRect );
+ SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos );
SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion );
SAL_DLLPRIVATE void ImplUpdateSysObjChildsClip();
SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip();
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 016e682..b293f27 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1434,12 +1434,9 @@ Point Window::ImplOutputToFrame( const Point& rPos )
return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY );
}
-void Window::ImplFrameToOutput( Rectangle& rRect )
+Point Window::ImplFrameToOutput( const Point& rPos )
{
- rRect.Left()-=mnOutOffX;
- rRect.Top()-=mnOutOffY;
- rRect.Right()-=mnOutOffX;
- rRect.Bottom()-=mnOutOffY;
+ return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY );
}
void Window::SetCompoundControl( sal_Bool bCompound )
commit afe7b472df50297eccb7e7b7b1dc448879dcc34b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 13:02:02 2011 +0200
callcatcher: clean up ImplImageBmp
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 734d6a5..9f71341 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -44,21 +44,8 @@ public:
ImplImageBmp();
~ImplImageBmp();
- void Create( long nItemWidth, long nItemHeight, sal_uInt16 nInitSize );
void Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,sal_uInt16 nInitSize );
-
- void Expand( sal_uInt16 nGrowSize );
-
- void Replace( sal_uInt16 nPos, sal_uInt16 nSrcPos );
- void Replace( sal_uInt16 nPos, const ImplImageBmp& rImageBmp, sal_uInt16 nSrcPos );
- void Replace( sal_uInt16 nPos, const BitmapEx& rBmpEx );
-
- void ReplaceColors( const Color* pSrcColors, const Color* pDstColors, sal_uIntPtr nColorCount );
void ColorTransform();
- void Invert();
-
- BitmapEx GetBitmapEx( sal_uInt16 nPosCount, sal_uInt16* pPosAry ) const;
-
void Draw( sal_uInt16 nPos, OutputDevice* pDev, const Point& rPos, sal_uInt16 nStyle, const Size* pSize = NULL );
private:
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 662168e..48e5434 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -214,26 +214,6 @@ ImplImageBmp::~ImplImageBmp()
// -----------------------------------------------------------------------
-void ImplImageBmp::Create( long nItemWidth, long nItemHeight, sal_uInt16 nInitSize )
-{
- const Size aTotalSize( nInitSize * nItemWidth, nItemHeight );
-
- maBmpEx = Bitmap( aTotalSize, 24 );
- maDisabledBmpEx.SetEmpty();
-
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-
- maSize = Size( nItemWidth, nItemHeight );
- mnSize = nInitSize;
-
- delete[] mpInfoAry;
- mpInfoAry = new sal_uInt8[ mnSize ];
- memset( mpInfoAry, 0, mnSize );
-}
-
-// -----------------------------------------------------------------------
-
void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight, sal_uInt16 nInitSize )
{
maBmpEx = rBmpEx;
@@ -254,131 +234,6 @@ void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHe
// -----------------------------------------------------------------------
-void ImplImageBmp::Expand( sal_uInt16 nGrowSize )
-{
- const sal_uLong nDX = nGrowSize * maSize.Width();
- const sal_uInt16 nOldSize = mnSize;
- sal_uInt8* pNewAry = new sal_uInt8[ mnSize = sal::static_int_cast<sal_uInt16>(mnSize+nGrowSize) ];
-
- maBmpEx.Expand( nDX, 0UL );
-
- if( !maDisabledBmpEx.IsEmpty() )
- maDisabledBmpEx.Expand( nDX, 0UL );
-
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-
- memset( pNewAry, 0, mnSize );
- memcpy( pNewAry, mpInfoAry, nOldSize );
- delete[] mpInfoAry;
- mpInfoAry = pNewAry;
-}
-
-// -----------------------------------------------------------------------
-
-void ImplImageBmp::Invert()
-{
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-
- maBmpEx.Invert();
-}
-
-// -----------------------------------------------------------------------
-
-void ImplImageBmp::Replace( sal_uInt16 nPos, sal_uInt16 nSrcPos )
-{
- const Point aSrcPos( nSrcPos * maSize.Width(), 0L ), aPos( nPos * maSize.Width(), 0L );
- const Rectangle aSrcRect( aSrcPos, maSize );
- const Rectangle aDstRect( aPos, maSize );
-
- maBmpEx.CopyPixel( aDstRect, aSrcRect );
-
- if( !maDisabledBmpEx.IsEmpty() )
- maDisabledBmpEx.CopyPixel( aDstRect, aSrcRect );
-
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-
- mpInfoAry[ nPos ] = mpInfoAry[ nSrcPos ];
-}
-
-// -----------------------------------------------------------------------
-
-void ImplImageBmp::Replace( sal_uInt16 nPos, const ImplImageBmp& rImageBmp, sal_uInt16 nSrcPos )
-{
- const Point aSrcPos( nSrcPos * maSize.Width(), 0L ), aPos( nPos * maSize.Width(), 0L );
- const Rectangle aSrcRect( aSrcPos, maSize );
- const Rectangle aDstRect( aPos, maSize );
-
- maBmpEx.CopyPixel( aDstRect, aSrcRect, &rImageBmp.maBmpEx );
-
- ImplUpdateDisabledBmpEx( nPos );
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-
- mpInfoAry[ nPos ] = rImageBmp.mpInfoAry[ nSrcPos ];
-}
-
-// -----------------------------------------------------------------------
-
-void ImplImageBmp::Replace( sal_uInt16 nPos, const BitmapEx& rBmpEx )
-{
- const Point aNullPos, aPos( nPos * maSize.Width(), 0L );
- const Rectangle aSrcRect( aNullPos, maSize );
- const Rectangle aDstRect( aPos, maSize );
-
- maBmpEx.CopyPixel( aDstRect, aSrcRect, &rBmpEx );
-
- ImplUpdateDisabledBmpEx( nPos );
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-
- mpInfoAry[ nPos ] &= ~( IMPSYSIMAGEITEM_MASK | IMPSYSIMAGEITEM_ALPHA );
- mpInfoAry[ nPos ] |= ( rBmpEx.IsAlpha() ? IMPSYSIMAGEITEM_ALPHA : ( rBmpEx.IsTransparent() ? IMPSYSIMAGEITEM_MASK : 0 ) );
-}
-
-// -----------------------------------------------------------------------
-
-void ImplImageBmp::ReplaceColors( const Color* pSrcColors, const Color* pDstColors, sal_uLong nColorCount )
-{
- maBmpEx.Replace( pSrcColors, pDstColors, nColorCount );
- delete mpDisplayBmp;
- mpDisplayBmp = NULL;
-}
-
-// -----------------------------------------------------------------------
-
-BitmapEx ImplImageBmp::GetBitmapEx( sal_uInt16 nPosCount, sal_uInt16* pPosAry ) const
-{
- const Bitmap aNewBmp( Size( nPosCount * maSize.Width(), maSize.Height() ), maBmpEx.GetBitmap().GetBitCount() );
- BitmapEx aRet;
- if( maBmpEx.IsAlpha() )
- {
- // initialize target bitmap with an empty alpha mask
- // which allows for using an optimized copypixel later on (see AlphaMask::CopyPixel)
- // that avoids palette lookups
- AlphaMask aAlpha( Size( nPosCount * maSize.Width(), maSize.Height() ) );
- aRet = BitmapEx( aNewBmp, aAlpha );
- }
- else
- aRet = BitmapEx( aNewBmp );
-
- for( sal_uInt16 i = 0; i < nPosCount; i++ )
- {
- const Point aSrcPos( pPosAry[ i ] * maSize.Width(), 0L );
- const Point aPos( i * maSize.Width(), 0L );
- const Rectangle aSrcRect( aSrcPos, maSize );
- const Rectangle aDstRect( aPos, maSize );
-
- aRet.CopyPixel( aDstRect, aSrcRect, &maBmpEx );
- }
-
- return aRet;
-}
-
-// -----------------------------------------------------------------------
-
void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev,
const Point& rPos, sal_uInt16 nStyle,
const Size* pSize )
commit e3977d6af49bf4cf0979f166fb47a3a592ce9bdb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 12:51:58 2011 +0200
callcatcher: clean Window
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 8d45bf8..60feb09 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -387,7 +387,6 @@ private:
friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos );
public:
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData );
- SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken );
SAL_DLLPRIVATE WinBits ImplInitRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplWindowRes( const ResId& rResId );
@@ -411,15 +410,11 @@ public:
SAL_DLLPRIVATE sal_Bool ImplIsRealParentPath( const Window* pWindow ) const;
SAL_DLLPRIVATE sal_Bool ImplIsChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const;
SAL_DLLPRIVATE sal_Bool ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const;
- SAL_DLLPRIVATE Window* ImplGetSameParent( const Window* pWindow ) const;
SAL_DLLPRIVATE sal_Bool ImplIsDockingWindow() const;
SAL_DLLPRIVATE sal_Bool ImplIsFloatingWindow() const;
- SAL_DLLPRIVATE sal_Bool ImplIsToolbox() const;
SAL_DLLPRIVATE sal_Bool ImplIsSplitter() const;
SAL_DLLPRIVATE sal_Bool ImplIsPushButton() const;
SAL_DLLPRIVATE sal_Bool ImplIsOverlapWindow() const;
- SAL_DLLPRIVATE void ImplSetActive( sal_Bool bActive );
- SAL_DLLPRIVATE sal_Bool ImplIsMouseTransparent() const;
SAL_DLLPRIVATE void ImplSetMouseTransparent( sal_Bool bTransparent );
SAL_DLLPRIVATE int ImplTestMousePointerSet();
SAL_DLLPRIVATE PointerStyle ImplGetMousePointer() const;
@@ -432,8 +427,6 @@ public:
SAL_DLLPRIVATE void ImplPointToLogic( Font& rFont ) const;
SAL_DLLPRIVATE void ImplLogicToPoint( Font& rFont ) const;
SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos );
- SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos );
- SAL_DLLPRIVATE void ImplOutputToFrame( Rectangle& rRect );
SAL_DLLPRIVATE void ImplFrameToOutput( Rectangle& rRect );
SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion );
SAL_DLLPRIVATE void ImplUpdateSysObjChildsClip();
@@ -501,7 +494,6 @@ public:
SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplToBottomChild();
SAL_DLLPRIVATE void ImplCalcToTop( ImplCalcToTopData* pPrevData );
- SAL_DLLPRIVATE void ImplCalcChildOverlapToTop( ImplCalcToTopData* pPrevData );
SAL_DLLPRIVATE void ImplToTop( sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplStartToTop( sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplFocusToTop( sal_uInt16 nFlags, sal_Bool bReallyVisible );
@@ -539,7 +531,6 @@ public:
SAL_DLLPRIVATE static void ImplCalcSymbolRect( Rectangle& rRect );
SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY );
- SAL_DLLPRIVATE sal_Bool ImplGetCurrentBackgroundColor( Color& rCol );
SAL_DLLPRIVATE sal_Bool ImplIsAccessibleCandidate() const;
SAL_DLLPRIVATE sal_Bool ImplIsAccessibleNativeFrame() const;
SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const;
@@ -567,7 +558,6 @@ public:
SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow );
SAL_DLLPRIVATE void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos );
- SAL_DLLPRIVATE sal_Bool ImplIsInTaskPaneList();
SAL_DLLPRIVATE void ImplIsInTaskPaneList( sal_Bool mbIsInTaskList );
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >
ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const;
@@ -630,7 +620,6 @@ public:
/*virtual*/ void AddChildEventListener( const Link& rEventListener );
/*virtual*/ void RemoveChildEventListener( const Link& rEventListener );
- sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL );
sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL );
sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL );
sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
@@ -650,7 +639,6 @@ public:
WinBits GetPrevStyle() const;
void SetExtendedStyle( WinBits nExtendedStyle );
WinBits GetExtendedStyle() const;
- WinBits GetPrevExtendedStyle() const;
void SetType( WindowType nType );
WindowType GetType() const;
sal_Bool IsSystemWindow() const;
@@ -661,7 +649,6 @@ public:
SystemWindow* GetSystemWindow() const;
void EnableAllResize( sal_Bool bEnable = sal_True );
- sal_Bool IsAllResizeEnabled() const;
void SetBorderStyle( sal_uInt16 nBorderStyle );
sal_uInt16 GetBorderStyle() const;
@@ -672,7 +659,6 @@ public:
long CalcTitleWidth() const;
void EnableClipSiblings( sal_Bool bClipSiblings = sal_True );
- sal_Bool IsClipSiblingsEnabled() const;
void EnableChildTransparentMode( sal_Bool bEnable = sal_True );
sal_Bool IsChildTransparentModeEnabled() const;
@@ -699,14 +685,10 @@ public:
void SetInputContext( const InputContext& rInputContext );
const InputContext& GetInputContext() const;
void EndExtTextInput( sal_uInt16 nFlags );
- sal_Bool IsExtTextInput() const;
void SetCursorRect( const Rectangle* pRect = NULL, long nExtTextInputWidth = 0 );
const Rectangle* GetCursorRect() const;
long GetCursorExtTextInputWidth() const;
- void EnableChildNotify( sal_Bool bEnable );
- sal_Bool IsChildNotify() const;
-
using OutputDevice::SetSettings;
virtual void SetSettings( const AllSettings& rSettings );
virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild );
@@ -754,8 +736,6 @@ public:
void Hide( sal_uInt16 nFlags = 0 ) { Show( sal_False, nFlags ); }
sal_Bool IsVisible() const;
sal_Bool IsReallyVisible() const;
- // Do not use this function, use IsReallyVisible()
- sal_Bool IsParentPathVisible() const;
sal_Bool IsReallyShown() const;
sal_Bool IsInInitShow() const;
@@ -801,11 +781,7 @@ public:
if true children are recursively set to AlwaysDisableInput
*/
void AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild = sal_True );
- /** returns the current AlwaysDisableInput state
- @return
- true if window is in AlwaysEnableInput state
- */
- sal_Bool IsAlwaysDisableInput() const;
+
/** usually event handlers (see AddEventListener and AddChildEventListener)
are not called on disabled, modal or input disabled windows. There are however rare cases
in which one wants a Window or rather one of its Control subclasses to
@@ -879,8 +855,6 @@ public:
virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 );
virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 );
void Validate( sal_uInt16 nFlags = 0 );
- void Validate( const Rectangle& rRect, sal_uInt16 nFlags = 0 );
- void Validate( const Region& rRegion, sal_uInt16 nFlags = 0 );
sal_Bool HasPaintEvent() const;
void Update();
void Flush();
@@ -896,7 +870,6 @@ public:
void SetUpdateMode( sal_Bool bUpdate );
sal_Bool IsUpdateMode() const;
void SetParentUpdateMode( sal_Bool bUpdate );
- sal_Bool IsParentUpdateMode() const;
void GrabFocus();
sal_Bool HasFocus() const;
@@ -925,12 +898,10 @@ public:
void SetPointer( const Pointer& rPointer );
const Pointer& GetPointer() const;
void EnableChildPointerOverwrite( sal_Bool bOverwrite = sal_True );
- sal_Bool IsChildPointerOverwrite() const;
void SetPointerPosPixel( const Point& rPos );
Point GetPointerPosPixel();
Point GetLastPointerPosPixel();
void ShowPointer( sal_Bool bVisible );
- sal_Bool IsPointerVisible() const;
void EnterWait();
void LeaveWait();
sal_Bool IsWait() const;
@@ -1006,7 +977,6 @@ public:
void StartAutoScroll( sal_uInt16 nFlags );
void EndAutoScroll();
- sal_Bool IsAutoScroll() const;
sal_Bool HandleScrollCommand( const CommandEvent& rCmd,
ScrollBar* pHScrl = NULL,
@@ -1043,12 +1013,9 @@ public:
void SetAccessibleRelationLabeledBy( Window* pLabeledBy );
Window* GetAccessibleRelationLabeledBy() const;
- void SetAccessibleRelationLabelFor( Window* pLabelFor );
Window* GetAccessibleRelationLabelFor() const;
void SetAccessibleRelationMemberOf( Window* pMemberOf );
- Window* GetAccessibleRelationMemberOf() const;
-
// to avoid sending accessibility events in cases like closing dialogs
// by default checks complete parent path
@@ -1087,8 +1054,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer();
- // only for RVP transmission
- void GetDragSourceDropTarget(::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xDragSource,::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > &xDropTarget );
// Clipboard/Selection interfaces
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard();
@@ -1128,9 +1093,6 @@ public:
void SimulateKeyPress( sal_uInt16 nKeyCode ) const;
- // let the window intercept the KeyDown messages of the system children
- void InterceptChildWindowKeyDown( sal_Bool bIntercept );
-
virtual XubString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
@@ -1151,23 +1113,9 @@ public:
*/
void addWindow( Window* i_pWin, bool i_bTakeOwnership = true );
- /* remove a child Window
- the remove window functions will
- - reparent the searched window (equivalent to i_pWin->SetParent( i_pNewParent ))
- - return a pointer to the removed window or NULL if i_pWin was not found
- caution: ownership passes to the new parent or the caller, if the new parent was NULL
- */
- Window* removeWindow( Window* i_pWin, Window* i_pNewParent = NULL );
-
/* return the identifier of this window
*/
const rtl::OUString& getIdentifier() const;
- /* set an identifier
- identifiers have only loosely defined rules per se
- in context of Window they must be unique over the window
- hierarchy you'd like to find them again using the findWindow method
- */
- void setIdentifier( const rtl::OUString& );
/* returns the first found descendant that matches
the passed identifier or NULL
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 5e15345..58238d7 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -1247,62 +1247,6 @@ Window* Window::GetAccessibleRelationLabeledBy() const
return pWindow;
}
-Window* Window::GetAccessibleRelationMemberOf() const
-{
- Window* pWindow = NULL;
- Window* pFrameWindow = GetParent();
- if ( !pFrameWindow )
- {
- pFrameWindow = ImplGetFrameWindow();
- }
- // if( ! ( GetType() == WINDOW_FIXEDTEXT ||
- if( !( GetType() == WINDOW_FIXEDLINE ||
- GetType() == WINDOW_GROUPBOX ) )
- {
- // search for a control that makes member of this window
- // it is considered the last fixed line or group box
- // that comes before this control; with the exception of push buttons
- // which are labeled only if the fixed line or group box
- // is directly before the control
- // get form start and form end and index of this control
- sal_uInt16 nIndex, nFormStart, nFormEnd;
- Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow,
- const_cast<Window*>(this),
- nIndex,
- nFormStart,
- nFormEnd );
- if( pSWindow && nIndex != nFormStart )
- {
- if( GetType() == WINDOW_PUSHBUTTON ||
- GetType() == WINDOW_HELPBUTTON ||
- GetType() == WINDOW_OKBUTTON ||
- GetType() == WINDOW_CANCELBUTTON )
- {
- nFormStart = nIndex-1;
- }
- for( sal_uInt16 nSearchIndex = nIndex-1; nSearchIndex >= nFormStart; nSearchIndex-- )
- {
- sal_uInt16 nFoundIndex = 0;
- pSWindow = ::ImplGetChildWindow( pFrameWindow,
- nSearchIndex,
- nFoundIndex,
- sal_False );
- if( pSWindow && pSWindow->IsVisible() &&
- ( pSWindow->GetType() == WINDOW_FIXEDLINE ||
- pSWindow->GetType() == WINDOW_GROUPBOX ) )
- {
- pWindow = pSWindow;
- break;
- }
- if( nFoundIndex > nSearchIndex || nSearchIndex == 0 )
- break;
- }
- }
- }
- return pWindow;
-}
-//-----IAccessibility2 Implementation 2009
-
// -----------------------------------------------------------------------
KeyEvent Window::GetActivationKey() const
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bdab503..f39de9f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -729,13 +729,6 @@ void Window::ImplInitWindowData( WindowType nType )
// -----------------------------------------------------------------------
-void Window::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& /*aSystemWorkWindowToken*/ )
-{
- ImplInit( pParent, nStyle, NULL );
-}
-
-// -----------------------------------------------------------------------
-
void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData )
{
DBG_ASSERT( mpWindowImpl->mbFrame || pParent, "Window::Window(): pParent == NULL" );
@@ -1476,26 +1469,6 @@ sal_Bool Window::ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWin
// -----------------------------------------------------------------------
-Window* Window::ImplGetSameParent( const Window* pWindow ) const
-{
- if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow )
- return NULL;
- else
- {
- if ( pWindow->ImplIsChild( this ) )
- return (Window*)pWindow;
- else
- {
- Window* pTestWindow = (Window*)this;
- while ( (pTestWindow == pWindow) || pTestWindow->ImplIsChild( pWindow ) )
- pTestWindow = pTestWindow->ImplGetParent();
- return pTestWindow;
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
int Window::ImplTestMousePointerSet()
{
// Wenn Mouse gecaptured ist, dann soll MousePointer umgeschaltet werden
@@ -3566,26 +3539,6 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData )
// -----------------------------------------------------------------------
-void Window::ImplCalcChildOverlapToTop( ImplCalcToTopData* pPrevData )
-{
- DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplCalcChildOverlapToTop(): Is not a OverlapWindow" );
-
- ImplCalcToTop( pPrevData );
- if ( pPrevData->mpNext )
- pPrevData = pPrevData->mpNext;
-
- Window* pOverlap = mpWindowImpl->mpFirstOverlap;
- while ( pOverlap )
- {
- pOverlap->ImplCalcToTop( pPrevData );
- if ( pPrevData->mpNext )
- pPrevData = pPrevData->mpNext;
- pOverlap = pOverlap->mpWindowImpl->mpNext;
- }
-}
-
-// -----------------------------------------------------------------------
-
void Window::ImplToTop( sal_uInt16 nFlags )
{
DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplToTop(): Is not a OverlapWindow" );
@@ -4710,13 +4663,6 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const
}
// -----------------------------------------------------------------------
-void Window::InterceptChildWindowKeyDown( sal_Bool bIntercept )
-{
- if( mpWindowImpl->mpSysObj )
- mpWindowImpl->mpSysObj->InterceptChildWindowKeyDown( bIntercept );
-}
-
-// -----------------------------------------------------------------------
void Window::MouseMove( const MouseEvent& rMEvt )
{
@@ -5320,15 +5266,6 @@ void Window::RemoveChildEventListener( const Link& rEventListener )
// -----------------------------------------------------------------------
-sal_uLong Window::PostUserEvent( sal_uLong nEvent, void* pEventData )
-{
- sal_uLong nEventId;
- PostUserEvent( nEventId, nEvent, pEventData );
- return nEventId;
-}
-
-// -----------------------------------------------------------------------
-
sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller )
{
sal_uLong nEventId;
@@ -7450,42 +7387,6 @@ void Window::Validate( sal_uInt16 nFlags )
// -----------------------------------------------------------------------
-void Window::Validate( const Rectangle& rRect, sal_uInt16 nFlags )
-{
- DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
- if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
- return;
-
- Rectangle aRect = ImplLogicToDevicePixel( rRect );
- if ( !aRect.IsEmpty() )
- {
- Region aRegion( aRect );
- ImplValidate( &aRegion, nFlags );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void Window::Validate( const Region& rRegion, sal_uInt16 nFlags )
-{
- DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
- if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
- return;
-
- if ( rRegion.IsNull() )
- ImplValidate( NULL, nFlags );
- else
- {
- Region aRegion = ImplPixelToDevicePixel( LogicToPixel( rRegion ) );
- if ( !aRegion.IsEmpty() )
- ImplValidate( &aRegion, nFlags );
- }
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool Window::HasPaintEvent() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
@@ -8476,24 +8377,6 @@ uno::Reference< XDragSource > Window::GetDragSource()
// -----------------------------------------------------------------------
-void Window::GetDragSourceDropTarget(uno::Reference< XDragSource >& xDragSource, uno::Reference< XDropTarget > &xDropTarget )
-// only for RVP transmission
-{
- if( mpWindowImpl->mpFrameData )
- {
- // initialization is done in GetDragSource
- xDragSource = GetDragSource();
- xDropTarget = mpWindowImpl->mpFrameData->mxDropTarget;
- }
- else
- {
- xDragSource.clear();
- xDropTarget.clear();
- }
-}
-
-// -----------------------------------------------------------------------
-
uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer()
{
return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY );
@@ -9133,13 +9016,6 @@ void Window::SetAccessibleRelationLabeledBy( Window* pLabeledBy )
mpWindowImpl->mpAccessibleInfos->pLabeledByWindow = pLabeledBy;
}
-void Window::SetAccessibleRelationLabelFor( Window* pLabelFor )
-{
- if ( !mpWindowImpl->mpAccessibleInfos )
- mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
- mpWindowImpl->mpAccessibleInfos->pLabelForWindow = pLabelFor;
-}
-
void Window::SetAccessibleRelationMemberOf( Window* pMemberOfWin )
{
if ( !mpWindowImpl->mpAccessibleInfos )
@@ -9181,39 +9057,6 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle&
}
// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-
-
-// returns background color used in this control
-// false: could not determine color
-sal_Bool Window::ImplGetCurrentBackgroundColor( Color& rCol )
-{
- sal_Bool bRet = sal_True;
-
- switch ( GetType() )
- {
- // peform special handling here
- case WINDOW_PUSHBUTTON:
- case WINDOW_OKBUTTON:
- case WINDOW_CANCELBUTTON:
- // etc.
- default:
- if( IsControlBackground() )
- rCol = GetControlBackground();
- else if( IsBackground() )
- {
- Wallpaper aWall = GetBackground();
- if( !aWall.IsGradient() && !aWall.IsBitmap() )
- rCol = aWall.GetColor();
- else
- bRet = sal_False;
- }
- else
- rCol = GetSettings().GetStyleSettings().GetFaceColor();
- break;
- }
- return bRet;
-}
void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly )
{
@@ -9480,10 +9323,7 @@ void Window::ImplDecModalCount()
pFrameWindow = pParent ? pParent->mpWindowImpl->mpFrameWindow : NULL;
}
}
-sal_Bool Window::ImplIsInTaskPaneList()
-{
- return mpWindowImpl->mbIsInTaskPaneList;
-}
+
void Window::ImplIsInTaskPaneList( sal_Bool mbIsInTaskList )
{
mpWindowImpl->mbIsInTaskPaneList = mbIsInTaskList;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e4f001e..016e682 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -810,15 +810,6 @@ void Window::EndAutoScroll()
// -----------------------------------------------------------------------
-sal_Bool Window::IsAutoScroll() const
-{
- DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
- return (ImplGetSVData()->maWinData.mpAutoScrollWin == this);
-}
-
-// -----------------------------------------------------------------------
-
void Window::SaveBackground( const Point& rPos, const Size& rSize,
const Point& rDestOff, VirtualDevice& rSaveDevice )
{
@@ -1418,11 +1409,6 @@ sal_Bool Window::ImplIsFloatingWindow() const
return mpWindowImpl->mbFloatWin;
}
-sal_Bool Window::ImplIsToolbox() const
-{
- return mpWindowImpl->mbToolBox;
-}
-
sal_Bool Window::ImplIsSplitter() const
{
return mpWindowImpl->mbSplitter;
@@ -1438,16 +1424,6 @@ sal_Bool Window::ImplIsOverlapWindow() const
return mpWindowImpl->mbOverlapWin;
}
-void Window::ImplSetActive( sal_Bool bActive )
-{
- mpWindowImpl->mbActive = bActive;
-}
-
-sal_Bool Window::ImplIsMouseTransparent() const
-{
- return mpWindowImpl->mbMouseTransparent;
-}
-
void Window::ImplSetMouseTransparent( sal_Bool bTransparent )
{
mpWindowImpl->mbMouseTransparent = bTransparent;
@@ -1458,19 +1434,6 @@ Point Window::ImplOutputToFrame( const Point& rPos )
return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY );
}
-Point Window::ImplFrameToOutput( const Point& rPos )
-{
- return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY );
-}
-
-void Window::ImplOutputToFrame( Rectangle& rRect )
-{
- rRect.Left()+=mnOutOffX;
- rRect.Top()+=mnOutOffY;
- rRect.Right()+=mnOutOffX;
- rRect.Bottom()+=mnOutOffY;
-}
-
void Window::ImplFrameToOutput( Rectangle& rRect )
{
rRect.Left()-=mnOutOffX;
@@ -1509,11 +1472,6 @@ WinBits Window::GetExtendedStyle() const
return mpWindowImpl->mnExtendedStyle;
}
-WinBits Window::GetPrevExtendedStyle() const
-{
- return mpWindowImpl->mnExtendedStyle;
-}
-
void Window::SetType( WindowType nType )
{
mpWindowImpl->mnType = nType;
@@ -1548,16 +1506,6 @@ void Window::EnableAllResize( sal_Bool bEnable )
mpWindowImpl->mbAllResize = bEnable;
}
-sal_Bool Window::IsAllResizeEnabled() const
-{
- return mpWindowImpl->mbAllResize;
-}
-
-sal_Bool Window::IsClipSiblingsEnabled() const
-{
- return mpWindowImpl->mbClipSiblings;
-}
-
void Window::EnableChildTransparentMode( sal_Bool bEnable )
{
mpWindowImpl->mbChildTransparent = bEnable;
@@ -1603,21 +1551,6 @@ const InputContext& Window::GetInputContext() const
return mpWindowImpl->maInputContext;
}
-sal_Bool Window::IsExtTextInput() const
-{
- return mpWindowImpl->mbExtTextInput;
-}
-
-void Window::EnableChildNotify( sal_Bool bEnable )
-{
- mpWindowImpl->mbChildNotify = bEnable;
-}
-
-sal_Bool Window::IsChildNotify() const
-{
- return mpWindowImpl->mbChildNotify;
-}
-
sal_Bool Window::IsControlFont() const
{
return (mpWindowImpl->mpControlFont != 0);
@@ -1663,11 +1596,6 @@ sal_Bool Window::IsReallyVisible() const
return mpWindowImpl->mbReallyVisible;
}
-sal_Bool Window::IsParentPathVisible() const
-{
- return mpWindowImpl->mbReallyVisible;
-}
-
sal_Bool Window::IsReallyShown() const
{
return mpWindowImpl->mbReallyShown;
@@ -1693,11 +1621,6 @@ sal_Bool Window::IsAlwaysEnableInput() const
return mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled;
}
-sal_Bool Window::IsAlwaysDisableInput() const
-{
- return mpWindowImpl->meAlwaysInputMode == AlwaysInputDisabled;
-}
-
sal_uInt16 Window::GetActivateMode() const
{
return mpWindowImpl->mnActivateMode;
@@ -1739,11 +1662,6 @@ void Window::SetParentUpdateMode( sal_Bool bUpdate )
mpWindowImpl->mbNoParentUpdate = !bUpdate;
}
-sal_Bool Window::IsParentUpdateMode() const
-{
- return !mpWindowImpl->mbNoParentUpdate;
-}
-
sal_Bool Window::IsActive() const
{
return mpWindowImpl->mbActive;
@@ -1759,16 +1677,6 @@ sal_Bool Window::IsCompoundControl() const
return mpWindowImpl->mbCompoundControl;
}
-sal_Bool Window::IsChildPointerOverwrite() const
-{
- return mpWindowImpl->mbChildPtrOverwrite;
-}
-
-sal_Bool Window::IsPointerVisible() const
-{
- return !mpWindowImpl->mbNoPtrVisible;
-}
-
sal_Bool Window::IsWait() const
{
return (mpWindowImpl->mnWaitCount != 0);
diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx
index fb41f87..7cb375c 100644
--- a/vcl/source/window/window4.cxx
+++ b/vcl/source/window/window4.cxx
@@ -133,27 +133,6 @@ void Window::addWindow( Window* i_pWin, bool i_bTakeOwnership )
}
}
-Window* Window::removeWindow( Window* i_pWin, Window* i_pNewParent )
-{
- Window* pRet = NULL;
- if( i_pWin )
- {
- vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl();
- if( pImpl )
- {
- vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl();
- if( pChildImpl )
- {
- if( ! i_pNewParent )
- pChildImpl->mbOwnedByParent = false;
- i_pWin->SetParent( i_pNewParent );
- pRet = i_pWin;
- }
- }
- }
- return pRet;
-}
-
Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const
{
if( getIdentifier() == i_rIdentifier )
@@ -178,13 +157,6 @@ const rtl::OUString& Window::getIdentifier() const
return (mpWindowImpl && mpWindowImpl->mpExtImpl) ? mpWindowImpl->mpExtImpl->maIdentifier : aEmptyStr;
}
-void Window::setIdentifier( const rtl::OUString& i_rIdentifier )
-{
- vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl();
- if( pImpl )
- pImpl->maIdentifier = i_rIdentifier;
-}
-
void Window::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps )
{
const beans::PropertyValue* pVals = i_rProps.getConstArray();
commit b84f102c507c92aa9fc9b144481b40514001904b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 12:33:21 2011 +0200
callcatcher: Kill SvtJavaOptions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 75c5ab1..2abd5ce 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/config/inetoptions \
unotools/source/config/internaloptions \
unotools/source/config/itemholder1 \
- unotools/source/config/javaoptions \
unotools/source/config/lingucfg \
unotools/source/config/localisationoptions \
unotools/source/config/misccfg \
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index a483061..a0ec02c 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/inetoptions.hxx,unot
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/internaloptions.hxx,unotools/internaloptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/intlwrapper.hxx,unotools/intlwrapper.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/itemholderbase.hxx,unotools/itemholderbase.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/javaoptions.hxx,unotools/javaoptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/lingucfg.hxx,unotools/lingucfg.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unotools/linguprops.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx))
diff --git a/unotools/inc/unotools/javaoptions.hxx b/unotools/inc/unotools/javaoptions.hxx
deleted file mode 100644
index cc7f18c..0000000
--- a/unotools/inc/unotools/javaoptions.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _unotools_JAVAOPTIONS_HXX
-#define _unotools_JAVAOPTIONS_HXX
-
-#include "unotools/unotoolsdllapi.h"
-#include <sal/types.h>
-#include <unotools/configitem.hxx>
-
-
-// class SvtJavaOptions --------------------------------------------------
-
-struct SvtJavaOptions_Impl;
-
-class UNOTOOLS_DLLPUBLIC SvtJavaOptions : public utl::ConfigItem
-{
- SvtJavaOptions_Impl* pImpl;
-public:
- enum EOption
- {
- E_ENABLED,
- E_SECURITY,
- E_NETACCESS,
- E_USERCLASSPATH,
- E_EXECUTEAPPLETS
- };
-
- SvtJavaOptions();
- ~SvtJavaOptions();
-
- virtual void Commit();
-
- sal_Bool IsEnabled() const;
- sal_Bool IsSecurity()const;
- sal_Int32 GetNetAccess() const;
- rtl::OUString& GetUserClassPath()const;
- sal_Bool IsExecuteApplets() const;
-
- void SetEnabled(sal_Bool bSet) ;
- void SetSecurity(sal_Bool bSet);
- void SetNetAccess(sal_Int32 nSet) ;
- void SetUserClassPath(const rtl::OUString& rSet);
- void SetExecuteApplets(sal_Bool bSet);
-
- sal_Bool IsReadOnly( EOption eOption ) const;
-};
-
-#endif //
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
deleted file mode 100644
index 3f9208e..0000000
--- a/unotools/source/config/javaoptions.cxx
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_unotools.hxx"
-
-#include <unotools/javaoptions.hxx>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/logfile.hxx>
-
-
-using namespace ::com::sun::star::uno;
-using namespace ::rtl;
-
-#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
-#define CFG_READONLY_DEFAULT sal_False
-
-class SvtExecAppletsItem_Impl : public utl::ConfigItem
-{
- sal_Bool bExecute;
- sal_Bool bRO;
-public:
- SvtExecAppletsItem_Impl();
-
- virtual void Commit();
- void Notify( const Sequence< rtl::OUString >& );
-
- sal_Bool IsExecuteApplets() const {return bExecute;}
- void SetExecuteApplets(sal_Bool bSet);
- sal_Bool IsReadOnly() const {return bRO;}
-};
-
-void SvtExecAppletsItem_Impl::SetExecuteApplets(sal_Bool bSet)
-{
- OSL_ENSURE(!bRO, "SvtExecAppletsItem_Impl::SetExecuteApplets()\nYou tried to write on a readonly value!\n");
- if (!bRO)
- {
- bExecute = bSet;
- SetModified();
- }
-}
-
-SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl() :
- utl::ConfigItem(C2U("Office.Common/Java/Applet")),
- bExecute (sal_False ),
- bRO (CFG_READONLY_DEFAULT )
-{
- RTL_LOGFILE_CONTEXT(aLog, "unotools SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl()");
-
- Sequence< OUString > aNames(1);
- aNames.getArray()[0] = C2U("Enable");
- Sequence< Any > aValues = GetProperties(aNames);
- Sequence< sal_Bool > aROStates = GetReadOnlyStates(aNames);
- const Any* pValues = aValues.getConstArray();
- const sal_Bool* pROStates = aROStates.getConstArray();
- if(aValues.getLength() && aROStates.getLength() && pValues[0].hasValue())
- {
- bExecute = *(sal_Bool*)pValues[0].getValue();
- bRO = pROStates[0];
- }
-}
-void SvtExecAppletsItem_Impl::Commit()
-{
- if (bRO)
- return;
-
- Sequence< OUString > aNames(1);
- aNames.getArray()[0] = C2U("Enable");
- Sequence< Any > aValues(1);
- aValues.getArray()[0].setValue(&bExecute, ::getBooleanCppuType());
- PutProperties(aNames, aValues);
-}
-
-void SvtExecAppletsItem_Impl::Notify( const Sequence< rtl::OUString >& )
-{
- // no listeners supported yet
-}
-
-struct SvtJavaOptions_Impl
-{
- SvtExecAppletsItem_Impl aExecItem;
- Sequence<OUString> aPropertyNames;
- sal_Bool bEnabled;
- sal_Bool bSecurity;
- sal_Int32 nNetAccess;
- rtl::OUString sUserClassPath;
-
- sal_Bool bROEnabled;
- sal_Bool bROSecurity;
- sal_Bool bRONetAccess;
- sal_Bool bROUserClassPath;
-
- SvtJavaOptions_Impl() :
- aPropertyNames(4),
- bEnabled (sal_False),
- bSecurity (sal_False),
- nNetAccess (0),
- bROEnabled (CFG_READONLY_DEFAULT),
- bROSecurity (CFG_READONLY_DEFAULT),
- bRONetAccess (CFG_READONLY_DEFAULT),
- bROUserClassPath (CFG_READONLY_DEFAULT)
- {
- OUString* pNames = aPropertyNames.getArray();
- pNames[0] = C2U("Enable");
- pNames[1] = C2U("Security");
- pNames[2] = C2U("NetAccess");
- pNames[3] = C2U("UserClassPath");
- }
-};
-
-SvtJavaOptions::SvtJavaOptions() :
- utl::ConfigItem(C2U("Office.Java/VirtualMachine")),
- pImpl(new SvtJavaOptions_Impl)
-{
- RTL_LOGFILE_CONTEXT(aLog, "unotools SvtJavaOptions::SvtJavaOptions()");
-
- Sequence< Any > aValues = GetProperties(pImpl->aPropertyNames);
- Sequence< sal_Bool > aROStates = GetReadOnlyStates(pImpl->aPropertyNames);
- const Any* pValues = aValues.getConstArray();
- const sal_Bool* pROStates = aROStates.getConstArray();
- if ( aValues.getLength() == pImpl->aPropertyNames.getLength() && aROStates.getLength() == pImpl->aPropertyNames.getLength() )
- {
- for ( int nProp = 0; nProp < pImpl->aPropertyNames.getLength(); nProp++ )
- {
- if( pValues[nProp].hasValue() )
- {
- switch ( nProp )
- {
- case 0: pImpl->bEnabled = *(sal_Bool*)pValues[nProp].getValue(); break;
- case 1: pImpl->bSecurity = *(sal_Bool*)pValues[nProp].getValue();break;
- case 2: pValues[nProp] >>= pImpl->nNetAccess; break;
- case 3: pValues[nProp] >>= pImpl->sUserClassPath; break;
- }
- }
- }
- pImpl->bROEnabled = pROStates[0];
- pImpl->bROSecurity = pROStates[1];
- pImpl->bRONetAccess = pROStates[2];
- pImpl->bROUserClassPath = pROStates[3];
- }
-}
-
-SvtJavaOptions::~SvtJavaOptions()
-{
- delete pImpl;
-}
-
-void SvtJavaOptions::Commit()
-{
- pImpl->aExecItem.Commit();
-
- sal_Int32 nOrgCount = pImpl->aPropertyNames.getLength();
- Sequence< OUString > aNames(nOrgCount);
- Sequence< Any > aValues(nOrgCount);
- sal_Int32 nRealCount = 0;
-
- const Type& rType = ::getBooleanCppuType();
- for(int nProp = 0; nProp < nOrgCount; nProp++)
- {
- switch(nProp)
- {
- case 0:
- {
- if (!pImpl->bROEnabled)
- {
- aValues[nRealCount].setValue(&pImpl->bEnabled, rType);
- aNames[nRealCount] = pImpl->aPropertyNames[nProp];
- ++nRealCount;
- }
- }
- break;
- case 1:
- {
- if (!pImpl->bROSecurity)
- {
- aValues[nRealCount].setValue(&pImpl->bSecurity, rType);
- aNames[nRealCount] = pImpl->aPropertyNames[nProp];
- ++nRealCount;
- }
- }
- break;
- case 2:
- {
- if (!pImpl->bRONetAccess)
- {
- aValues[nRealCount] <<= pImpl->nNetAccess;
- aNames[nRealCount] = pImpl->aPropertyNames[nProp];
- ++nRealCount;
- }
- }
- break;
- case 3:
- {
- if (!pImpl->bROUserClassPath)
- {
- aValues[nRealCount] <<= pImpl->sUserClassPath;
- aNames[nRealCount] = pImpl->aPropertyNames[nProp];
- ++nRealCount;
- }
- }
- break;
- }
- }
- aValues.realloc(nRealCount);
- aNames.realloc(nRealCount);
- PutProperties(aNames,aValues);
-}
-
-sal_Bool SvtJavaOptions::IsEnabled() const
-{
- return pImpl->bEnabled;
-}
-
-sal_Bool SvtJavaOptions::IsSecurity()const
-{
- return pImpl->bSecurity;
-}
-
-sal_Int32 SvtJavaOptions::GetNetAccess() const
-{
- return pImpl->nNetAccess;
-}
-
-rtl::OUString& SvtJavaOptions::GetUserClassPath()const
-{
- return pImpl->sUserClassPath;
-}
-
-void SvtJavaOptions::SetEnabled(sal_Bool bSet)
-{
- OSL_ENSURE(!pImpl->bROEnabled, "SvtJavaOptions::SetEnabled()\nYou tried to write on a readonly value!\n");
- if(!pImpl->bROEnabled && pImpl->bEnabled != bSet)
- {
- pImpl->bEnabled = bSet;
- SetModified();
- }
-}
-
-void SvtJavaOptions::SetSecurity(sal_Bool bSet)
-{
- OSL_ENSURE(!pImpl->bROSecurity, "SvtJavaOptions::SetSecurity()\nYou tried to write on a readonly value!\n");
- if(!pImpl->bROSecurity && pImpl->bSecurity != bSet)
- {
- pImpl->bSecurity = bSet;
- SetModified();
- }
-}
-
-void SvtJavaOptions::SetNetAccess(sal_Int32 nSet)
-{
- OSL_ENSURE(!pImpl->bRONetAccess, "SvtJavaOptions::SetNetAccess()\nYou tried to write on a readonly value!\n");
- if(!pImpl->bRONetAccess && pImpl->nNetAccess != nSet)
- {
- pImpl->nNetAccess = nSet;
- SetModified();
- }
-}
-
-void SvtJavaOptions::SetUserClassPath(const rtl::OUString& rSet)
-{
- OSL_ENSURE(!pImpl->bROUserClassPath, "SvtJavaOptions::SetUserClassPath()\nYou tried to write on a readonly value!\n");
- if(!pImpl->bROUserClassPath && pImpl->sUserClassPath != rSet)
- {
- pImpl->sUserClassPath = rSet;
- SetModified();
- }
-}
-
-
-sal_Bool SvtJavaOptions::IsExecuteApplets() const
-{
- return pImpl->aExecItem.IsExecuteApplets();
-}
-
-void SvtJavaOptions::SetExecuteApplets(sal_Bool bSet)
-{
- if(!pImpl->aExecItem.IsReadOnly() && pImpl->aExecItem.IsExecuteApplets() != bSet)
- {
- pImpl->aExecItem.SetExecuteApplets(bSet);
- SetModified();
- }
-}
-
-sal_Bool SvtJavaOptions::IsReadOnly( EOption eOption ) const
-{
- sal_Bool bRO = sal_True;
- switch(eOption)
- {
- case E_ENABLED :
- bRO = pImpl->bROEnabled;
- break;
- case E_SECURITY :
- bRO = pImpl->bROSecurity;
- break;
- case E_NETACCESS :
- bRO = pImpl->bRONetAccess;
- break;
- case E_USERCLASSPATH :
- bRO = pImpl->bROUserClassPath;
- break;
- case E_EXECUTEAPPLETS :
- bRO = pImpl->aExecItem.IsReadOnly();
- break;
- }
- return bRO;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8ee1ec0743ce8bcfd152edffb1b35db9efdaa596
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 12:27:22 2011 +0200
callcatcher: Remove JavaChild
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5d3f7e0..7c9c9b3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -236,7 +236,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/dockwin \
vcl/source/window/floatwin \
vcl/source/window/introwin \
- vcl/source/window/javachild \
vcl/source/window/keycod \
vcl/source/window/keyevent \
vcl/source/window/menu \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index f45f2b9..a0e0902 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imgctrl.hxx,vcl/imgctrl.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/impdel.hxx,vcl/impdel.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/inputctx.hxx,vcl/inputctx.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/introwin.hxx,vcl/introwin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/javachild.hxx,vcl/javachild.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobdata.hxx,vcl/jobdata.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobset.hxx,vcl/jobset.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycodes.hxx,vcl/keycodes.hxx))
diff --git a/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx
deleted file mode 100644
index fae6b0e..0000000
--- a/vcl/inc/vcl/javachild.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_JAVACHILD_HXX
-#define _SV_JAVACHILD_HXX
-
-#include <vcl/dllapi.h>
-#include <vcl/syschild.hxx>
-
-// -------------------
-// - JavaChildWindow -
-// -------------------
-
-class VCL_DLLPUBLIC JavaChildWindow : public SystemChildWindow
-{
-public:
-
- JavaChildWindow( Window* pParent, WinBits nStyle = 0 );
- JavaChildWindow( Window* pParent, const ResId& rResId );
- ~JavaChildWindow();
-
- sal_IntPtr getParentWindowHandleForJava();
-
-private:
-
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE JavaChildWindow (const JavaChildWindow &);
- SAL_DLLPRIVATE JavaChildWindow & operator= (const JavaChildWindow &);
-};
-
-#endif // _SV_JAVACHILD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx
deleted file mode 100644
index 1f15019..0000000
--- a/vcl/source/window/javachild.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: javachild.cxx,v $
- * $Revision: 1.12 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-
-#include <vcl/javachild.hxx>
-
-// -------------------
-// - JavaChildWindow -
-// -------------------
-
-JavaChildWindow::JavaChildWindow( Window* pParent, WinBits nStyle ) :
- SystemChildWindow( pParent, nStyle )
-{
-}
-
-// -----------------------------------------------------------------------
-
-JavaChildWindow::JavaChildWindow( Window* pParent, const ResId& rResId ) :
- SystemChildWindow( pParent, rResId )
-{
-}
-
-// -----------------------------------------------------------------------
-
-JavaChildWindow::~JavaChildWindow()
-{
-}
-
-// -----------------------------------------------------------------------
-
-sal_IntPtr JavaChildWindow::getParentWindowHandleForJava()
-{
- return SystemChildWindow::GetParentWindowHandle( sal_True );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d4924f9e9cd8c7a845e4a9ea766db856d32d7f08
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 11:54:19 2011 +0200
callcatcher: remove unused methods
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 2328359..16c1c4e 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -56,7 +56,6 @@ namespace basegfx
double getLength() const { if(maLengthArray.size()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
double distanceToRelative(double fDistance) const;
- double relativeToDistance(double fRelative) const;
};
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
index 63b89a9..4fd89bf 100644
--- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
+++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
@@ -202,22 +202,6 @@ namespace basegfx
sense to use reserve(4) at the vector as preparation.
*/
void getAllExtremumPositions(::std::vector< double >& rResults) const;
-
- /** Get optimum-split position on this segment
-
- This method calculates the positions of all points of the segment
- that have the maximimum distance to the corresponding line from
- startpoint-endpoint. This helps to approximate the bezier curve
- with a minimum number of line segments
-
- @param fResults
- Result positions are in the range ]0.0 .. 1.0[
- Cubic beziers have at most two of these positions
-
- @return
- Returns the number of split positions found
- */
- int getMaxDistancePositions( double fResults[2]) const;
};
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx
index 4d72279..a0ee71d 100644
--- a/basegfx/inc/basegfx/vector/b3dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b3dvector.hxx
@@ -233,19 +233,6 @@ namespace basegfx
*/
B3DVector getPerpendicular(const B3DVector& rNormalizedVec) const;
- /** get the projection of this Vector on the given Plane
-
- @attention This only works if the given 3D Vector defining
- the Plane is normalized.
-
- @param rNormalizedPlane
- A normalized 3D Vector defining a Plane.
-
- @return
- The projected 3D Vector
- */
- B3DVector getProjectionOnPlane(const B3DVector& rNormalizedPlane) const;
-
/** Calculate the Scalar product
This method calculates the Scalar product between this
diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx
index e8f2e71..5f01af1 100644
--- a/basegfx/source/curve/b2dbeziertools.cxx
+++ b/basegfx/source/curve/b2dbeziertools.cxx
@@ -126,37 +126,6 @@ namespace basegfx
return (static_cast< double >(nIndex) + fLinearInterpolatedLength) / static_cast< double >(mnEdgeCount);
}
- double B2DCubicBezierHelper::relativeToDistance(double fRelative) const
- {
- if(fRelative <= 0.0)
- {
- return 0.0;
- }
-
- const double fLength(getLength());
-
- if(fTools::moreOrEqual(fRelative, 1.0))
- {
- return fLength;
- }
-
- // fRelative is in ]0.0 .. 1.0[
-
- if(1 == mnEdgeCount)
- {
- // not a bezier, linear edge
- return fRelative * fLength;
- }
-
- // fRelative is in ]0.0 .. 1.0[
- const double fIndex(fRelative * static_cast< double >(mnEdgeCount));
- double fIntIndex;
- const double fFractIndex(modf(fIndex, &fIntIndex));
- const sal_uInt32 nIntIndex(static_cast< sal_uInt32 >(fIntIndex));
- const double fStartDistance(nIntIndex ? maLengthArray[nIntIndex - 1] : 0.0);
-
- return fStartDistance + ((maLengthArray[nIntIndex] - fStartDistance) * fFractIndex);
- }
} // end of namespace basegfx
//////////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index 79e2e20..a7e1e9a 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -1042,65 +1042,6 @@ namespace basegfx
}
}
- int B2DCubicBezier::getMaxDistancePositions( double pResult[2]) const
- {
- // the distance from the bezier to a line through start and end
- // is proportional to (ENDx-STARTx,ENDy-STARTy)*(+BEZIERy(t)-STARTy,-BEZIERx(t)-STARTx)
- // this distance becomes zero for at least t==0 and t==1
- // its extrema that are between 0..1 are interesting as split candidates
- // its derived function has the form dD/dt = fA*t^2 + 2*fB*t + fC
- const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint);
- const double fA = (3 * (maControlPointA.getX() - maControlPointB.getX()) + aRelativeEndPoint.getX()) * aRelativeEndPoint.getY()
- - (3 * (maControlPointA.getY() - maControlPointB.getY()) + aRelativeEndPoint.getY()) * aRelativeEndPoint.getX();
- const double fB = (maControlPointB.getX() - 2 * maControlPointA.getX() + maStartPoint.getX()) * aRelativeEndPoint.getY()
- - (maControlPointB.getY() - 2 * maControlPointA.getY() + maStartPoint.getY()) * aRelativeEndPoint.getX();
- const double fC = (maControlPointA.getX() - maStartPoint.getX()) * aRelativeEndPoint.getY()
- - (maControlPointA.getY() - maStartPoint.getY()) * aRelativeEndPoint.getX();
-
- // test for degenerated case: order<2
- if( fTools::equalZero(fA) )
- {
- // test for degenerated case: order==0
- if( fTools::equalZero(fB) )
- return 0;
-
- // solving the order==1 polynomial is trivial
- pResult[0] = -fC / (2*fB);
-
- // test root and ignore it when it is outside the curve
- int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
- return nCount;
- }
-
- // derivative is polynomial of order 2
- // check if the polynomial has non-imaginary roots
- const double fD = fB*fB - fA*fC;
- if( fD >= 0.0 ) // TODO: is this test needed? geometrically not IMHO
- {
- // calculate first root (avoiding a numerically unstable subtraction)
- const double fS = sqrt(fD);
- const double fQ = -(fB + ((fB >= 0) ? +fS : -fS));
- pResult[0] = fQ / fA;
- // ignore root when it is outside the curve
- static const double fEps = 1e-9;
- int nCount = ((pResult[0] > fEps) && (pResult[0] < fEps));
-
- // ignore root multiplicity
- if( !fTools::equalZero(fD) )
- {
- // calculate the other root
- const double fRoot = fC / fQ;
- // ignore root when it is outside the curve
- if( (fRoot > fEps) && (fRoot < 1.0-fEps) )
- pResult[ nCount++ ] = fRoot;
- }
-
- return nCount;
- }
-
- return 0;
- }
-
} // end of namespace basegfx
// eof
diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx
index 4ced9d2..8e1da68 100644
--- a/basegfx/source/vector/b3dvector.cxx
+++ b/basegfx/source/vector/b3dvector.cxx
@@ -67,19 +67,6 @@ namespace basegfx
return aNew;
}
- B3DVector B3DVector::getProjectionOnPlane(const B3DVector& rNormalizedPlane) const
- {
- B3DVector aNew(*this);
- aNew = cross(aNew, rNormalizedPlane);
- aNew = cross(aNew, rNormalizedPlane);
-
- aNew.mfX = mfX - aNew.mfX;
- aNew.mfY = mfY - aNew.mfY;
- aNew.mfZ = mfZ - aNew.mfZ;
-
- return aNew;
- }
-
B3DVector& B3DVector::operator*=( const ::basegfx::B3DHomMatrix& rMat )
{
const double fTempX( rMat.get(0,0)*mfX + rMat.get(0,1)*mfY + rMat.get(0,2)*mfZ );
commit 6f0cfbd0cae30910de57deba18f125e5e3acf1be
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 26 11:26:01 2011 +0200
callcatcher: Remove unused SvxSearchConfig
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 08988c4..8b86704 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/config/ctloptions \
svl/source/config/itemholder2 \
svl/source/config/languageoptions \
- svl/source/config/srchcfg \
svl/source/filepicker/pickerhistory \
svl/source/filerec/filerec \
svl/source/items/aeitem \
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index c070c9e..364991d 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -103,7 +103,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/share
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx))
diff --git a/svl/inc/svl/srchcfg.hxx b/svl/inc/svl/srchcfg.hxx
deleted file mode 100644
index a1da416..0000000
--- a/svl/inc/svl/srchcfg.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_SRCHCFG_HXX
-#define _SVX_SRCHCFG_HXX
-
-#include <unotools/configitem.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <svl/svldllapi.h>
-
-//-----------------------------------------------------------------------------
-struct SvxSearchConfig_Impl;
-struct SvxSearchEngineData
-{
- rtl::OUString sEngineName;
-
- rtl::OUString sAndPrefix;
- rtl::OUString sAndSuffix;
- rtl::OUString sAndSeparator;
- sal_Int32 nAndCaseMatch;
-
- rtl::OUString sOrPrefix;
- rtl::OUString sOrSuffix;
- rtl::OUString sOrSeparator;
- sal_Int32 nOrCaseMatch;
-
- rtl::OUString sExactPrefix;
- rtl::OUString sExactSuffix;
- rtl::OUString sExactSeparator;
- sal_Int32 nExactCaseMatch;
-
- SvxSearchEngineData() :
- nAndCaseMatch(0),
- nOrCaseMatch(0),
- nExactCaseMatch(0){}
-
- sal_Bool operator==(const SvxSearchEngineData& rData);
-};
-class SVL_DLLPUBLIC SvxSearchConfig : public utl::ConfigItem
-{
- SvxSearchConfig_Impl* pImpl;
-
-public:
- SvxSearchConfig(sal_Bool bEnableNotify = sal_True);
- virtual ~SvxSearchConfig();
-
- void Load();
- virtual void Commit();
- virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-
- sal_uInt16 Count();
- const SvxSearchEngineData& GetData(sal_uInt16 nPos);
- const SvxSearchEngineData* GetData(const rtl::OUString& rEngineName);
- void SetData(const SvxSearchEngineData& rData);
- void RemoveData(const rtl::OUString& rEngineName);
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx
deleted file mode 100644
index abe150e..0000000
--- a/svl/source/config/srchcfg.cxx
+++ /dev/null
@@ -1,268 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-
-#include <svl/srchcfg.hxx>
-#include <svl/svarray.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <tools/debug.hxx>
-#include <unotools/configpathes.hxx>
-
-//-----------------------------------------------------------------------------
-using namespace utl;
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::beans;
-
-using ::rtl::OUString;
-
-#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
-
-//-----------------------------------------------------------------------------
-typedef SvxSearchEngineData* SvxSearchEngineDataPtr;
-SV_DECL_PTRARR_DEL(SvxSearchEngineArr, SvxSearchEngineDataPtr, 2, 2)
-SV_IMPL_PTRARR(SvxSearchEngineArr, SvxSearchEngineDataPtr);
-//-----------------------------------------------------------------------------
-struct SvxSearchConfig_Impl
-{
- SvxSearchEngineArr aEngineArr;
-};
-
-sal_Bool SvxSearchEngineData::operator==(const SvxSearchEngineData& rData)
-{
- return sEngineName == rData.sEngineName &&
- sAndPrefix == rData.sAndPrefix &&
- sAndSuffix == rData.sAndSuffix &&
- sAndSeparator == rData.sAndSeparator &&
- nAndCaseMatch == rData.nAndCaseMatch &&
- sOrPrefix == rData.sOrPrefix &&
- sOrSuffix == rData.sOrSuffix &&
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list