[Libreoffice-commits] .: extensions/source
extensions/source/propctrlr/formmetadata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5972e4db625500261d924028189793c7d51b576e Author: Julien Nabet serval2...@yahoo.fr Date: Sat Feb 11 14:04:11 2012 +0100 Fix cppcheck warning same expression on both sides of '|' diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 7b1e069..957d9d1 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -166,7 +166,7 @@ namespace pcr DEF_INFO_3( ALLOWADDITIONS,ALLOW_ADDITIONS,ALLOW_ADDITIONS, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), DEF_INFO_3( ALLOWEDITS,ALLOW_EDITS,ALLOW_EDITS, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), DEF_INFO_3( ALLOWDELETIONS,ALLOW_DELETIONS,ALLOW_DELETIONS, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), -DEF_INFO_4( INSERTONLY,DATAENTRY, DATAENTRY, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE, COMPOSEABLE ), +DEF_INFO_3( INSERTONLY,DATAENTRY, DATAENTRY, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), DEF_INFO_4( NAVIGATION,NAVIGATION, NAVIGATION, FORM_VISIBLE, DATA_PROPERTY, ENUM, COMPOSEABLE ), DEF_INFO_4( CYCLE, CYCLE, CYCLE, FORM_VISIBLE, DATA_PROPERTY, ENUM, COMPOSEABLE ), DEF_INFO_3( FILTERPROPOSAL,FILTERPROPOSAL, FILTERPROPOSAL, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_connection.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4649fafa317f4717634d863d3f3edf1d0180fc1e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Feb 11 23:15:47 2012 +0900
Fixed wrong mapping to log level from postgresql-sdbc.ini
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 4d8601c..8fb6382 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -188,7 +188,7 @@ static sal_Int32 readLogLevelFromConfiguration()
else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SQL)) )
loglevel = LogLevel::SQL;
else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(INFO)) )
-loglevel = LogLevel::SQL;
+loglevel = LogLevel::INFO;
else
{
fprintf( stderr, unknown loglevel %s\n,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/xls/formulabase.hxx | 38 --
oox/source/xls/formulabase.cxx | 39 ---
oox/source/xls/formulaparser.cxx | 13 -
unusedcode.easy |5 -
4 files changed, 95 deletions(-)
New commits:
commit 731a8d7d5bd47bc17f21065f195170da711f3277
Author: Elton Chung el...@layerjet.com
Date: Fri Feb 10 22:16:49 2012 +0800
Remove unused code
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index b3e403a..0a3b35a 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -705,14 +705,6 @@ public:
//
-/** Generates a cell address string in Calc's absolute $Sheet.$A$1 notation
-from the passed cell address.
-
-@param rAddress The cell address to be converted to a string.
- */
-::rtl::OUString generateApiAddressString(
-const ::com::sun::star::table::CellAddress
rAddress ) const;
-
/** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$
notation from the passed cell range address.
@@ -721,13 +713,6 @@ public:
::rtl::OUString generateApiRangeString(
const ::com::sun::star::table::CellRangeAddress
rRange ) const;
-/** Generates a cell range list string in Calc's absolute $Sheet.$A$1:$A$1
-notation from the passed cell range addresses.
-
-@param rRanges The list of cell ranges to be converted to a string.
- */
-::rtl::OUString generateApiRangeListString( const ApiCellRangeList
rRanges ) const;
-
/** Generates a string in Calc formula notation from the passed string.
@param rString The string value.
@@ -760,29 +745,6 @@ public:
::com::sun::star::uno::Any
extractReference( const ApiTokenSequence rTokens )
const;
-/** Tries to extract a single cell address from a formula token sequence.
-
-@param orAddress (output parameter) If the token sequence is valid,
-this parameter will contain the extracted cell address. If the
-token sequence contains unexpected tokens, nothing meaningful is
-inserted, and the function returns false.
-
-@param rTokens The token sequence to be parsed. Should contain exactly
-one cell address token. The token sequence may contain whitespace
-tokens.
-
-@param bAllowRelative True = it is allowed that rTokens contains
-relative references (based on cell A1 of the current sheet).
-False = only real absolute references will be accepted.
-
-@return True, if the token sequence contains a valid cell address
-which has been extracted to orAddress, false otherwise.
- */
-boolextractCellAddress(
-::com::sun::star::table::CellAddress orAddress,
-const ApiTokenSequence rTokens,
-bool bAllowRelative ) const;
-
/** Tries to extract a cell range address from a formula token sequence.
@param orAddress (output parameter) If the token sequence is valid,
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 477a8f9..e9ffa95 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -1494,15 +1494,6 @@ OUString
FormulaProcessorBase::generateRangeList2dString( const ApiCellRangeList
//
-OUString FormulaProcessorBase::generateApiAddressString( const CellAddress
rAddress ) const
-{
-OUString aCellName;
-PropertySet aCellProp( getCellFromDoc( rAddress ) );
-aCellProp.getProperty( aCellName, PROP_AbsoluteName );
-OSL_ENSURE( !aCellName.isEmpty(),
FormulaProcessorBase::generateApiAddressString - cannot create cell address
string );
-return aCellName;
-}
-
OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress
rRange ) const
{
OUString aRangeName;
@@ -1512,22 +1503,6 @@ OUString FormulaProcessorBase::generateApiRangeString(
const CellRangeAddress r
return aRangeName;
}
-OUString FormulaProcessorBase::generateApiRangeListString( const
ApiCellRangeList rRanges ) const
-{
-OUStringBuffer aBuffer;
-for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd =
rRanges.end(); aIt != aEnd; ++aIt )
-{
-OUString aRangeName = generateApiRangeString( *aIt );
-if( !aRangeName.isEmpty() )
-{
-if( aBuffer.getLength() 0 )
-aBuffer.append( API_TOKEN_SEP );
-aBuffer.append( aRangeName );
-}
-}
-return aBuffer.makeStringAndClear();
-}
-
OUString FormulaProcessorBase::generateApiString( const OUString rString )
{
[Libreoffice-commits] .: linguistic/source
linguistic/source/spelldsp.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fef3122259092e03b3cf11721171d4b621c3a97f
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Feb 11 17:34:20 2012 +0100
Avoid Possible null pointer dereference in linguistic/source/spelldsp.hxx
(Thank you to Ivan and Riccardo for their suggestions)
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 9ae9cd4..e2186f9 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -73,7 +73,7 @@ class SpellCheckerDispatcher :
::com::sun::star::linguistic2::XSearchableDictionaryList xDicList;
LngSvcMgr rMgr;
-linguistic::SpellCache *pCache; // Spell Cache (holds known words)
+mutable linguistic::SpellCache *pCache; // Spell Cache (holds known
words)
// disallow copy-constructor and assignment-operator for now
SpellCheckerDispatcher(const SpellCheckerDispatcher );
@@ -134,7 +134,7 @@ public:
inline linguistic::SpellCache SpellCheckerDispatcher::GetCache() const
{
if (!pCache)
-((SpellCheckerDispatcher *) this)-pCache = new
linguistic::SpellCache();
+pCache = new linguistic::SpellCache();
return *pCache;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdpagv.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit d5f9722e198cc8cc9e658207c73e465390c60c99 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Feb 11 20:07:01 2012 +0100 fix dbgutil build: put back DbgName_SdrPageView diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 399d7f0..fef1b10 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -66,6 +66,8 @@ using namespace ::com::sun::star; #include svx/sdrpagewindow.hxx #include svx/sdrpaintwindow.hxx +DBG_NAME(SdrPageView); + // interface to SdrPageWindow ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - l10ntools/source unusedcode.easy vcl/unx
l10ntools/source/gsicheck.cxx |2 +-
unusedcode.easy |2 --
vcl/unx/gtk/gdi/gtkprintwrapper.cxx | 26 --
vcl/unx/gtk/inc/gtkprintwrapper.hxx |6 --
4 files changed, 1 insertion(+), 35 deletions(-)
New commits:
commit 00b070ff1478bbae773193e921c77466d8b895f7
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 11 17:07:00 2012 +0100
l10ntools: use correct string literal for ssize_t
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 11c9d83..76b7928 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -75,7 +75,7 @@ void PrintMessage( rtl::OString const aType, rtl::OString
const aMsg, rtl::O
rtl::OString const aContext, sal_Bool bPrintContext,
std::size_t nLine, rtl::OString aUniqueId = rtl::OString() )
/*/
{
-fprintf( stdout, %s %s, Line %lu, aType.getStr(), aPrefix.getStr(),
nLine );
+fprintf( stdout, %s %s, Line %zu, aType.getStr(), aPrefix.getStr(),
nLine );
if ( !aUniqueId.isEmpty() )
fprintf( stdout, , UniqueID %s, aUniqueId.getStr() );
fprintf( stdout, : %s, aMsg.getStr() );
commit 839cf2fa8cd7ea30ad5be7124cd1b26779145406
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 11 16:20:45 2012 +0100
unusedcode.easy: clean GtkPrintWrapper
diff --git a/unusedcode.easy b/unusedcode.easy
index 0b128a6..ff05025 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1495,5 +1495,3 @@ vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const)
vcl::PDFWriter::DrawPixel(Polygon const, Color const*)
-vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*,
int) const
-vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*,
int) const
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
index 6ecfd1d..904b47b 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
@@ -58,8 +58,6 @@ GtkPrintWrapper::GtkPrintWrapper()
, m_print_unix_dialog_set_manual_capabilities(0)
, m_print_unix_dialog_get_settings(0)
, m_print_unix_dialog_set_settings(0)
-, m_print_operation_set_support_selection(0)
-, m_print_operation_set_has_selection(0)
, m_print_unix_dialog_set_support_selection(0)
, m_print_unix_dialog_set_has_selection(0)
{
@@ -105,8 +103,6 @@ void GtkPrintWrapper::impl_load()
m_print_unix_dialog_set_manual_capabilities =
reinterpret_castprint_unix_dialog_set_manual_capabilities_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_manual_capabilities));
m_print_unix_dialog_get_settings =
reinterpret_castprint_unix_dialog_get_settings_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_get_settings));
m_print_unix_dialog_set_settings =
reinterpret_castprint_unix_dialog_set_settings_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_settings));
-m_print_operation_set_support_selection =
reinterpret_castprint_operation_set_support_selection_t(m_aModule.getFunctionSymbol(gtk_print_operation_set_support_selection));
-m_print_operation_set_has_selection =
reinterpret_castprint_operation_set_has_selection_t(m_aModule.getFunctionSymbol(gtk_print_operation_set_has_selection));
m_print_unix_dialog_set_support_selection =
reinterpret_castprint_unix_dialog_set_support_selection_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_support_selection));
m_print_unix_dialog_set_has_selection =
reinterpret_castprint_unix_dialog_set_has_selection_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_has_selection));
}
@@ -145,8 +141,6 @@ bool GtkPrintWrapper::supportsPrintSelection() const
#if !GTK_CHECK_VERSION(3,0,0)
return
supportsPrinting()
- m_print_operation_set_support_selection
- m_print_operation_set_has_selection
m_print_unix_dialog_set_support_selection
m_print_unix_dialog_set_has_selection
;
@@ -325,26 +319,6 @@ void
GtkPrintWrapper::print_unix_dialog_set_settings(GtkPrintUnixDialog* dialog,
#endif
}
-void GtkPrintWrapper::print_operation_set_support_selection(GtkPrintOperation*
op, gboolean support_selection) const
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-assert(m_print_operation_set_support_selection);
-(*m_print_operation_set_support_selection)(op, support_selection);
-#else
-gtk_print_operation_set_support_selection(op, support_selection);
-#endif
-}
-
-void GtkPrintWrapper::print_operation_set_has_selection(GtkPrintOperation* op,
gboolean has_selection) const
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-assert(m_print_operation_set_has_selection);
-(*m_print_operation_set_has_selection)(op, has_selection);
-#else
-
[Libreoffice-commits] .: dbaccess/qa sc/qa test/source
dbaccess/qa/extras/macros-test.cxx |2 +- sc/qa/extras/macros-test.cxx |4 ++-- test/source/sheet/xnamedranges.cxx |2 +- test/source/sheet/xspreadsheets2.cxx | 20 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 75b4d17f961ceec179e98fe07652e4ce719c16cb Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Feb 12 02:47:37 2012 +0100 use better assertion macros diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index 9443e9e..786202b 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -99,7 +99,7 @@ void DBAccessTest::setUp() // which is a private symbol to us, gets called mxDesktop = Referencecom::sun::star::frame::XDesktop( getMultiServiceFactory()-createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.frame.Desktop ))), UNO_QUERY ); -CPPUNIT_ASSERT_MESSAGE(, mxDesktop.is()); +CPPUNIT_ASSERT(mxDesktop.is()); } void DBAccessTest::tearDown() diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 5e908d9..cfba258 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -141,7 +141,7 @@ void ScMacrosTest::testStarBasic() double aValue; pDoc-GetValue(0,0,0,aValue); std::cout returned value = aValue std::endl; -CPPUNIT_ASSERT_MESSAGE(script did not change the value of Sheet1.A1,aValue==2); +CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(script did not change the value of Sheet1.A1,2.0, aValue, 0.1); xDocSh-DoClose(); } @@ -207,7 +207,7 @@ void ScMacrosTest::setUp() CPPUNIT_ASSERT_MESSAGE(no calc component!, m_xCalcComponent.is()); mxDesktop = Referencecom::sun::star::frame::XDesktop( getMultiServiceFactory()-createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.frame.Desktop ))), UNO_QUERY ); -CPPUNIT_ASSERT_MESSAGE(, mxDesktop.is()); +CPPUNIT_ASSERT(mxDesktop.is()); } void ScMacrosTest::tearDown() diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index 9f5b3aa..b5c9a46 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -180,7 +180,7 @@ void XNamedRanges::testRemoveByName() sal_Int32 nInitialCount = xIndex-getCount(); xNamedRanges-removeByName(maNameToRemove); sal_Int32 nNewCount = xIndex-getCount(); -CPPUNIT_ASSERT_MESSAGE(NamedRange initial1 not removed, nNewCount == nInitialCount - 1); +CPPUNIT_ASSERT_EQUAL_MESSAGE(NamedRange initial1 not removed, nNewCount, nInitialCount - 1); CPPUNIT_ASSERT_MESSAGE(Wrong NamedRange removed, initial1 still present, !xNamedRanges-hasByName(maNameToRemove)); // try to remove non existing rtl::OUString aNr2(RTL_CONSTASCII_USTRINGPARAM(dummyNonExistingNamedRange)); diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index 2634259..3d777c0 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -92,7 +92,7 @@ void XSpreadsheets2::testImportString() uno::Reference text::XTextRange xDestTextRange(xDestCell, UNO_QUERY_THROW); rtl::OUString aDestString = xDestTextRange-getString(); -CPPUNIT_ASSERT_MESSAGE(Wrong string imported, aDestString.equals(aSrcString)); +CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong string imported, aDestString, aSrcString); } void XSpreadsheets2::testImportValue() @@ -108,7 +108,7 @@ void XSpreadsheets2::testImportValue() uno::Reference table::XCell xDestCell = xDestSheet-getCellByPosition(1,0); sal_Int32 aDestValue = xDestCell-getValue(); -CPPUNIT_ASSERT_MESSAGE(Wrong value imported, aSrcValue == aDestValue); +CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong value imported, aSrcValue, aDestValue); } void XSpreadsheets2::testImportFormulaBasicMath() @@ -126,7 +126,7 @@ void XSpreadsheets2::testImportFormulaBasicMath() // potential problem later: formulas might be adjusted // add some tests that the formulas are correctly adjusted -CPPUNIT_ASSERT_MESSAGE(Wrong formula imported, aDestFormula.equals(aSrcFormula)); +CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong formula imported, aDestFormula, aSrcFormula); } void XSpreadsheets2::testImportFormulaWithNamedRange() @@ -142,7 +142,7 @@ void XSpreadsheets2::testImportFormulaWithNamedRange() uno::Reference table::XCell xDestCell = xDestSheet-getCellByPosition(3,0); rtl::OUString aDestFormula = xDestCell-getFormula(); -CPPUNIT_ASSERT_MESSAGE(Wrong Namedrange formula imported, aDestFormula.equals(aSrcFormula)); +CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong Namedrange formula imported, aDestFormula, aSrcFormula); } void XSpreadsheets2::testImportOverExistingNamedRange() @@ -166,7 +166,7 @@ void XSpreadsheets2::testImportOverExistingNamedRange() rtl::OUString
[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source
unusedcode.easy |5
vcl/inc/vcl/arrange.hxx | 72
vcl/source/window/arrange.cxx | 252 --
3 files changed, 329 deletions(-)
New commits:
commit b3776dfe6c41ac0a9855c650c3ef4811002426a4
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Feb 12 05:00:50 2012 +0100
unusedcode.easy: remove MatrixArranger
diff --git a/unusedcode.easy b/unusedcode.easy
index ff05025..6567bbc 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1482,12 +1482,7 @@
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
utl::TransliterationWrapper::compareSubstring(String const, int, int, String
const, int, int) const
vcl::I18nHelper::GetDate(Date const) const
-vcl::LabeledElement::setLabel(boost::shared_ptrvcl::WindowArranger const)
vcl::LazyDeletorMenu::is_less(Menu*, Menu*)
-vcl::MatrixArranger::addChild(boost::shared_ptrvcl::WindowArranger const,
unsigned int, unsigned int, int)
-vcl::MatrixArranger::addWindow(Window*, unsigned int, unsigned int, int, Size
const)
-vcl::MatrixArranger::remove(Window*)
-vcl::MatrixArranger::remove(boost::shared_ptrvcl::WindowArranger const)
vcl::PDFExtOutDevData::EndGroup()
vcl::PDFExtOutDevData::GetFormsFormat() const
vcl::PDFExtOutDevData::SetAutoAdvanceTime(unsigned int, int)
diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
index 46df6af..2197f10 100644
--- a/vcl/inc/vcl/arrange.hxx
+++ b/vcl/inc/vcl/arrange.hxx
@@ -292,7 +292,6 @@ namespace vcl
virtual size_t countElements() const { return 2; }
void setLabel( Window* );
-void setLabel( boost::shared_ptrWindowArranger const );
void setElement( Window* );
void setElement( boost::shared_ptrWindowArranger const );
void setLabelColumnWidth( long i_nWidth )
@@ -381,77 +380,6 @@ namespace vcl
virtual bool isVisible() const { return true; }
};
-class VCL_DLLPUBLIC MatrixArranger : public WindowArranger
-{
-longm_nBorderX;
-longm_nBorderY;
-
-struct MatrixElement : public WindowArranger::Element
-{
-sal_uInt32 m_nX;
-sal_uInt32 m_nY;
-
-MatrixElement()
-: WindowArranger::Element()
-, m_nX( 0 )
-, m_nY( 0 )
-{}
-
-MatrixElement( Window* i_pWin,
- sal_uInt32 i_nX, sal_uInt32 i_nY,
- boost::shared_ptrWindowArranger const i_pChild
= boost::shared_ptrWindowArranger(),
- sal_Int32 i_nExpandPriority = 0,
- const Size i_rMinSize = Size()
- )
-: WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority,
i_rMinSize )
-, m_nX( i_nX )
-, m_nY( i_nY )
-{
-}
-};
-
-std::vector MatrixElement m_aElements;
-std::map sal_uInt64, size_t m_aMatrixMap; // maps (x | (y
32)) to index in m_aElements
-
-sal_uInt64 getMap( sal_uInt32 i_nX, sal_uInt32 i_nY )
-{ return static_cast sal_uInt64 (i_nX) | (static_cast
sal_uInt64(i_nY) 32 ); }
-
-static void distributeExtraSize( std::vectorlong io_rSizes, const
std::vectorsal_Int32 i_rPrios, long i_nExtraWidth );
-
-Size getOptimalSize( WindowSizeType,
- std::vectorlong o_rColumnWidths,
std::vectorlong o_rRowHeights,
- std::vectorsal_Int32 o_rColumnPrio,
std::vectorsal_Int32 o_rRowPrio
-) const;
-protected:
-virtual Element* getElement( size_t i_nIndex )
-{ return i_nIndex m_aElements.size() ? m_aElements[ i_nIndex ] : 0;
}
-
-public:
-MatrixArranger( WindowArranger* i_pParent = NULL,
-long i_nBorderX = -1,
-long i_nBorderY = -1 )
-: WindowArranger( i_pParent )
-, m_nBorderX( i_nBorderX )
-, m_nBorderY( i_nBorderY )
-{}
-
-virtual ~MatrixArranger();
-
-virtual Size getOptimalSize( WindowSizeType ) const;
-virtual void resize();
-virtual size_t countElements() const { return m_aElements.size(); }
-
-// add a managed window at the given matrix position
-size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32
i_nExpandPrio = 0, const Size i_rMinSize = Size() );
-void remove( Window* );
-
-size_t addChild( boost::shared_ptrWindowArranger const , sal_uInt32
i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 );
-// convenience: use for addChild( new WindowArranger( ... ) )
constructs
-size_t addChild( WindowArranger* i_pNewChild, sal_uInt32 i_nX,
sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 )
-{ return addChild(
[Libreoffice-commits] .: test/source
test/source/sheet/xspreadsheets2.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 21b3a9a6beb2773668a7ac63c50a1fdc00e5cd4b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Feb 12 08:01:03 2012 +0100
fix errors with assertion macros
diff --git a/test/source/sheet/xspreadsheets2.cxx
b/test/source/sheet/xspreadsheets2.cxx
index 3d777c0..6fbf35b 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -283,7 +283,7 @@ void XSpreadsheets2::testImportCellStyle()
sal_Int32 aVertJustify = 0;
CPPUNIT_ASSERT(xCellStyleProp-getPropertyValue(aProperty) =
aVertJustify);
-CPPUNIT_ASSERT_EQUAL_MESSAGE(New style: VertJustify not set,
aVertJustify, table::CellVertJustify_CENTER);
+CPPUNIT_ASSERT_MESSAGE(New style: VertJustify not set, aVertJustify ==
table::CellVertJustify_CENTER);
}
uno::Reference sheet::XSpreadsheetDocument XSpreadsheets2::getDoc(const
rtl::OUString aFileBase, uno::Reference lang::XComponent xComp)
@@ -326,7 +326,7 @@ void XSpreadsheets2::importSheetToCopy()
uno::Reference sheet::XSpreadsheets2 xDestSheets
(xDestDoc-getSheets(), UNO_QUERY_THROW);
sal_Int32 nDestPos = 0;
sal_Int32 nDestPosEffective = xDestSheets-importSheet(xDocument,
aSrcSheetName, nDestPos);
-CPPUNIT_ASSERT_EQUALS_MESSAGE(Wrong sheet index, nDestPosEffective,
nDestPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong sheet index, nDestPosEffective,
nDestPos);
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
