summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/dialogs/iconcdlg.cxx74
-rw-r--r--cui/source/inc/iconcdlg.hxx2
-rw-r--r--editeng/source/editeng/editdoc.hxx3
-rw-r--r--editeng/source/editeng/editdoc2.cxx11
-rw-r--r--svx/inc/svx/gallery.hxx3
-rw-r--r--svx/source/gallery2/galexpl.cxx15
-rw-r--r--unusedcode.easy7
-rw-r--r--vcl/inc/vcl/outdev.hxx4
-rwxr-xr-xvcl/source/gdi/outdev3.cxx12
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.cxx15
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.hxx18
11 files changed, 5 insertions, 159 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 99e0c6d7e7ce..519f3d186a89 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -336,72 +336,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
/**********************************************************************
|
-| remove page
-|
-\**********************************************************************/
-
-void IconChoiceDialog::RemoveTabPage( sal_uInt16 nId )
-{
- IconChoicePageData* pData = GetPageData ( nId );
-
- // remove page from list
- if ( pData )
- {
- for ( vector< IconChoicePageData* >::iterator i = maPageList.begin(); i < maPageList.end(); ++i )
- {
- if ( *i == pData )
- {
- maPageList.erase( i );
- break;
- }
- }
-
- // save settings
- if ( pData->pPage )
- {
- pData->pPage->FillUserData();
- String aPageData(pData->pPage->GetUserData());
- if ( aPageData.Len() )
- {
- SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) );
-
- SetViewOptUserItem( aTabPageOpt, aPageData );
- }
- }
-
- if ( pData->bOnDemand )
- delete ( SfxItemSet * )&( pData->pPage->GetItemSet() );
-
- delete pData->pPage;
- delete pData;
- }
-
- // remove Icon
- bool bFound = false;
- for ( sal_uLong i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++)
- {
- SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
- sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
-
- if ( *pUserData == nId )
- {
- delete pUserData;
- maIconCtrl.RemoveEntry ( pEntry );
- bFound = true;
- }
- }
-
- // was it the current page ?
- if ( nId == mnCurrentPageId )
- {
- mnCurrentPageId = maPageList.front()->nId;
- }
-
- Invalidate ();
-}
-
-/**********************************************************************
-|
| Paint-method
|
\**********************************************************************/
@@ -481,14 +415,6 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
// -----------------------------------------------------------------------
-void IconChoiceDialog::RemoveResetButton()
-{
- aResetBtn.Hide();
- bHideResetBtn = true;
-}
-
-// -----------------------------------------------------------------------
-
void IconChoiceDialog::ShowPage( sal_uInt16 nId )
{
bool bInvalidate = GetCurPageId() != nId;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index dde82a1686a8..c76a87b4b570 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -240,8 +240,6 @@ public :
void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
sal_uInt16 GetCurPageId() const { return mnCurrentPageId; }
void ShowPage( sal_uInt16 nId );
- void RemoveTabPage( sal_uInt16 nId );
- void RemoveResetButton();
// liefert ggf. per Map konvertierte lokale Slots
const sal_uInt16* GetInputRanges( const SfxItemPool& );
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index a8e29bc28454..b29c3a0608d1 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -653,9 +653,10 @@ public:
{ return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
sal_uInt16 GetPos( const ParaPortionPtr &rPtr ) const;
-
+#if OSL_DEBUG_LEVEL > 2
// temporary:
void DbgCheck( EditDoc& rDoc );
+#endif
};
// -------------------------------------------------------------------------
diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index abd8388800c0..332f49946496 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -379,13 +379,9 @@ sal_uInt16 ParaPortionList::FindParagraph( long nYOffset )
return 0xFFFF; // Should be reachable through EE_PARA_NOT_FOUND!
}
-void ParaPortionList::DbgCheck( EditDoc&
-#ifdef DBG_UTIL
- rDoc
-#endif
- )
+#if OSL_DEBUG_LEVEL > 2
+void ParaPortionList::DbgCheck( EditDoc& rDoc)
{
-#ifdef DBG_UTIL
DBG_ASSERT( Count() == rDoc.Count(), "ParaPortionList::DbgCheck() - Count() unequal!" );
for ( sal_uInt16 i = 0; i < Count(); i++ )
{
@@ -393,9 +389,8 @@ void ParaPortionList::DbgCheck( EditDoc&
DBG_ASSERT( GetObject(i)->GetNode(), "ParaPortionList::DbgCheck() - Null-Pointer in List(2)!" );
DBG_ASSERT( GetObject(i)->GetNode() == rDoc.GetObject(i), "ParaPortionList::DbgCheck() - Entries intersect!" );
}
-#endif
}
-
+#endif
ContentAttribsInfo::ContentAttribsInfo( const SfxItemSet& rParaAttribs ) :
aPrevParaAttribs( rParaAttribs)
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index eb2b604250fc..236216da4ff4 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -244,7 +244,6 @@ public:
const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
static sal_uIntPtr GetObjCount( const String& rThemeName );
- static sal_uIntPtr GetObjCount( sal_uIntPtr nThemeId );
static sal_Bool GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
@@ -266,8 +265,6 @@ public:
static sal_Bool EndLocking( const String& rThemeName );
static sal_Bool EndLocking( sal_uIntPtr nThemeId );
-
- static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
};
#endif // _GALLERY_HXX_
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index a107ea8a6b0d..ccf9b00d7535 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -253,14 +253,6 @@ sal_uIntPtr GalleryExplorer::GetObjCount( const String& rThemeName )
// ------------------------------------------------------------------------
-sal_uIntPtr GalleryExplorer::GetObjCount( sal_uIntPtr nThemeId )
-{
- Gallery* pGal = ImplGetGallery();
- return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
-}
-
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic, Bitmap* pThumb,
sal_Bool bProgress )
@@ -445,11 +437,4 @@ sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
-// -----------------------------------------------------------------------------
-
-sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
-{
- return SgaObjectSvDraw::DrawCentered( pOut, rModel );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index d2be88e13ac4..38bb9580601f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -145,8 +145,6 @@ GDIMetaFile::SaveStatus()
GDIMetaFile::Wind(unsigned long)
GDIMetaFile::WindEnd()
GDIMetaFile::WindNext()
-GalleryExplorer::DrawCentered(OutputDevice*, FmFormModel const&)
-GalleryExplorer::GetObjCount(unsigned long)
GraphCtrl::GraphCtrl(Window*, long)
Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point const&, Size const&)
Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
@@ -164,8 +162,6 @@ HeaderBar::InsertItem(unsigned short, Image const&, String const&, long, unsigne
HeaderBar::InsertItem(unsigned short, Image const&, long, unsigned short, unsigned short)
HeaderBar::SetHelpId(unsigned short, rtl::OString const&)
HeaderBar::SetHelpText(unsigned short, String const&)
-IconChoiceDialog::RemoveResetButton()
-IconChoiceDialog::RemoveTabPage(unsigned short)
ImageButton::ImageButton(unsigned short)
ImageList::Clear()
ImageList::RemoveImage(rtl::OUString const&)
@@ -272,7 +268,6 @@ Octree::AddColor(BitmapColor const&)
Octree::Octree(unsigned long)
OdtGeneratorPrivate::_writeBegin()
OutputDevice::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString)
-OutputDevice::GetFontSubstitute(unsigned short, String&, String&, unsigned short&)
OutputDevice::GetMinKashida(Font const&) const
OutputDevice::GetPixel(Polygon const&) const
OutputDevice::ImplFloatDevicePixelToLogicHeight(float) const
@@ -291,7 +286,6 @@ OutputDevice::PixelToLogic(basegfx::B2DPolyPolygon const&) const
OutputDevice::PixelToLogic(basegfx::B2DPolygon const&) const
PageSpan::getMarginLeft() const
PageSpan::getMarginRight() const
-ParaPortionList::DbgCheck(EditDoc&)
ParagraphObj::ParagraphObj(ParagraphObj&)
ParagraphStyleManager::get(WPXString const&) const
PathDialog::SetPath(Edit const&)
@@ -1207,7 +1201,6 @@ WrongRanges::_ForEach(unsigned short, unsigned short, unsigned char (*)(WrongRan
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
XFillExchangeData::RegisterClipboardFormatName()
-XMLAutoTextEventExport::XMLAutoTextEventExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, unsigned short)
XMLElement::Equals(rtl::OUString)
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter()
XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&)
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 6aacf92e2e5c..17b94dbab5c5 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -1157,10 +1157,6 @@ public:
sal_uInt16 nFlags = 0 );
static void RemoveFontSubstitute( sal_uInt16 n );
static sal_uInt16 GetFontSubstituteCount();
- static void GetFontSubstitute( sal_uInt16 n,
- XubString& rFontName,
- XubString& rReplaceFontName,
- sal_uInt16& rFlags );
static Font GetDefaultFont( sal_uInt16 nType,
LanguageType eLang,
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6cd8e34d8891..7c417554ce50 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -418,18 +418,6 @@ sal_uInt16 OutputDevice::GetFontSubstituteCount()
// -----------------------------------------------------------------------
-void OutputDevice::GetFontSubstitute( sal_uInt16 n,
- XubString& rFontName,
- XubString& rReplaceFontName,
- sal_uInt16& rFlags )
-{
- const ImplDirectFontSubstitution* pSubst = ImplGetSVData()->maGDIData.mpDirectFontSubst;
- if( pSubst )
- pSubst->GetFontSubstitute( n, rFontName, rReplaceFontName, rFlags );
-}
-
-// -----------------------------------------------------------------------
-
bool ImplDirectFontSubstitution::GetFontSubstitute( int nIndex,
String& rFontName, String& rSubstFontName, sal_uInt16& rFlags ) const
{
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index f83570e70ba4..690f4dcefc72 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -84,25 +84,10 @@ XMLAutoTextEventExport::XMLAutoTextEventExport(
{
}
-XMLAutoTextEventExport::XMLAutoTextEventExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const OUString& rFileName,
- const Reference<XDocumentHandler> & rHandler,
- const Reference<XModel> & rModel,
- const Reference<XNameAccess> & rEvents,
- sal_uInt16 /*nFlags*/ )
-: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, FUNIT_INCH),
- xEvents(rEvents),
- sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
- sNone(RTL_CONSTASCII_USTRINGPARAM("None"))
-{
-}
-
XMLAutoTextEventExport::~XMLAutoTextEventExport()
{
}
-
void XMLAutoTextEventExport::initialize(
const Sequence<Any> & rArguments )
throw(uno::Exception, uno::RuntimeException)
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 28cb956dee7e..f77e892a02f1 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -65,28 +65,10 @@ class XMLAutoTextEventExport : public SvXMLExport
public:
- // #110680#
- //XMLAutoTextEventExport();
XMLAutoTextEventExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, sal_uInt16 nFlags
);
- // #110680#
- //XMLAutoTextEventExport(
- // const ::rtl::OUString& rFileName,
- // const ::com::sun::star::uno::Reference<
- // ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
- // const ::com::sun::star::uno::Reference<
- // ::com::sun::star::frame::XModel > & rModel,
- // const ::com::sun::star::uno::Reference<
- // ::com::sun::star::container::XNameAccess > & rEvents);
- XMLAutoTextEventExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::rtl::OUString& rFileName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & rEvents, sal_uInt16 nFlags);
-
~XMLAutoTextEventExport();
// XInitialization
generated by cgit (git 2.34.1) at 2024-10-06 05:40:06 +0000