cui/source/customize/cfg.cxx | 56 --------------------
cui/source/inc/cfg.hxx | 2
editeng/inc/editeng/lcolitem.hxx | 1
editeng/source/items/textitem.cxx | 7 --
extensions/source/plugin/base/makefile.mk | 1
extensions/source/plugin/base/nfuncs.cxx | 38 ++++++-------
extensions/source/plugin/base/xplugin.cxx | 12 ++--
extensions/source/plugin/inc/plugin/plcom.hxx | 4 -
extensions/source/plugin/inc/plugin/unx/sysplug.hxx | 4 -
extensions/source/plugin/unx/npnapi.cxx | 6 +-
extensions/source/plugin/unx/nppapi.cxx | 6 +-
svtools/inc/svtools/ivctrl.hxx | 2
svtools/source/contnr/ivctrl.cxx | 8 --
svx/inc/svx/dlgctl3d.hxx | 1
svx/inc/svx/fntctrl.hxx | 2
svx/source/dialog/dlgctl3d.cxx | 11 ---
svx/source/dialog/fntctrl.cxx | 15 -----
unusedcode.easy | 13 ----
18 files changed, 35 insertions(+), 154 deletions(-)
New commits:
commit cfe3d74c60169b1b0ca010b31b8e5d705c0f58a7
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Nov 8 10:01:22 2011 +0000
fix build against new npapi.h
diff --git a/extensions/source/plugin/base/makefile.mk
b/extensions/source/plugin/base/makefile.mk
index 3049d9e..a7e28f8 100644
--- a/extensions/source/plugin/base/makefile.mk
+++ b/extensions/source/plugin/base/makefile.mk
@@ -37,7 +37,6 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
.IF "$(SOLAR_JAVA)" != ""
INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-CDEFS+=-DOJI
.ENDIF
.IF "$(WITH_MOZILLA)" != "NO"
diff --git a/extensions/source/plugin/base/nfuncs.cxx
b/extensions/source/plugin/base/nfuncs.cxx
index 571ead1..113aee5 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -96,6 +96,24 @@ using ::rtl::OUString;
using ::rtl::OString;
using ::rtl::OStringToOUString;
+// Move deprecated functions which no longer appear in npapi.h before
+// their use to avoid errors that they're undeclared at point of use
+extern "C"
+{
+ const JRIEnvInterface** SAL_CALL NP_LOADDS NPN_GetJavaEnv()
+ {
+ TRACE( "NPN_GetJavaEnv" );
+ // no java in this program
+ return NULL;
+ }
+
+ jref SAL_CALL NP_LOADDS NPN_GetJavaPeer( NPP /*instance*/ )
+ {
+ TRACE( "NPN_GetJavaPeer" );
+ return NULL;
+ }
+}
+
NPNetscapeFuncs aNPNFuncs =
{
sizeof( NPNetscapeFuncs ),
@@ -112,13 +130,8 @@ NPNetscapeFuncs aNPNFuncs =
NPN_MemFree,
NPN_MemFlush,
NPN_ReloadPlugins,
-#ifdef OJI
NPN_GetJavaEnv,
NPN_GetJavaPeer,
-#else
- 0,
- 0,
-#endif
NPN_GetURLNotify,
NPN_PostURLNotify,
NPN_GetValue,
@@ -238,21 +251,6 @@ extern "C" {
return NPERR_NO_ERROR;
}
- #ifdef OJI
- const JRIEnvInterface** SAL_CALL NP_LOADDS NPN_GetJavaEnv()
- {
- TRACE( "NPN_GetJavaEnv" );
- // no java in this program
- return NULL;
- }
-
- jref SAL_CALL NP_LOADDS NPN_GetJavaPeer( NPP /*instance*/ )
- {
- TRACE( "NPN_GetJavaPeer" );
- return NULL;
- }
- #endif
-
NPError SAL_CALL NP_LOADDS NPN_GetURL( NPP instance, const char* url,
const char* window )
{
TRACES( "NPN_GetURL", url );
diff --git a/extensions/source/plugin/base/xplugin.cxx
b/extensions/source/plugin/base/xplugin.cxx
index fd202ad..5573176 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -562,7 +562,7 @@ void XPlugin_Impl::loadPlugin()
m_aEncoding).getStr(),
getNPPInstance(),
m_aPluginMode == PluginMode::FULL ? NP_FULL : NP_EMBED,
- ::sal::static_int_cast< int16, int >( m_nArgs ),
+ ::sal::static_int_cast< int16_t, int >( m_nArgs ),
(char**)(m_nArgs ? m_pArgn : NULL),
(char**)(m_nArgs ? m_pArgv : NULL),
NULL );
@@ -595,8 +595,8 @@ void XPlugin_Impl::loadPlugin()
m_aNPWindow.clipRect.top = 0;
m_aNPWindow.clipRect.left = 0;
- m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16,
sal_Int32 >( aPosSize.Height );
- m_aNPWindow.clipRect.right = ::sal::static_int_cast< uint16,
sal_Int32 >( aPosSize.Width );
+ m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16_t,
sal_Int32 >( aPosSize.Height );
+ m_aNPWindow.clipRect.right = ::sal::static_int_cast< uint16_t,
sal_Int32 >( aPosSize.Width );
m_aNPWindow.type = NPWindowTypeWindow;
m_aNPWindow.x = 0;
@@ -742,7 +742,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString&
mimetype,
if( iter != m_aPEventListeners.end() )
pStream->getStream()->notifyData = (*iter)->getNotifyData();
- uint16 stype = 0;
+ uint16_t stype = 0;
// special handling acrobat reader
// presenting a seekable stream to it does not seem to work correctly
@@ -876,8 +876,8 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32
nY_, sal_Int32 nWidth_,
m_aNPWindow.height = nHeight_;
m_aNPWindow.clipRect.top = 0;
m_aNPWindow.clipRect.left = 0;
- m_aNPWindow.clipRect.right = ::sal::static_int_cast< uint16,
sal_Int32 >( nWidth_ );
- m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16,
sal_Int32 >( nHeight_ );
+ m_aNPWindow.clipRect.right = ::sal::static_int_cast< uint16_t,
sal_Int32 >( nWidth_ );
+ m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16_t,
sal_Int32 >( nHeight_ );
if( getPluginComm() )
getPluginComm()->NPP_SetWindow( this );
diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx
b/extensions/source/plugin/inc/plugin/plcom.hxx
index b23fc6c..7436a15 100644
--- a/extensions/source/plugin/inc/plugin/plcom.hxx
+++ b/extensions/source/plugin/inc/plugin/plcom.hxx
@@ -59,12 +59,12 @@ public:
virtual void* NPP_GetJavaClass() = 0;
virtual NPError NPP_Initialize() = 0;
virtual NPError NPP_New( NPMIMEType pluginType, NPP instance,
- uint16 mode, int16 argc,
+ uint16_t mode, int16_t argc,
char* argn[], char* argv[],
NPSavedData *saved ) = 0;
virtual NPError NPP_NewStream( NPP instance, NPMIMEType type,
NPStream* stream,
- NPBool seekable, uint16* stype ) = 0;
+ NPBool seekable, uint16_t* stype ) = 0;
virtual void NPP_Print( NPP instance, NPPrint* platformPrint ) = 0;
virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) = 0;
virtual void NPP_Shutdown() = 0;
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index df44c14..a10c688 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -56,11 +56,11 @@ public:
virtual void* NPP_GetJavaClass();
virtual NPError NPP_Initialize();
virtual NPError NPP_New( NPMIMEType pluginType, NPP instance,
- uint16 mode, int16 argc,
+ uint16_t mode, int16_t argc,
char* argn[], char* argv[], NPSavedData *saved );
virtual NPError NPP_NewStream( NPP instance, NPMIMEType type,
NPStream* stream,
- NPBool seekable, uint16* stype );
+ NPBool seekable, uint16_t* stype );
virtual void NPP_Print( NPP instance, NPPrint* platformPrint );
using PluginComm::NPP_SetWindow;
diff --git a/extensions/source/plugin/unx/npnapi.cxx
b/extensions/source/plugin/unx/npnapi.cxx
index c0cefa3..837a1f2 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -608,7 +608,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*,
/*pMediator*/ )
pStream->pdata = pStream->ndata = pStream->notifyData = NULL;
NPBool* pSeekable = (NPBool*)pMessage->GetBytes();
m_aNPWrapStreams.push_back( pStream );
- uint16 nStype = NP_ASFILE;
+ uint16_t nStype = NP_ASFILE;
NPError aRet = aPluginFuncs.newstream( instance, pType,
pStream,
*pSeekable, &nStype );
medDebug( 1, "pluginapp: NPP_NewStream( %p, %s, %p, %s, %p )
returns %d\n"
@@ -626,8 +626,8 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*,
/*pMediator*/ )
case eNPP_New:
{
char* pType = pMessage->GetString();
- uint16* pMode = (uint16*)pMessage->GetBytes();
- int16* pArgc = (int16*)pMessage->GetBytes();
+ uint16_t* pMode = (uint16_t*)pMessage->GetBytes();
+ int16_t* pArgc = (int16_t*)pMessage->GetBytes();
NPP instance = new NPP_t;
instance->pdata = instance->ndata = NULL;
sal_uLong nArgnBytes, nArgvBytes;
diff --git a/extensions/source/plugin/unx/nppapi.cxx
b/extensions/source/plugin/unx/nppapi.cxx
index add518c..34ce8f8 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -411,7 +411,7 @@ NPError UnxPluginComm::NPP_Initialize()
return aRet;
}
-NPError UnxPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16
mode, int16 argc,
+NPError UnxPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t
mode, int16_t argc,
char* argn[], char* argv[], NPSavedData *saved )
{
m_aInstances.push_back(
@@ -473,7 +473,7 @@ NPError UnxPluginComm::NPP_New( NPMIMEType pluginType, NPP
instance, uint16 mode
}
NPError UnxPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream*
stream,
- NPBool seekable, uint16* stype )
+ NPBool seekable, uint16_t* stype )
{
NPError aRet = NPERR_GENERIC_ERROR;
GET_INSTANCE_RET( aRet );
@@ -493,7 +493,7 @@ NPError UnxPluginComm::NPP_NewStream( NPP instance,
NPMIMEType type, NPStream* s
return NPERR_GENERIC_ERROR;
aRet = GetNPError( pMes );
- uint16* pSType = (uint16*)pMes->GetBytes();
+ uint16_t* pSType = (uint16_t*)pMes->GetBytes();
*stype = *pSType;
delete [] pSType;
commit 69a8f89cb90260b2333299451f29ffcdea39d059
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Nov 8 09:19:23 2011 +0000
refactor SetTwoLines a little
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 723c2fd..f625d6e 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -78,6 +78,8 @@ public:
void SetDrawBaseLine( sal_Bool bSet = sal_True );
void Paint( const Rectangle& );
+ sal_Bool IsTwoLines() const;
+ void SetTwoLines(sal_Bool bSet);
void SetNoLines(sal_Bool bSet);
void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd);
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 4c795fc..33971f8 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -760,7 +760,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
long nStdAscent = pImpl->nAscent;
nY += nStdAscent;
- if(pImpl->bTwoLines)
+ if (IsTwoLines())
{
SvxFont aSmallFont( rFont );
Size aOldSize = pImpl->aCJKFont.GetSize();
@@ -838,6 +838,16 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
}
}
+sal_Bool SvxFontPrevWindow::IsTwoLines() const
+{
+ return pImpl->bTwoLines;
+}
+
+void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet)
+{
+ pImpl->bTwoLines = bSet;
+}
+
void SvxFontPrevWindow::SetNoLines(sal_Bool bSet)
{
pImpl->bNoLines = bSet;
commit c52fbc04a9df0f2d894f11ef229d86dcf33edc7b
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Nov 8 08:59:04 2011 +0000
callcatcher: some unused methods
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5103e29..0fae48f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5697,60 +5697,4 @@ SvxIconChangeDialog::SvxIconChangeDialog(
aLineEditDescription.SetText(aMessage);
}
-BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long
aStandardSize)
-{
- Point aEmptyPoint(0,0);
- double imgposX = 0;
- double imgposY = 0;
- BitmapEx aRet = aBitmap;
- double imgOldWidth = aRet.GetSizePixel().Width();
- double imgOldHeight =aRet.GetSizePixel().Height();
-
- Size aScaledSize;
- if (imgOldWidth >= aStandardSize || imgOldHeight >= aStandardSize)
- {
- sal_Int32 imgNewWidth = 0;
- sal_Int32 imgNewHeight = 0;
-
- if (imgOldWidth >= imgOldHeight)
- {
- imgNewWidth = aStandardSize;
- imgNewHeight = sal_Int32(imgOldHeight / (imgOldWidth /
aStandardSize) + 0.5);
- imgposX = 0;
- imgposY = (aStandardSize - (imgOldHeight / (imgOldWidth /
aStandardSize) + 0.5)) / 2 + 0.5;
- }
- else
- {
- imgNewHeight = aStandardSize;
- imgNewWidth = sal_Int32(imgOldWidth / (imgOldHeight /
aStandardSize) + 0.5);
- imgposY = 0;
- imgposX = (aStandardSize - (imgOldWidth / (imgOldHeight /
aStandardSize) + 0.5)) / 2 + 0.5;
- }
-
- aScaledSize = Size( imgNewWidth, imgNewHeight );
- aRet.Scale( aScaledSize, BMP_SCALE_INTERPOLATE );
- }
- else
- {
- imgposX = (aStandardSize - imgOldWidth) / 2 + 0.5;
- imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5;
- }
-
- Size aStdSize( aStandardSize, aStandardSize );
- Rectangle aRect(aEmptyPoint, aStdSize );
-
- VirtualDevice aVirDevice( *Application::GetDefaultDevice(), 0, 1 );
- aVirDevice.SetOutputSizePixel( aStdSize );
- aVirDevice.SetFillColor( COL_TRANSPARENT );
- aVirDevice.SetLineColor( COL_TRANSPARENT );
-
- //draw a rect into virDevice
- aVirDevice.DrawRect( aRect );
- Point aPointPixel( (long)imgposX, (long)imgposY );
- aVirDevice.DrawBitmapEx( aPointPixel, aRet );
- aRet = aVirDevice.GetBitmapEx( aEmptyPoint, aStdSize );
-
- return aRet;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 9bb95b6..037a68c 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -764,8 +764,6 @@ private:
void ImportGraphics(
const com::sun::star::uno::Sequence< rtl::OUString >& aURLs );
- BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);
-
public:
SvxIconSelectorDialog(
diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index f8561b9..5af82bc 100644
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -44,7 +44,6 @@ public:
TYPEINFO();
SvxLineColorItem( const sal_uInt16 nId );
- SvxLineColorItem( const Color& aColor, const sal_uInt16 nId );
SvxLineColorItem( const SvxLineColorItem& rCopy );
~SvxLineColorItem();
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index ba0d20b..1fab939 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2770,13 +2770,6 @@ SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId
) :
// -----------------------------------------------------------------------
-SvxLineColorItem::SvxLineColorItem( const Color& rCol, const sal_uInt16 nId ) :
- SvxColorItem( rCol, nId )
-{
-}
-
-// -----------------------------------------------------------------------
-
SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) :
SvxColorItem( rCopy )
{
diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx
index ba3daee..8abaae6 100644
--- a/svtools/inc/svtools/ivctrl.hxx
+++ b/svtools/inc/svtools/ivctrl.hxx
@@ -147,8 +147,6 @@ public:
sal_Bool IsCursored() const { return (sal_Bool)((nFlags
& ICNVIEW_FLAG_CURSORED) !=0); }
sal_Bool IsDropTarget() const { return
(sal_Bool)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
sal_Bool IsBlockingEmphasis() const { return
(sal_Bool)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
- sal_Bool WasMoved() const { return (sal_Bool)((nFlags &
ICNVIEW_FLAG_POS_MOVED) !=0); }
- void SetMoved( sal_Bool bMoved );
sal_Bool IsPosLocked() const { return
(sal_Bool)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
void LockPos( sal_Bool bLock );
// Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per
SvxIconChoiceCtrl::GetPredecessorHead
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 7f1b374..b16ebc4 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -64,14 +64,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( sal_uInt16
_nFlags )
pflink = 0;
}
-void SvxIconChoiceCtrlEntry::SetMoved( sal_Bool bMoved )
-{
- if( bMoved )
- nFlags |= ICNVIEW_FLAG_POS_MOVED;
- else
- nFlags &= ~ICNVIEW_FLAG_POS_MOVED;
-}
-
void SvxIconChoiceCtrlEntry::LockPos( sal_Bool bLock )
{
if( bLock )
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index 2f910dd..63161b1 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -176,7 +176,6 @@ private:
public:
SvxLightCtl3D( Window* pParent, const ResId& rResId);
- SvxLightCtl3D( Window* pParent, WinBits nStyle = 0);
~SvxLightCtl3D();
// react to size changes
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 6a5c32f..723c2fd 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -57,7 +57,6 @@ private:
SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont);
public:
- SvxFontPrevWindow( Window* pParent );
SvxFontPrevWindow( Window* pParent, const ResId& rId );
virtual ~SvxFontPrevWindow();
@@ -77,11 +76,8 @@ public:
void SetBackColor( const Color& rColor );
void UseResourceText( sal_Bool bUse = sal_True );
void SetDrawBaseLine( sal_Bool bSet = sal_True );
- void SetPreviewBackgroundToCharacter( sal_Bool bSet =
sal_True );
void Paint( const Rectangle& );
- sal_Bool IsTwoLines() const;
- void SetTwoLines(sal_Bool bSet);
void SetNoLines(sal_Bool bSet);
void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd);
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 09df1e8..04f0344 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -996,17 +996,6 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const
ResId& rResId)
Init();
}
-SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle )
-: Control(pParent, nStyle),
- maLightControl(this, 0),
- maHorScroller(this, WB_HORZ | WB_DRAG),
- maVerScroller(this, WB_VERT | WB_DRAG),
- maSwitcher(this, 0)
-{
- // init members
- Init();
-}
-
void SvxLightCtl3D::Init()
{
// #i58240# set HelpIDs for scrollbars and switcher
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index c9548d9..4c795fc 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -520,12 +520,6 @@ void SvxFontPrevWindow::Init()
SetBorderStyle( WINDOW_BORDER_MONO );
}
-SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent ) :
- Window( pParent )
-{
- Init();
-}
-
SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
Window( pParent, rId )
{
@@ -654,13 +648,6 @@ void SvxFontPrevWindow::SetDrawBaseLine( sal_Bool bSet )
// -----------------------------------------------------------------------
-void SvxFontPrevWindow::SetPreviewBackgroundToCharacter(sal_Bool bSet)
-{
- pImpl->bPreviewBackgroundToCharacter = bSet;
-}
-
-// -----------------------------------------------------------------------
-
void SvxFontPrevWindow::Paint( const Rectangle& )
{
Printer* pPrinter = pImpl->pPrinter;
@@ -851,16 +838,6 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
}
}
-sal_Bool SvxFontPrevWindow::IsTwoLines() const
-{
- return pImpl->bTwoLines;
-}
-
-void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet)
-{
- pImpl->bTwoLines = bSet;
-}
-
void SvxFontPrevWindow::SetNoLines(sal_Bool bSet)
{
pImpl->bNoLines = bSet;
diff --git a/unusedcode.easy b/unusedcode.easy
index f3513fe..e3e59cb 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -58,15 +58,10 @@ CalendarWrapper::setFirstDayOfWeek(short)
CalendarWrapper::setMinimumNumberOfDaysForFirstWeek(short)
CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
const&)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed
char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
-CharClass::isAlpha(String const&) const
-CharClass::isAlphaNumeric(String const&) const
-CharClass::isAsciiAlphaNumeric(String const&)
-CharClass::toLower(rtl::OUString&) const
CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short,
unsigned short)
CharPosArray::Replace(int const&, unsigned short)
CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int
const&, void*), void*)
-CloneList::Count() const
Color::IncreaseContrast(unsigned char)
ComboBox::SetTopEntry(unsigned short)
CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short)
@@ -928,10 +923,6 @@ SvxEditSourceHint::SetEndValue(unsigned long)
SvxEditSourceHint::SetStartValue(unsigned long)
SvxEditSourceHint::SetValue(unsigned long)
SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short,
unsigned short) const
-SvxFontPrevWindow::IsTwoLines() const
-SvxFontPrevWindow::SetNoLines(unsigned char)
-SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char)
-SvxFontPrevWindow::SvxFontPrevWindow(Window*)
SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*)
SvxGraphCtrlAccessibleContext::checkChildIndex(long)
@@ -942,13 +933,9 @@ SvxHtmlOptions::RemoveListenerLink(Link const&)
SvxHyperlinkTabPageBase::FileExists(INetURLObject const&)
SvxIMapDlg::GetTargetList() const
SvxIconChoiceCtrlEntry::LockPos(unsigned char)
-SvxIconChoiceCtrlEntry::SetMoved(unsigned char)
-SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long)
SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
-SvxLightCtl3D::SvxLightCtl3D(Window*, long)
-SvxLineColorItem::SvxLineColorItem(Color const&, unsigned short)
SvxListBoxControl::RegisterControl(unsigned short, SfxModule*)
SvxMSDffManager::GetAutoForm(MSO_SPT) const
SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
