[Libreoffice-commits] .: 4 commits - basic/source connectivity/source l10ntools/inc l10ntools/source sd/source solenv/inc svl/inc svl/source svtools/inc svtools/source sw/source toolkit/inc toolkit/source tools/inc tools/source unusedcode.easy vcl/inc vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Feb 16 02:32:29 PST 2012
basic/source/comp/exprtree.cxx | 17 --
basic/source/inc/expr.hxx | 1
connectivity/source/drivers/odbcbase/OConnection.cxx | 105 -----------------
connectivity/source/inc/odbc/OConnection.hxx | 1
l10ntools/inc/export.hxx | 7 -
l10ntools/source/export2.cxx | 108 ------------------
sd/source/filter/eppt/pptx-text.cxx | 19 +--
sd/source/filter/eppt/text.hxx | 12 +-
solenv/inc/settings.mk | 2
svl/inc/svl/style.hxx | 8 +
svl/source/items/style.cxx | 8 -
svtools/inc/svtools/fmtfield.hxx | 1
svtools/inc/svtools/svmedit.hxx | 1
svtools/source/control/fmtfield.cxx | 14 --
svtools/source/edit/svmedit.cxx | 6 -
sw/source/ui/config/usrpref.cxx | 112 +++++++++----------
toolkit/inc/toolkit/controls/unocontrols.hxx | 1
toolkit/source/controls/unocontrols.cxx | 36 ------
tools/inc/tools/multisel.hxx | 1
tools/source/memtools/multisel.cxx | 17 --
unusedcode.easy | 32 +----
vcl/inc/unx/gtk/gtkframe.hxx | 2
vcl/unx/gtk/window/gtkframe.cxx | 6 -
23 files changed, 90 insertions(+), 427 deletions(-)
New commits:
commit d294b52d8def55964cd34e02dc8b2c2319fb031b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 16 10:31:28 2012 +0000
-Werror in dmake modules went missing
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 65751eb..b6de4bb 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1196,7 +1196,7 @@ CFLAGSCXX+=$(CFLAGSWARNCXX)
CFLAGSCC+=$(CFLAGSWALLCC)
CFLAGSCXX+=$(CFLAGSWALLCXX)
.ENDIF
-.IF "$(COMPILER_WARN_ERRORS)"!="" && "$(EXTERNAL_WARNINGS_NOT_ERRORS)"==""
+.IF "$(COMPILER_WARN_ERRORS)"!="" && "$(EXTERNAL_WARNINGS_NOT_ERRORS)"=="FALSE"
CFLAGSCC+=$(CFLAGSWERRCC)
CFLAGSCXX+=$(CFLAGSWERRCXX)
.ENDIF
commit 08c475bb24a34f3a6a3f08e8490b521e8dcc96be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 16 09:48:05 2012 +0000
callcatcher: update unused code list
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index ef4ee5d..02db392 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -720,23 +720,6 @@ SbiExprNode* SbiExpression::VBA_Not()
return pNd;
}
-SbiExprNode* SbiExpression::VBA_And()
-{
- SbiExprNode* pNd = VBA_Not();
- if( m_eMode != EXPRMODE_EMPTY_PAREN )
- {
- for( ;; )
- {
- SbiToken eTok = pParser->Peek();
- if( eTok != AND )
- break;
- eTok = pParser->Next();
- pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Not() );
- }
- }
- return pNd;
-}
-
SbiExprNode* SbiExpression::Like()
{
SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp();
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index eb03504..4830a9c 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -189,7 +189,6 @@ protected:
SbiExprNode* Cat();
SbiExprNode* Like();
SbiExprNode* VBA_Not();
- SbiExprNode* VBA_And();
SbiExprNode* Comp();
SbiExprNode* Boolean();
public:
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 04df960..323e9d2 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -495,111 +495,6 @@ Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException)
void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException)
{
}
-//--------------------------------------------------------------------
-void OConnection::buildTypeInfo() throw( SQLException)
-{
- ::osl::MutexGuard aGuard( m_aMutex );
-
- Reference< XResultSet> xRs = getMetaData ()->getTypeInfo ();
- if(xRs.is())
- {
- Reference< XRow> xRow(xRs,UNO_QUERY);
- // Information for a single SQL type
-
- ::connectivity::ORowSetValue aValue;
- ::std::vector<sal_Int32> aTypes;
- Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
- sal_Int32 nCount = xResultSetMetaData->getColumnCount();
- // Loop on the result set until we reach end of file
- while (xRs->next ())
- {
- OTypeInfo aInfo;
- sal_Int32 nPos = 1;
- if ( aTypes.empty() )
- {
- if ( nCount < 1 )
- nCount = 18;
- aTypes.reserve(nCount+1);
- aTypes.push_back(-1);
- for (sal_Int32 j = 1; j <= nCount ; ++j)
- aTypes.push_back(xResultSetMetaData->getColumnType(j));
- }
-
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.aTypeName = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.nType = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.nPrecision = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.aLiteralPrefix = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.aLiteralSuffix = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.aCreateParams = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.bCaseSensitive = (sal_Bool)aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.nSearchType = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.bUnsigned = (sal_Bool)aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.bCurrency = (sal_Bool)aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.bAutoIncrement = (sal_Bool)aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.aLocalTypeName = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.nMinimumScale = aValue;
- ++nPos;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.nMaximumScale = aValue;
- if ( nCount >= 18 )
- {
- nPos = 18;
- aValue.fill(nPos,aTypes[nPos],xRow);
- aInfo.nNumPrecRadix = aValue;
- }
-
- // check if values are less than zero like it happens in a oracle jdbc driver
- if( aInfo.nPrecision < 0)
- aInfo.nPrecision = 0;
- if( aInfo.nMinimumScale < 0)
- aInfo.nMinimumScale = 0;
- if( aInfo.nMaximumScale < 0)
- aInfo.nMaximumScale = 0;
- if( aInfo.nNumPrecRadix < 0)
- aInfo.nNumPrecRadix = 10;
-
- // Now that we have the type info, save it
- // in the Hashtable if we don't already have an
- // entry for this SQL type.
-
- m_aTypeInfo.push_back(aInfo);
- }
-
- // Close the result set/statement.
-
- Reference< XCloseable> xClose(xRs,UNO_QUERY);
- if(xClose.is())
- xClose->close();
- }
-}
//------------------------------------------------------------------------------
void OConnection::disposing()
{
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index c5dbe64..8bf121e 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -152,7 +152,6 @@ namespace connectivity
// close and free the handle and set it to SQL_NULLHANDLE
void freeStatementHandle(SQLHANDLE& _pHandle);
- void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException);
const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; }
};
}
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 2355f5b..c669a3b 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -304,20 +304,13 @@ public:
static void RemoveUTF8ByteOrderMarker( rtl::OString &rString );
static bool hasUTF8ByteOrderMarker( const rtl::OString &rString );
static rtl::OString QuoteHTML( rtl::OString const &rString );
- static bool CopyFile(const rtl::OString& rSource , const rtl::OString& rDest);
static rtl::OString UnquoteHTML( rtl::OString const &rString );
- static const char* GetEnv( const char *pVar );
-
static bool isSourceLanguage(const rtl::OString &rLanguage);
static bool isAllowed(const rtl::OString &rLanguage);
static void Languages( std::vector<rtl::OString>::const_iterator& begin , std::vector<rtl::OString>::const_iterator& end );
- static rtl::OString getRandomName(const rtl::OString& rPrefix, const rtl::OString & sPostfix);
- static void getCurrentDir( std::string& dir );
-
- static rtl::OString GetNativeFile( rtl::OString const & sSource );
static void DumpExportList(const rtl::OString& rListName,
ExportList& aList);
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index bad5964..1341c41 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -205,49 +205,6 @@ bool Export::hasUTF8ByteOrderMarker( const rtl::OString &rString )
rString[1] == '\xBB' && rString[2] == '\xBF' ;
}
-bool Export::CopyFile(const rtl::OString& rSource, const rtl::OString& rDest)
-{
- const int BUFFERSIZE = 8192;
- char buf[ BUFFERSIZE ];
-
- FILE* IN_FILE = fopen( rSource.getStr() , "r" );
- if( IN_FILE == NULL )
- {
- std::cerr << "Export::CopyFile WARNING: Could not open " << rSource.getStr() << "\n";
- return false;
- }
-
- FILE* OUT_FILE = fopen( rDest.getStr() , "w" );
- if( OUT_FILE == NULL )
- {
- std::cerr << "Export::CopyFile WARNING: Could not open/create " << rDest.getStr() << " for writing\n";
- fclose( IN_FILE );
- return false;
- }
-
- while( fgets( buf , BUFFERSIZE , IN_FILE ) != NULL )
- {
- if( fputs( buf , OUT_FILE ) == EOF )
- {
- std::cerr << "Export::CopyFile WARNING: Write problems " << rSource.getStr() << "\n";
- fclose( IN_FILE );
- fclose( OUT_FILE );
- return false;
- }
- }
- if( ferror( IN_FILE ) )
- {
- std::cerr << "Export::CopyFile WARNING: Read problems " << rDest.getStr() << "\n";
- fclose( IN_FILE );
- fclose( OUT_FILE );
- return false;
- }
- fclose ( IN_FILE );
- fclose ( OUT_FILE );
-
- return true;
-}
-
/*****************************************************************************/
rtl::OString Export::UnquoteHTML( rtl::OString const &rString )
/*****************************************************************************/
@@ -332,69 +289,4 @@ void Export::InitForcedLanguages( bool bMergeMode ){
while ( nIndex >= 0 );
}
-/*****************************************************************************/
-rtl::OString Export::GetNativeFile( rtl::OString const & sSource )
-/*****************************************************************************/
-{
- //TODO: Drop this completely unless line end conversion *is* an issue
- return sSource;
-}
-
-const char* Export::GetEnv( const char *pVar )
-{
- char *pRet = getenv( pVar );
- if ( !pRet )
- pRet = 0;
- return pRet;
-}
-
-void Export::getCurrentDir( std::string& dir )
-{
- char buffer[64000];
- if( getcwd( buffer , sizeof( buffer ) ) == 0 ){
- std::cerr << "Error: getcwd failed!\n";
- exit( -1 );
- }
- dir = std::string( buffer );
-}
-
-
-// Stolen from sal/osl/unx/tempfile.c
-
-#define RAND_NAME_LENGTH 6
-
-rtl::OString Export::getRandomName(const rtl::OString& rPrefix, const rtl::OString& rPostfix)
-{
- static const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
- static const int COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1;
-
- rtl::OStringBuffer sRandStr(rPrefix);
-
- static sal_uInt64 value;
- char buffer[RAND_NAME_LENGTH];
-
- TimeValue tv;
- sal_uInt64 v;
- int i;
-
- osl_getSystemTime( &tv );
- oslProcessInfo proInfo;
- proInfo.Size = sizeof(oslProcessInfo);
- osl_getProcessInfo( 0 , osl_Process_IDENTIFIER , &proInfo );
-
- value += ((sal_uInt64) ( tv.Nanosec / 1000 ) << 16) ^ ( tv.Nanosec / 1000 ) ^ proInfo.Ident;
-
- v = value;
-
- for (i = 0; i < RAND_NAME_LENGTH; ++i)
- {
- buffer[i] = LETTERS[v % COUNT_OF_LETTERS];
- v /= COUNT_OF_LETTERS;
- }
-
- sRandStr.append(buffer , RAND_NAME_LENGTH);
- sRandStr.append(rPostfix);
- return sRandStr.makeStringAndClear();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 02e4a12..5fe0d0b 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -84,7 +84,9 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from:
class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
{
+private:
friend class SfxStyleSheetBasePool;
+ SVL_DLLPRIVATE static SfxStyleSheetBasePool& implGetStaticPool();
protected:
SfxStyleSheetBasePool& rPool; // zugehoeriger Pool
@@ -100,7 +102,11 @@ protected:
sal_Bool bMySet; // sal_True: Set loeschen im dtor
- SfxStyleSheetBase(); // do not use!
+ SfxStyleSheetBase() // do not use!
+ : comphelper::OWeakTypeObject()
+ , rPool( implGetStaticPool() )
+ {
+ }
SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, sal_uInt16 mask );
SfxStyleSheetBase( const SfxStyleSheetBase& );
virtual ~SfxStyleSheetBase();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index c3e11e1..2b38080 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -146,7 +146,7 @@ SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r )
pSet = NULL;
}
-static SfxStyleSheetBasePool& implGetStaticPool()
+SfxStyleSheetBasePool& SfxStyleSheetBase::implGetStaticPool()
{
static SfxStyleSheetBasePool* pSheetPool = 0;
static SfxItemPool* pBasePool = 0;
@@ -159,12 +159,6 @@ static SfxStyleSheetBasePool& implGetStaticPool()
return *pSheetPool;
}
-SfxStyleSheetBase::SfxStyleSheetBase()
-: comphelper::OWeakTypeObject()
-, rPool( implGetStaticPool() )
-{
-}
-
SfxStyleSheetBase::~SfxStyleSheetBase()
{
#ifdef DBG_UTIL
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index a3e53c8..fdbf251 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -200,7 +200,6 @@ public:
public:
virtual void SetText( const XubString& rStr );
virtual void SetText( const XubString& rStr, const Selection& rNewSelection );
- void SetValidateText(const XubString& rText, const String* pErrorText = NULL);
// die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt
/** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index 5ff8ab4..eb855da 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -89,7 +89,6 @@ public:
virtual sal_Bool IsReadOnly() const;
void EnableFocusSelectionHide( sal_Bool bHide );
- sal_Bool IsFocusSelectionHideEnabled() const;
virtual void SetMaxTextLen( xub_StrLen nMaxLen = 0 );
virtual xub_StrLen GetMaxTextLen() const;
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 821e9d8..3c8e302 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -398,20 +398,6 @@ FormattedField::~FormattedField()
}
//------------------------------------------------------------------------------
-void FormattedField::SetValidateText(const XubString& rText, const String* pErrorText)
-{
- DBG_CHKTHIS(FormattedField, NULL);
-
- if (CheckText(rText))
- SetText(rText);
- else
- if (pErrorText)
- ImplSetTextImpl(*pErrorText, NULL);
- else
- ImplSetValue(m_dDefaultValue, sal_True);
-}
-
-//------------------------------------------------------------------------------
void FormattedField::SetText(const XubString& rStr)
{
DBG_CHKTHIS(FormattedField, NULL);
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 267a203..640f05a 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1575,12 +1575,6 @@ void MultiLineEdit::EnableFocusSelectionHide( sal_Bool bHide )
pImpSvMEdit->GetTextWindow()->SetAutoFocusHide( bHide );
}
-sal_Bool MultiLineEdit::IsFocusSelectionHideEnabled() const
-{
- return pImpSvMEdit->GetTextWindow()->IsAutoFocusHide();
-}
-
-
void MultiLineEdit::SetLeftMargin( sal_uInt16 n )
{
if ( GetTextEngine() )
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 2ed2cf7..5f77c4a 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -236,7 +236,6 @@ private:
bool mbAdjustingGraphic;
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
- ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
protected:
GraphicControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index fa765d3..4dc6628 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -581,42 +581,6 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
- uno::Reference< graphic::XGraphic > GraphicControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
- {
- uno::Reference< graphic::XGraphic > xGraphic;
-
- if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) )
- {
- // graphic manager uniqueid
- rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
- // get the DefaultContext
- mxGrfObj = graphic::GraphicObject::createWithId( maContext.getUNOContext(), sID );
- }
- else // linked
- mxGrfObj = NULL; // release the GraphicObject
-
- if ( _rURL.isEmpty() )
- return xGraphic;
-
- try
- {
- uno::Reference< graphic::XGraphicProvider > xProvider;
- if ( maContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
- {
- uno::Sequence< beans::PropertyValue > aMediaProperties(1);
- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
- aMediaProperties[0].Value <<= _rURL;
- xGraphic = xProvider->queryGraphic( aMediaProperties );
- }
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
-
- return xGraphic;
- }
-
void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
{
UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 8410019..4ff077f 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -64,7 +64,6 @@ private:
TOOLS_DLLPRIVATE size_t ImplFindSubSelection( long nIndex ) const;
TOOLS_DLLPRIVATE sal_Bool ImplMergeSubSelections( size_t nPos1, size_t nPos2 );
TOOLS_DLLPRIVATE long ImplFwdUnselected();
- TOOLS_DLLPRIVATE long ImplBwdUnselected();
#endif
public:
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index fd61bcb..79f6662 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -539,23 +539,6 @@ long MultiSelection::ImplFwdUnselected()
// -----------------------------------------------------------------------
-long MultiSelection::ImplBwdUnselected()
-{
- if ( !bCurValid )
- return SFX_ENDOFSELECTION;
-
- if ( aSels[ nCurSubSel ]->Max() < nCurIndex )
- return nCurIndex;
-
- nCurIndex = aSels[ nCurSubSel-- ]->Min() - 1;
- if ( nCurIndex >= 0 )
- return nCurIndex;
- else
- return SFX_ENDOFSELECTION;
-}
-
-// -----------------------------------------------------------------------
-
long MultiSelection::FirstSelected( sal_Bool bInverse )
{
bInverseCur = bInverse;
diff --git a/unusedcode.easy b/unusedcode.easy
index b65437f..3dd0f66 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,8 +5,6 @@ CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
Dialog::Dialog(Window*, ResId const&)
DirEntry::SetBase(String const&, char)
-Export::GetNativeFile(rtl::OString const&)
-Export::getCurrentDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
@@ -18,11 +16,8 @@ FmFormObj::getType() const
FmPropBrwMgr::GetChildWindowId()
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
FontStyleBox::FontStyleBox(Window*, long)
-FormattedField::SetValidateText(String const&, String const*)
FuncData::FuncData(rtl::OUString const&)
GraphCtrl::GraphCtrl(Window*, long)
-GtkSalFrame::popIgnoreDamage()
-GtkSalFrame::pushIgnoreDamage()
HTMLControls::Insert(HTMLControl const*&, unsigned short&)
HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
@@ -42,17 +37,15 @@ MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
MSDffImportRecords::Remove(unsigned short, unsigned short)
MSFilterTracer::SetProperty(rtl::OUString const&, com::sun::star::uno::Any const&)
MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>)
-MachineSettings::CopyData()
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
MenuBar::MenuBar(ResId const&)
+MergeData::Dump()
MultiLineEdit::GetHScrollBar() const
MultiLineEdit::GetLeftMargin() const
MultiLineEdit::GetTextLines() const
-MultiLineEdit::IsFocusSelectionHideEnabled() const
NfCurrencyEntry::NfCurrencyEntry()
-NotificationSettings::CopyData()
NumberFormatCodeWrapper::getDefault(short, short) const
NumericBox::GetValue(unsigned short) const
NumericBox::GetValuePos(long) const
@@ -63,7 +56,6 @@ OLEObjCache::SetSize(unsigned long)
ORegKey::acquireKey(void*)
OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const
-ParagraphObj::ParagraphObj(ParagraphObj&)
ParagraphStyleManager::get(WPXString const&) const
PluginConnector::getInstance(_NPP*)
PluginConnector::getInstanceById(unsigned int)
@@ -166,6 +158,7 @@ SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
SectReprArr::Remove(SectRepr* const&, unsigned short)
SectReprArr::Remove(unsigned short, unsigned short)
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+SetOfByte::GetSetCount() const
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxApplication::Main()
SfxBrushItemLink::Set(SfxBrushItemLink*)
@@ -601,7 +594,7 @@ XWindowItem::XWindowItem(unsigned short, Window*)
XWindowItem::XWindowItem(unsigned short, com::sun::star::uno::Reference<com::sun::star::awt::XWindow>&)
XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
XclExpName::IsHidden() const
-XclExpPivotCache::GetFieldAcc(String const&)
+XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFormatRun> > const&)
XclRoot::GetDatabaseRanges() const
XclRoot::GetPixelXFromHmm(int) const
@@ -718,7 +711,6 @@ binfilter::B3dEntityBucketMemArr::Replace(char const*&, unsigned short)
binfilter::B3dEntityBucketMemArr::Replace(char const**, unsigned short, unsigned short)
binfilter::B3dEntityBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
binfilter::ByteString::Append(char)
-binfilter::ByteString::Assign(char const*, unsigned short)
binfilter::ByteString::Assign(char)
binfilter::ByteString::ByteString(char const*, unsigned short)
binfilter::ByteString::CompareIgnoreCaseToAscii(char const*, unsigned short) const
@@ -1148,10 +1140,6 @@ connectivity::mozab::OCatalog::getDot()
connectivity::mozab::OPreparedStatement::checkParameterIndex(int)
connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue> >&, int)
connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*, connectivity::mozab::OConnection*)
-connectivity::odbc::ODatabaseMetaDataResultSet::openTablesTypes()
-connectivity::odbc::OPreparedStatement::getDataBuf(int)
-connectivity::odbc::OPreparedStatement::getParamLength(int)
-connectivity::odbc::OPreparedStatement::getPrecision(int)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
connectivity::toString(com::sun::star::uno::Any const&)
@@ -1237,6 +1225,7 @@ ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
oox::(anonymous namespace)::GenericPropertySet::GenericPropertySet()
oox::AttributeList::getHyperHex(int, long) const
oox::AttributeList::getUnsignedHex(int, unsigned int) const
+oox::BinaryInputStream::readNulCharArray()
oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const
oox::ObjectContainer::getObject(rtl::OUString const&) const
@@ -1258,6 +1247,7 @@ oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
oox::drawingml::TextListStyle::dump() const
oox::drawingml::Theme::getEffectStyle(int) const
oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&)
+oox::drawingml::chart::ObjectTypeFormatter::convertAutomaticLine(oox::PropertySet&, int)
oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&)
oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&)
@@ -1333,6 +1323,7 @@ oox::xls::WorksheetHelper::getRow(int) const
oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const
oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const
oox::xls::Xf::hasAnyUsedFlags() const
+pdfi::createOdfEmitter(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&)
psp::GetCommandLineTokenCount(rtl::OString const&)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
@@ -1379,17 +1370,6 @@ sdr::animation::Scheduler::Reset(unsigned int)
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const
sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
-sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&)
-sdr::overlay::OverlayBitmapEx::setCenterXY(unsigned short, unsigned short)
-sdr::overlay::OverlayHatchRect::setSecondPosition(basegfx::B2DPoint const&)
-sdr::overlay::OverlayLineStriped::setSecondPosition(basegfx::B2DPoint const&)
-sdr::overlay::OverlayManagerBuffered::SetRefreshWithPreRendering(bool)
-sdr::overlay::OverlayObjectList::remove(sdr::overlay::OverlayObject&)
-sdr::overlay::OverlayPolyPolygonStriped::setPolyPolygon(basegfx::B2DPolyPolygon const&)
-sdr::overlay::OverlayRollingRectangleStriped::setExtendedLines(bool)
-sdr::overlay::OverlayRollingRectangleStriped::setShowBounds(bool)
-sdr::overlay::OverlayTriangle::setSecondPosition(basegfx::B2DPoint const&)
-sdr::overlay::OverlayTriangle::setThirdPosition(basegfx::B2DPoint const&)
sdr::table::Cell::GetStyleSheetPool() const
sdr::table::SdrTableObj::getColumnCount() const
sdr::table::SdrTableObj::getRowCount() const
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 1d84ca2..ee436da 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -325,10 +325,10 @@ public:
int GetDisplayScreen() const { return maGeometry.nDisplayScreenNumber; }
void updateScreenNumber();
+#if GTK_CHECK_VERSION(3,0,0)
// only for gtk3 ...
void pushIgnoreDamage();
void popIgnoreDamage();
-#if GTK_CHECK_VERSION(3,0,0)
void renderArea( cairo_t *cr, cairo_rectangle_t *src );
#endif
virtual ~GtkSalFrame();
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index e4856bd..f889e61 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2994,19 +2994,17 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi
return sal_True;
}
+#if GTK_CHECK_VERSION(3,0,0)
void GtkSalFrame::pushIgnoreDamage()
{
-#if GTK_CHECK_VERSION(3,0,0)
m_nDuringRender++;
-#endif
}
void GtkSalFrame::popIgnoreDamage()
{
-#if GTK_CHECK_VERSION(3,0,0)
m_nDuringRender--;
-#endif
}
+#endif
void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect)
{
commit 46087fd1b7186cd181275693e72494c4a07c0c38
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 16 09:47:29 2012 +0000
fix up const malformed copy ctors and operator=
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 470ee9d..db96148 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -206,7 +206,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
}
}
-PortionObj::PortionObj( PortionObj& rPortionObj )
+PortionObj::PortionObj( const PortionObj& rPortionObj )
: PropStateValue( rPortionObj )
{
ImplConstruct( rPortionObj );
@@ -434,7 +434,7 @@ void PortionObj::ImplClear()
delete[] mpText;
}
-void PortionObj::ImplConstruct( PortionObj& rPortionObj )
+void PortionObj::ImplConstruct( const PortionObj& rPortionObj )
{
mbLastPortion = rPortionObj.mbLastPortion;
mnTextSize = rPortionObj.mnTextSize;
@@ -628,7 +628,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
return nRetValue;
}
-PortionObj& PortionObj::operator=( PortionObj& rPortionObj )
+PortionObj& PortionObj::operator=( const PortionObj& rPortionObj )
{
if ( this != &rPortionObj )
{
@@ -704,7 +704,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
}
}
-ParagraphObj::ParagraphObj( ParagraphObj& rObj )
+ParagraphObj::ParagraphObj( const ParagraphObj& rObj )
: List()
, PropStateValue()
, SOParagraph()
@@ -1174,7 +1174,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
meBiDi = ePropState;
}
-void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj )
+void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj )
{
mnTextSize = rParagraphObj.mnTextSize;
mnTextAdjust = rParagraphObj.mnTextAdjust;
@@ -1187,8 +1187,11 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj )
mbForbiddenRules = rParagraphObj.mbForbiddenRules;
mnBiDi = rParagraphObj.mnBiDi;
- for ( void* pPtr = rParagraphObj.First(); pPtr; pPtr = rParagraphObj.Next() )
- Insert( new PortionObj( *(PortionObj*)pPtr ), LIST_APPEND );
+ {
+ ParagraphObj& rConstApiLossage = const_cast<ParagraphObj&>(rParagraphObj);
+ for ( const void* pPtr = rConstApiLossage.First(); pPtr; pPtr = rConstApiLossage.Next() )
+ Insert( new PortionObj( *static_cast<const PortionObj*>(pPtr) ), LIST_APPEND );
+ }
maTabStop = rParagraphObj.maTabStop;
bExtendedParameters = rParagraphObj.bExtendedParameters;
@@ -1221,7 +1224,7 @@ sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosi
return mnTextSize;
}
-ParagraphObj& ParagraphObj::operator=( ParagraphObj& rParagraphObj )
+ParagraphObj& ParagraphObj::operator=( const ParagraphObj& rParagraphObj )
{
if ( this != &rParagraphObj )
{
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 4deab90..3d0d0f2 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -118,7 +118,7 @@ class PortionObj : public PropStateValue
protected :
void ImplClear();
- void ImplConstruct( PortionObj& rPortionObj );
+ void ImplConstruct( const PortionObj& rPortionObj );
sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
@@ -151,13 +151,13 @@ class PortionObj : public PropStateValue
sal_Bool bLast, FontCollection& rFontCollection );
PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
FontCollection& rFontCollection );
- PortionObj( PortionObj& rPortionObj );
+ PortionObj( const PortionObj& rPortionObj );
~PortionObj();
void Write( SvStream* pStrm, sal_Bool bLast );
sal_uInt32 Count() const { return mnTextSize; };
- PortionObj& operator=( PortionObj& rPortionObj );
+ PortionObj& operator=( const PortionObj& rPortionObj );
};
struct ParaFlags
@@ -178,7 +178,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
protected :
- void ImplConstruct( ParagraphObj& rParagraphObj );
+ void ImplConstruct( const ParagraphObj& rParagraphObj );
void ImplClear();
sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False );
@@ -215,7 +215,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef,
ParaFlags, FontCollection& rFontCollection,
PPTExBulletProvider& rBuProv );
- ParagraphObj( ParagraphObj& rParargraphObj );
+ ParagraphObj( const ParagraphObj& rParargraphObj );
ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
PPTExBulletProvider& rBuProv );
@@ -225,7 +225,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
void Write( SvStream* pStrm );
sal_uInt32 Count() const { return mnTextSize; };
- ParagraphObj& operator=( ParagraphObj& rParagraphObj );
+ ParagraphObj& operator=( const ParagraphObj& rParagraphObj );
};
struct ImplTextObj
commit bbd638350fb83af2cadd85cdac2900de80bf7401
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 15 17:10:54 2012 +0000
remove gaps in options and reduce by two
so pesky warnings about invalid property values on shutdown go away
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 0d39be6..c765d53 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -229,29 +229,27 @@ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames()
static const char* aPropNames[] =
{
"Line/Guide", // 0
- "Line/SimpleControlPoint", // 1
- "Line/LargeControlPoint", // 2
- "Window/HorizontalScroll", // 3
- "Window/VerticalScroll", // 4
- "Window/ShowRulers", // 5
- "Window/HorizontalRuler", // 6
- "Window/VerticalRuler", // 7
- "Window/HorizontalRulerUnit", // 8
- "Window/VerticalRulerUnit", // 9
- "Window/SmoothScroll", //10
- "Zoom/Value", //11
- "Zoom/Type", //12
- "Other/IsAlignMathObjectsToBaseline", //13
- "Other/MeasureUnit", //14
+ "Window/HorizontalScroll", // 1
+ "Window/VerticalScroll", // 2
+ "Window/ShowRulers", // 3
+ "Window/HorizontalRuler", // 4
+ "Window/VerticalRuler", // 5
+ "Window/HorizontalRulerUnit", // 6
+ "Window/VerticalRulerUnit", // 7
+ "Window/SmoothScroll", // 8
+ "Zoom/Value", // 9
+ "Zoom/Type", //10
+ "Other/IsAlignMathObjectsToBaseline", //11
+ "Other/MeasureUnit", //12
// below properties are not available in WriterWeb
- "Other/TabStop", //15
- "Window/IsVerticalRulerRight", //16
- "ViewLayout/Columns", //17
- "ViewLayout/BookMode", //18
- "Other/IsSquaredPageMode", //19
- "Other/ApplyCharUnit" //20
+ "Other/TabStop", //13
+ "Window/IsVerticalRulerRight", //14
+ "ViewLayout/Columns", //15
+ "ViewLayout/BookMode", //16
+ "Other/IsSquaredPageMode", //17
+ "Other/ApplyCharUnit" //18
};
- const int nCount = bWeb ? 15 : 21;
+ const int nCount = bWeb ? 13 : 19;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -286,32 +284,32 @@ void SwLayoutViewConfig::Commit()
switch(nProp)
{
case 0: rVal <<= (sal_Bool) rParent.IsCrossHair(); break; // "Line/Guide",
- case 3: rVal <<= (sal_Bool) rParent.IsViewHScrollBar(); break; // "Window/HorizontalScroll",
- case 4: rVal <<= (sal_Bool) rParent.IsViewVScrollBar(); break; // "Window/VerticalScroll",
- case 5: rVal <<= (sal_Bool) rParent.IsViewAnyRuler(); break; // "Window/ShowRulers"
+ case 1: rVal <<= (sal_Bool) rParent.IsViewHScrollBar(); break; // "Window/HorizontalScroll",
+ case 2: rVal <<= (sal_Bool) rParent.IsViewVScrollBar(); break; // "Window/VerticalScroll",
+ case 3: rVal <<= (sal_Bool) rParent.IsViewAnyRuler(); break; // "Window/ShowRulers"
// #i14593# use IsView*Ruler(sal_True) instead of IsView*Ruler()
// this preserves the single ruler states even if "Window/ShowRulers" is off
- case 6: rVal <<= (sal_Bool) rParent.IsViewHRuler(sal_True); break; // "Window/HorizontalRuler",
- case 7: rVal <<= (sal_Bool) rParent.IsViewVRuler(sal_True); break; // "Window/VerticalRuler",
- case 8:
+ case 4: rVal <<= (sal_Bool) rParent.IsViewHRuler(sal_True); break; // "Window/HorizontalRuler",
+ case 5: rVal <<= (sal_Bool) rParent.IsViewVRuler(sal_True); break; // "Window/VerticalRuler",
+ case 6:
if(rParent.bIsHScrollMetricSet)
rVal <<= (sal_Int32)rParent.eHScrollMetric; // "Window/HorizontalRulerUnit"
break;
- case 9:
+ case 7:
if(rParent.bIsVScrollMetricSet)
rVal <<= (sal_Int32)rParent.eVScrollMetric; // "Window/VerticalRulerUnit"
break;
- case 10: rVal <<= (sal_Bool) rParent.IsSmoothScroll(); break; // "Window/SmoothScroll",
- case 11: rVal <<= (sal_Int32)rParent.GetZoom(); break; // "Zoom/Value",
- case 12: rVal <<= (sal_Int32)rParent.GetZoomType(); break; // "Zoom/Type",
- case 13: rVal <<= (sal_Bool) rParent.IsAlignMathObjectsToBaseline(); break; // "Other/IsAlignMathObjectsToBaseline"
- case 14: rVal <<= (sal_Int32)rParent.GetMetric(); break; // "Other/MeasureUnit",
- case 15: rVal <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
- case 16: rVal <<= (sal_Bool) rParent.IsVRulerRight(); break; // "Window/IsVerticalRulerRight",
- case 17: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break; // "ViewLayout/Columns",
- case 18: rVal <<= (sal_Bool) rParent.IsViewLayoutBookMode(); break; // "ViewLayout/BookMode",
- case 19: rVal <<= (sal_Bool) rParent.IsSquaredPageMode(); break; // "Other/IsSquaredPageMode",
- case 20: rVal <<= (sal_Bool) rParent.IsApplyCharUnit(); break; // "Other/ApplyCharUnit",
+ case 8: rVal <<= (sal_Bool) rParent.IsSmoothScroll(); break; // "Window/SmoothScroll",
+ case 9: rVal <<= (sal_Int32)rParent.GetZoom(); break; // "Zoom/Value",
+ case 10: rVal <<= (sal_Int32)rParent.GetZoomType(); break; // "Zoom/Type",
+ case 11: rVal <<= (sal_Bool) rParent.IsAlignMathObjectsToBaseline(); break; // "Other/IsAlignMathObjectsToBaseline"
+ case 12: rVal <<= (sal_Int32)rParent.GetMetric(); break; // "Other/MeasureUnit",
+ case 13: rVal <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
+ case 14: rVal <<= (sal_Bool) rParent.IsVRulerRight(); break; // "Window/IsVerticalRulerRight",
+ case 15: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break; // "ViewLayout/Columns",
+ case 16: rVal <<= (sal_Bool) rParent.IsViewLayoutBookMode(); break; // "ViewLayout/BookMode",
+ case 17: rVal <<= (sal_Bool) rParent.IsSquaredPageMode(); break; // "Other/IsSquaredPageMode",
+ case 18: rVal <<= (sal_Bool) rParent.IsApplyCharUnit(); break; // "Other/ApplyCharUnit",
}
}
PutProperties(aNames, aValues);
@@ -337,34 +335,34 @@ void SwLayoutViewConfig::Load()
switch(nProp)
{
case 0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
- case 3: rParent.SetViewHScrollBar(bSet); break;// "Window/HorizontalScroll",
- case 4: rParent.SetViewVScrollBar(bSet); break;// "Window/VerticalScroll",
- case 5: rParent.SetViewAnyRuler(bSet);break; // "Window/ShowRulers"
- case 6: rParent.SetViewHRuler(bSet); break;// "Window/HorizontalRuler",
- case 7: rParent.SetViewVRuler(bSet); break;// "Window/VerticalRuler",
- case 8:
+ case 1: rParent.SetViewHScrollBar(bSet); break;// "Window/HorizontalScroll",
+ case 2: rParent.SetViewVScrollBar(bSet); break;// "Window/VerticalScroll",
+ case 3: rParent.SetViewAnyRuler(bSet);break; // "Window/ShowRulers"
+ case 4: rParent.SetViewHRuler(bSet); break;// "Window/HorizontalRuler",
+ case 5: rParent.SetViewVRuler(bSet); break;// "Window/VerticalRuler",
+ case 6:
{
rParent.bIsHScrollMetricSet = sal_True;
rParent.eHScrollMetric = ((FieldUnit)nInt32Val); // "Window/HorizontalRulerUnit"
}
break;
- case 9:
+ case 7:
{
rParent.bIsVScrollMetricSet = sal_True;
rParent.eVScrollMetric = ((FieldUnit)nInt32Val); // "Window/VerticalRulerUnit"
}
break;
- case 10: rParent.SetSmoothScroll(bSet); break;// "Window/SmoothScroll",
- case 11: rParent.SetZoom( static_cast< sal_uInt16 >(nInt32Val) ); break;// "Zoom/Value",
- case 12: rParent.SetZoomType( static_cast< SvxZoomType >(nInt32Val) ); break;// "Zoom/Type",
- case 13: rParent.SetAlignMathObjectsToBaseline(bSet); break;// "Other/IsAlignMathObjectsToBaseline"
- case 14: rParent.SetMetric((FieldUnit)nInt32Val, sal_True); break;// "Other/MeasureUnit",
- case 15: rParent.SetDefTab(MM100_TO_TWIP(nInt32Val), sal_True); break;// "Other/TabStop",
- case 16: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
- case 17: rParent.SetViewLayoutColumns( static_cast<sal_uInt16>(nInt32Val) ); break;// "ViewLayout/Columns",
- case 18: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
- case 19: rParent.SetDefaultPageMode(bSet,sal_True); break;// "Other/IsSquaredPageMode",
- case 20: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
+ case 8: rParent.SetSmoothScroll(bSet); break;// "Window/SmoothScroll",
+ case 9: rParent.SetZoom( static_cast< sal_uInt16 >(nInt32Val) ); break;// "Zoom/Value",
+ case 10: rParent.SetZoomType( static_cast< SvxZoomType >(nInt32Val) ); break;// "Zoom/Type",
+ case 11: rParent.SetAlignMathObjectsToBaseline(bSet); break;// "Other/IsAlignMathObjectsToBaseline"
+ case 12: rParent.SetMetric((FieldUnit)nInt32Val, sal_True); break;// "Other/MeasureUnit",
+ case 13: rParent.SetDefTab(MM100_TO_TWIP(nInt32Val), sal_True); break;// "Other/TabStop",
+ case 14: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
+ case 15: rParent.SetViewLayoutColumns( static_cast<sal_uInt16>(nInt32Val) ); break;// "ViewLayout/Columns",
+ case 16: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
+ case 17: rParent.SetDefaultPageMode(bSet,sal_True); break;// "Other/IsSquaredPageMode",
+ case 18: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
}
}
}
More information about the Libreoffice-commits
mailing list