[Libreoffice-commits] .: svx/source

2011-10-18 Thread Takeshi Abe 
 svx/source/dialog/docrecovery.cxx |2 --
 svx/source/unodraw/unoshap2.cxx   |3 ---
 svx/source/unodraw/unoshap3.cxx   |3 ---
 3 files changed, 8 deletions(-)

New commits:
commit 0cb79e748687bcd3054cdcbf8961bc0b78279f85
Author: Takeshi Abe 
Date:   Tue Oct 18 20:40:16 2011 +0900

removed unused macro

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 8def4d8..8dec4c9 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -64,8 +64,6 @@
 #include 
 #include 
 
-#define RET_BACK100
-
 //===
 // namespace
 namespace svx{
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 67a3110..8e597f7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -82,9 +82,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-#define INTERFACE_TYPE( xint ) \
-::getCppuType((const Reference< xint >*)0)
-
 #define QUERYINT( xint ) \
 if( rType == ::getCppuType((const Reference< xint >*)0) ) \
 aAny <<= Reference< xint >(this)
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 5a0d631..659fe7f 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -67,9 +67,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-#define INTERFACE_TYPE( xint ) \
-::getCppuType((const Reference< xint >*)0)
-
 #define QUERYINT( xint ) \
 if( rType == ::getCppuType((const Reference< xint >*)0) ) \
 aAny <<= Reference< xint >(this)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/qa

2011-10-18 Thread Markus Mohrhard 
 sc/inc/document.hxx |2 +-
 sc/qa/unit/filters-test.cxx |7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9706288e95cfdbecdfc2cab3a66a2cce07ac23b4
Author: Markus Mohrhard 
Date:   Wed Oct 19 01:52:58 2011 +0200

add output for language settings to log file

some windows builds crash in this test, maybe they get a false language
setting from somewhere

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5648a54..a7ae1c3 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -447,7 +447,7 @@ public:
 ScExtDocOptions*GetExtDocOptions()  { return pExtDocOptions; }
 SC_DLLPUBLIC void   SetExtDocOptions( ScExtDocOptions* 
pNewOptions );
 
-voidGetLanguage( LanguageType& rLatin, LanguageType& 
rCjk, LanguageType& rCtl ) const;
+SC_DLLPUBLIC void   GetLanguage( LanguageType& rLatin, LanguageType& 
rCjk, LanguageType& rCtl ) const;
 voidSetLanguage( LanguageType eLatin, LanguageType 
eCjk, LanguageType eCtl );
 
 voidSetDrawDefaults();
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 68885a5..939109e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -475,6 +475,13 @@ void ScFiltersTest::testFormats()
 CPPUNIT_ASSERT_MESSAGE("Failed to load formats.*", xDocSh.Is());
 ScDocument* pDoc = xDocSh->GetDocument();
 
+//output this just for debugging, should make it easier to see which 
local the numberformatter really used
+//it helps to understand why some windows build fails in this test
+LanguageType aLang, aCjkLang, aCtlLang;
+pDoc->GetLanguage(aLang, aCjkLang, aCtlLang);
+std::cout << "Language Settings in ScDocument: normal: " << aLang << " 
Cjk: " << aCjkLang << " Ctl: " << aCtlLang << std::endl;
+std::cout << "Language for NumberFormatter: " << 
pDoc->GetFormatTable()->GetLanguage() << std::endl;
+
 //test Sheet1 with csv file
 rtl::OUString aCSVFileName;
 
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("numberFormat.")), 
aCSVFileName);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

2011-10-18 Thread Eike Rathke 
 cui/source/dialogs/SpellDialog.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9796ac726e4c194e3cfa35e201815f9f1bb03e6a
Author: Eike Rathke 
Date:   Wed Oct 19 01:36:59 2011 +0200

Revert "callcatcher: replace Clone() by NULL"

That doesn't make sense, not even with a callcatcher excuse.

This reverts commit d54c3ad1518e32938117c7e529dda375d4110888.

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 8db9ef0..389cee6 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1537,7 +1537,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 //text has been added on the right and only the 'error 
attribute has to be corrected
 if(pErrorAttrLeft)
 {
-TextAttrib* pNewError =  NULL;
+TextAttrib* pNewError =  pErrorAttrLeft->GetAttr().Clone();
 sal_uInt16 nStart = pErrorAttrLeft->GetStart();
 sal_uInt16 nEnd = pErrorAttrLeft->GetEnd();
 pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft );
@@ -1557,7 +1557,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 //determine the change
 sal_uInt16 nAddedChars = GetText().Len() - nCurrentLen;
 
-TextAttrib* pNewError = NULL;
+TextAttrib* pNewError =  pErrorAttr->GetAttr().Clone();
 sal_uInt16 nStart = pErrorAttr->GetStart();
 sal_uInt16 nEnd = pErrorAttr->GetEnd();
 pTextEngine->RemoveAttrib( 0, *pErrorAttr );
@@ -1573,7 +1573,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 
 if(pBackAttrLeft)
 {
-TextAttrib* pNewBack = NULL;
+TextAttrib* pNewBack =  
pBackAttrLeft->GetAttr().Clone();
 sal_uInt16 _nStart = pBackAttrLeft->GetStart();
 sal_uInt16 _nEnd = pBackAttrLeft->GetEnd();
 pTextEngine->RemoveAttrib( 0, *pBackAttrLeft );
@@ -1600,7 +1600,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 m_nErrorEnd = pFontColor->GetEnd();
 if(pErrorAttrib->GetStart() != m_nErrorStart || 
pErrorAttrib->GetEnd() != m_nErrorEnd)
 {
-TextAttrib* pNewError = NULL;
+TextAttrib* pNewError =  
pErrorAttrib->GetAttr().Clone();
 pTextEngine->RemoveAttrib( 0, *pErrorAttr );
 SetAttrib( *pNewError, 0, m_nErrorStart, m_nErrorEnd );
 delete pNewError;
@@ -1755,7 +1755,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const 
String& rNewWord, LanguageT
 // undo expanded attributes!
 if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart && 
pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen)
 {
-TextAttrib* pNewBackground = NULL;
+TextAttrib* pNewBackground = pBackAttrib->GetAttr().Clone();
 sal_uInt16 nStart = pBackAttrib->GetStart();
 pTextEngine->RemoveAttrib(0, *pBackAttrib);
 pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

2011-10-18 Thread Markus Mohrhard 
 sc/qa/unit/ucalc.cxx |   33 -
 1 file changed, 32 insertions(+), 1 deletion(-)

New commits:
commit c35fb339f5aaf3ed8dea71baefb1521f0506e2cb
Author: Markus Mohrhard 
Date:   Wed Oct 19 01:25:49 2011 +0200

add unit test for fdo#41868

test should be extended as soon as possible
tests a central point of our formula compiler/reference handling

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 0ccf27b..19741ed 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -237,6 +237,7 @@ public:
 void testAutofilter();
 void testCopyPaste();
 void testMergedCells();
+void testSheetDelete();
 
 /**
  * Make sure the sheet streams are invalidated properly.
@@ -281,6 +282,7 @@ public:
 CPPUNIT_TEST(testAutofilter);
 CPPUNIT_TEST(testCopyPaste);
 CPPUNIT_TEST(testMergedCells);
+CPPUNIT_TEST(testSheetDelete);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2305,11 +2307,40 @@ void Test::testMergedCells()
 aDocFunc.InsertCells(aRange, &aMark, INS_INSROWS, true, true);
 m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false);
 cout << nEndRow << nEndCol;
-//have a look why this does not work
+//ScEditableTester won't work without an SfxMedium/XStorage
 //CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && 
nEndRow == 4);
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testSheetDelete()
+{
+//test that formulas are correctly updated during sheet delete
+//TODO: add test cases for InsertTabs/InsertTab and DeleteTabs
+//TODO: add tests for references to other sheets, relative references, 
updating of named ranges, ...
+//TODO: maybe rename then to testUpdateReference
+m_pDoc->InsertTab(0, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet1")));
+m_pDoc->InsertTab(1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet2")));
+m_pDoc->InsertTab(2, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet3")));
+
+m_pDoc->SetValue(0,0,2, 1);
+m_pDoc->SetValue(1,0,2, 2);
+m_pDoc->SetString(2,0,2, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=A1+B1")));
+
+double aValue;
+m_pDoc->GetValue(2,0,2, aValue);
+CPPUNIT_ASSERT_MESSAGE("formula does not return correct result", aValue == 
3);
+
+//test deleting both sheets: one is not directly before the sheet, the 
other one is
+m_pDoc->DeleteTab(0);
+m_pDoc->GetValue(2,0,1, aValue);
+CPPUNIT_ASSERT_MESSAGE("after deleting first sheet formula does not return 
correct result", aValue == 3);
+
+m_pDoc->DeleteTab(0);
+m_pDoc->GetValue(2,0,0, aValue);
+CPPUNIT_ASSERT_MESSAGE("after deleting second sheet formula does not 
return correct result", aValue == 3);
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-10-18 Thread Markus Mohrhard 
 sc/source/core/data/cell2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 308b7a287d0962ad593c9bac8e5b8b474cc36216
Author: Markus Mohrhard 
Date:   Wed Oct 19 00:31:51 2011 +0200

by one error in ScFormulaCell::UpdateDeleteTab (fdo#41868)

diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index afbba01..c220062 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1185,7 +1185,7 @@ void ScFormulaCell::UpdateInsertTab(SCTAB nTable, SCTAB 
nNewSheets)
 bool ScFormulaCell::UpdateDeleteTab(SCTAB nTable, bool bIsMove, SCTAB nSheets)
 {
 bool bRefChanged = false;
-bool bPosChanged = ( aPos.Tab() > nTable + nSheets ? true : false );
+bool bPosChanged = ( aPos.Tab() >= nTable + nSheets ? true : false );
 pCode->Reset();
 if( pCode->GetNextReferenceRPN() && !pDocument->IsClipOrUndo() )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/source

2011-10-18 Thread Stephan Bergmann 
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9550bed8aa5378c38837c312a5fbe46dc6f2ea97
Author: Stephan Bergmann 
Date:   Wed Oct 19 00:22:34 2011 +0200

Adapted numbering of reordered asm parameters.

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index a34d77f..3f88e77 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -120,7 +120,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 
nVtableIndex,
 asm volatile (
 
 // Fill the xmm registers
-"movq %2, %%rax\n\t"
+"movq %6, %%rax\n\t"
 
 "movsd   (%%rax), %%xmm0\n\t"
 "movsd  8(%%rax), %%xmm1\n\t"
@@ -132,7 +132,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 
nVtableIndex,
 "movsd 56(%%rax), %%xmm7\n\t"
 
 // Fill the general purpose registers
-"movq %1, %%rax\n\t"
+"movq %5, %%rax\n\t"
 
 "movq(%%rax), %%rdi\n\t"
 "movq   8(%%rax), %%rsi\n\t"
@@ -142,15 +142,15 @@ static void callVirtualMethod(void * pThis, sal_uInt32 
nVtableIndex,
 "movq  40(%%rax), %%r9\n\t"
 
 // Perform the call
-"movq %0, %%r11\n\t"
-"movq %3, %%rax\n\t"
+"movq %4, %%r11\n\t"
+"movq %7, %%rax\n\t"
 "call *%%r11\n\t"
 
 // Fill the return values
-"movq   %%rax, %4\n\t"
-"movq   %%rdx, %5\n\t"
-"movsd %%xmm0, %6\n\t"
-"movsd %%xmm1, %7\n\t"
+"movq   %%rax, %0\n\t"
+"movq   %%rdx, %1\n\t"
+"movsd %%xmm0, %2\n\t"
+"movsd %%xmm1, %3\n\t"
 : "=m" ( rax ), "=m" ( rdx ), "=m" ( xmm0 ), "=m" ( xmm1 )
 : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR )
 : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - autodoc/source bridges/source codemaker/source cosv/inc cppuhelper/inc cppu/qa l10ntools/source rsc/inc rsc/source sal/inc sal/rtl sdext/source svl/source testtool

2011-10-18 Thread Stephan Bergmann 
 autodoc/source/inc/estack.hxx|6 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |5 -
 codemaker/source/javamaker/javatype.cxx  |8 --
 cosv/inc/cosv/tpl/vvector.hxx|2 
 cppu/qa/cppumaker/test_cppumaker.cxx |   44 +++--
 cppu/qa/test_unotype.cxx |2 
 cppuhelper/inc/cppuhelper/propertysetmixin.hxx   |2 
 l10ntools/source/export2.cxx |   14 
 rsc/inc/rscerror.h   |2 
 rsc/source/rscpp/cpp1.c  |2 
 sal/inc/rtl/allocator.hxx|3 
 sal/rtl/source/alloc_impl.h  |2 
 sdext/source/presenter/PresenterProtocolHandler.cxx  |1 
 sdext/source/presenter/PresenterTimer.cxx|4 -
 svl/source/misc/urihelper.cxx|   60 ---
 testtools/source/bridgetest/bridgetest.cxx   |5 -
 testtools/source/bridgetest/cppobj.cxx   |   19 --
 unotest/inc/unotest/oustringostreaminserter.hxx  |4 +
 18 files changed, 77 insertions(+), 108 deletions(-)

New commits:
commit bbb5da15782f074feeaef6bd268e66495187876b
Author: Stephan Bergmann 
Date:   Tue Oct 18 23:07:08 2011 +0200

Clang does not understand #pragma GCC diagnostic warning 
"-Wunused-but-set-variable".

See  "clang 3.1 -Wunused-value
warnings in valgrind.h, memcheck.h" for a way to silence these warnings when
building with clang.

diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h
index 39bbbf6..55f6ed3 100644
--- a/sal/rtl/source/alloc_impl.h
+++ b/sal/rtl/source/alloc_impl.h
@@ -264,7 +264,7 @@ typedef CRITICAL_SECTION rtl_memory_lock_type;
 #define GCC_VERSION (__GNUC__ * 1 \
  + __GNUC_MINOR__ * 100 \
  + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if GCC_VERSION >= 40201 && !defined __clang__
 #pragma GCC diagnostic warning "-Wunused-but-set-variable"
 #endif
 #endif /* NVALGRIND || HAVE_MEMCHECK_H */
commit bf1f0183d5c6b4c94acdbee27276d5a386a657f4
Author: Stephan Bergmann 
Date:   Tue Oct 18 23:05:58 2011 +0200

Some fixes for "clang version 3.1 (trunk 142234)" (with --enable-werror, on 
Linux x86_64).

diff --git a/autodoc/source/inc/estack.hxx b/autodoc/source/inc/estack.hxx
index 1cb5855..3eb5b83 100644
--- a/autodoc/source/inc/estack.hxx
+++ b/autodoc/source/inc/estack.hxx
@@ -63,12 +63,10 @@ class EStack : private std::list
 { base::operator=( 
i_rStack.Base() );
   return *this; }
 booloperator==(
-const EStack &
-i_r2 ) const
+const EStack & ) const
 { return std::operator==( 
Base(), this->i_rStack.Base() ); }
 booloperator<(
-const EStack &
-i_r2 ) const
+const EStack & ) const
 { return std::operator<( 
Base(), this->i_rStack.Base() ); }
 // OPERATIONS
 voidpush(
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index c830f87..a34d77f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -151,9 +151,8 @@ static void callVirtualMethod(void * pThis, sal_uInt32 
nVtableIndex,
 "movq   %%rdx, %5\n\t"
 "movsd %%xmm0, %6\n\t"
 "movsd %%xmm1, %7\n\t"
-:
-: "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
-  "m" ( rax ), "m" ( rdx ), "m" ( xmm0 ), "m" ( xmm1 )
+: "=m" ( rax ), "=m" ( rdx ), "=m" ( xmm0 ), "=m" ( xmm1 )
+: "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR )
 : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
 );
 
diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index 0d53452..805ad4c 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -67,14 +67,6 @@ using codemaker::javamaker::ClassFile;
 
 namespace {
 
-void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) {
-if (!arguments.empty()) {
-throw CannotDumpException(
-rtl::OString(RTL_CONSTASCII_STRINGPARAM("Bad type information")));
-//TODO
-}
-}
-
 // helper function for createUnoName
 void appendUnoName(
 TypeManager const & manager, rtl::OString const & nucleus, sal_Int32 rank,
diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/cosv/inc/cosv/t

[Libreoffice-commits] .: filter/source

2011-10-18 Thread Peter Jentsch 
 filter/source/xsltdialog/xmlfiltercommon.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0eee1cf957d122ac0d805a9589a5db075a94e4a1
Author: Peter Jentsch 
Date:   Tue Oct 18 22:52:50 2011 +0200

fixed reorder warning in copy-constructor of filter_info_impl

diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx 
b/filter/source/xsltdialog/xmlfiltercommon.hxx
index c1da769..cdb767e 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -70,13 +70,15 @@ public:
 rtl::OUString   maDocType;
 rtl::OUString   maImportService;
 rtl::OUString   maExportService;
-rtl::OUString   maXSLTTransformerImpl;
 
 sal_Int32   maFlags;
 sal_Int32   maFileFormatVersion;
 sal_Int32   mnDocumentIconID;
 
 sal_BoolmbReadonly;
+
+rtl::OUString   maXSLTTransformerImpl;
+
 filter_info_impl();
 filter_info_impl( const filter_info_impl& rInfo );
 int operator==( const filter_info_impl& ) const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - filter/source

2011-10-18 Thread Peter Jentsch 
 filter/source/xsltdialog/typedetectionexport.cxx |1 +
 filter/source/xsltdialog/typedetectionimport.cxx |1 +
 filter/source/xsltdialog/xmlfiltercommon.hxx |1 +
 filter/source/xsltdialog/xmlfilterhelpids.hrc|1 +
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |9 +++--
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx|7 +++
 filter/source/xsltdialog/xmlfiltertabpagexslt.hrc|2 ++
 filter/source/xsltdialog/xmlfiltertabpagexslt.hxx|3 +++
 filter/source/xsltdialog/xmlfiltertabpagexslt.src|   18 ++
 9 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 11fbde8fed1a866c4ec9565d56f5f5034631d8b2
Author: Peter Jentsch 
Date:   Tue Oct 18 21:59:49 2011 +0200

support editing, importing, exporting the xslt transformer service setting

starting with LO 3.4 we default to using libxslt for xslt transformations
in filters. the saxon/j based services is still available and can be
explicitly requested by filters using the 2nd userdata entry in the filter
configuration. There wasn't any place to edit this 2nd userdata entry,
and it wasn't exported or imported with the custom filter packages.

diff --git a/filter/source/xsltdialog/typedetectionexport.cxx 
b/filter/source/xsltdialog/typedetectionexport.cxx
index fb925b2..b607883 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -194,6 +194,7 @@ void TypeDetectionExporter::doExport( Reference< 
XOutputStream > xOS,  const XML
 sValue += sComma;
 sValue += sXSLTFilterService;
 sValue += sDelim;
+sValue += pFilter->maXSLTTransformerImpl;
 sValue += sDelim;
 
 const application_info_impl* pAppInfo = getApplicationInfo( 
pFilter->maExportService );
diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc 
b/filter/source/xsltdialog/xmlfilterhelpids.hrc
index cced060..8e6a34f 100644
--- a/filter/source/xsltdialog/xmlfilterhelpids.hrc
+++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc
@@ -50,6 +50,7 @@
 #define HID_XML_FILTER_DOCTYPE  
"FILTER_HID_XML_FILTER_DOCTYPE"
 #define HID_XML_FILTER_DTD  
"FILTER_HID_XML_FILTER_DTD"
 #define HID_XML_FILTER_DTD_BROWSE   
"FILTER_HID_XML_FILTER_DTD_BROWSE"
+#define HID_XML_FILTER_TRANSFORM_SERVICE   
"FILTER_HID_XML_FILTER_TRANSFORM_SERVICE"
 #define HID_XML_FILTER_EXPORT_XSLT  
"FILTER_HID_XML_FILTER_EXPORT_XSLT"
 #define HID_XML_FILTER_EXPORT_XSLT_BROWSE   
"FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE"
 #define HID_XML_FILTER_IMPORT_XSLT  
"FILTER_HID_XML_FILTER_IMPORT_XSLT"
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx 
b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index c5ebd3b..abb3051 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -68,6 +68,9 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, 
ResMgr& rResMgr, co
 maEDImportTemplate( this, ResId( ED_XML_IMPORT_TEMPLATE, rResMgr ), 
INET_PROT_FILE ),
 maPBImportTemplate( this, ResId( PB_XML_IMPORT_TEMPLATE_BROWSE, rResMgr ) 
),
 
+maFTTransformationService( this, ResId (FT_XML_TRANSFORM_SERVICE, rResMgr 
) ),
+maEDTransformationService( this, ResId (ED_XML_TRANSFORM_SERVICE, rResMgr 
) ),
+
 sHTTPSchema( RTL_CONSTASCII_USTRINGPARAM( "http://"; ) ),
 sSHTTPSchema( RTL_CONSTASCII_USTRINGPARAM( "shttp://"; ) ),
 sFILESchema( RTL_CONSTASCII_USTRINGPARAM( "file://" ) ),
@@ -96,6 +99,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, 
ResMgr& rResMgr, co
 maEDExportXSLT.SetHelpId( HID_XML_FILTER_EXPORT_XSLT );
 maEDImportXSLT.SetHelpId( HID_XML_FILTER_IMPORT_XSLT );
 maEDImportTemplate.SetHelpId( HID_XML_FILTER_IMPORT_TEMPLATE );
+maEDTransformationService.SetHelpId( HID_XML_FILTER_TRANSFORM_SERVICE );
 }
 
 XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT()
@@ -111,6 +115,7 @@ bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* 
pInfo )
 pInfo->maExportXSLT = GetURL( maEDExportXSLT );
 pInfo->maImportXSLT = GetURL( maEDImportXSLT );
 pInfo->maImportTemplate = GetURL( maEDImportTemplate );
+pInfo->maXSLTTransformerImpl = maEDTransformationService.GetText();
 }
 
 return true;
@@ -126,6 +131,8 @@ void XMLFilterTabPageXSLT::SetInfo(const filter_info_impl* 
pInfo)
 SetURL( maEDExportXSLT, pInfo->maExportXSLT );
 SetURL( maEDImportXSLT, pInfo->maImportXSLT );
 SetURL( maEDImportTemplate, pInfo->maImportTemplate );
+
+maEDTransformationService.SetText( pInfo->maXSLTTransformerImpl );
 }
 }
 
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hrc 
b/filter/source/xsltdialog/xmlfilterta

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - moz/makefile.mk moz/patches moz/seamonkey-source-1.1.14.patch nss/makefile.mk nss/nss-linux3.patch nss/nss.patch

2011-10-18 Thread Michael Stahl 
 moz/makefile.mk   |4 +++-
 moz/patches/nss-linux3.patch  |   13 +
 moz/seamonkey-source-1.1.14.patch |   16 
 nss/makefile.mk   |2 +-
 nss/nss-linux3.patch  |   13 +
 nss/nss.patch |   14 --
 6 files changed, 30 insertions(+), 32 deletions(-)

New commits:
commit a7460c931b51f1876ff6b49d0c27300295c7d1f8
Author: Michael Stahl 
Date:   Tue Oct 18 21:52:30 2011 +0200

moz: replace Linux 3.0 workaround with one for 3.x

backport of fa70d98e729c0dba44e1c8e25fe1323bad918945 to 3.4

Signed-off-by Michael Meeks 

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 94d6935..c11cf6a 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -95,7 +95,9 @@ PATCH_FILES = \
 patches/link_fontconfig.patch \
 patches/brokenmakefile.patch \
 patches/aix_build_fix.patch \
-patches/libpr0n_build_fix.patch
+patches/libpr0n_build_fix.patch \
+patches/nss-linux3.patch \
+
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/nss-linux3.patch b/moz/patches/nss-linux3.patch
new file mode 100644
index 000..b735669
--- /dev/null
+++ b/moz/patches/nss-linux3.patch
@@ -0,0 +1,13 @@
+--- misc/mozilla/security/coreconf/arch.mk 2011-10-06 19:58:31.808695724 
+0200
 misc/build/mozilla/security/coreconf/arch.mk   2011-10-06 
19:58:00.074648943 +0200
+@@ -152,6 +152,10 @@
+ 
+ ifeq ($(OS_ARCH),Linux)
+ OS_RELEASE := $(subst ., ,$(OS_RELEASE))
++# force Linux 3.x to 2.6
++ifeq ($(word 1,$(OS_RELEASE)),3)
++  OS_RELEASE := 2 6
++endif
+ ifneq ($(words $(OS_RELEASE)),1)
+   OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+ endif
diff --git a/moz/seamonkey-source-1.1.14.patch 
b/moz/seamonkey-source-1.1.14.patch
index db62e8b..566a044 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -6336,19 +6336,3 @@
  
  clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
 /dev/null  2011-07-24 19:07:44.290563140 +0200
-+++ misc/build/mozilla/security/coreconf/Linux3.0.mk   2011-07-24 
22:21:02.710513995 +0200
-@@ -0,0 +1,13 @@
-+include $(CORE_DEPTH)/coreconf/Linux.mk
-+
-+DSO_LDOPTS  += -Wl,-z,defs
-+
-+OS_REL_CFLAGS   += -DLINUX2_1
-+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+
-+ifdef MAPFILE
-+  MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
commit 2a3a9ed405e6c5e1af293187bfc881d6f210093a
Author: Michael Stahl 
Date:   Tue Oct 18 21:48:46 2011 +0200

nss: replace Linux 3.0 workaround with one for 3.x

backport of ab3895465a6cf0a8a41c7432ad9a8f77df7ae572 to 3.4

Signed-off-by Michael Meeks 

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 45f1feb..22ebefb 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -44,7 +44,7 @@ all:
 TARFILE_NAME=nss-3.12.8-with-nspr-4.8.6
 TARFILE_MD5=71474203939fafbe271e1263e61d083e
 TARFILE_ROOTDIR=nss-3.12.8
-PATCH_FILES=nss.patch nss.aix.patch
+PATCH_FILES=nss.patch nss.aix.patch nss-linux3.patch
 
 .IF "$(OS)"=="MACOSX"
 PATCH_FILES+=nss_macosx.patch
diff --git a/nss/nss-linux3.patch b/nss/nss-linux3.patch
new file mode 100644
index 000..62c667f
--- /dev/null
+++ b/nss/nss-linux3.patch
@@ -0,0 +1,13 @@
+--- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk  2011-10-06 
19:58:31.808695724 +0200
 misc/build/nss-3.12.8/mozilla/security/coreconf/arch.mk2011-10-06 
19:58:00.074648943 +0200
+@@ -152,6 +152,10 @@
+ 
+ ifeq ($(OS_ARCH),Linux)
+ OS_RELEASE := $(subst ., ,$(OS_RELEASE))
++# force Linux 3.x to 2.6
++ifeq ($(word 1,$(OS_RELEASE)),3)
++  OS_RELEASE := 2 6
++endif
+ ifneq ($(words $(OS_RELEASE)),1)
+   OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+ endif
diff --git a/nss/nss.patch b/nss/nss.patch
index ac24855..6930e67 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -189,17 +189,3 @@
  endif
  CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
  
 /dev/null  2011-07-24 19:07:44.290563140 +0200
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/Linux3.0.mk
2011-07-24 22:21:02.710513995 +0200
-@@ -0,0 +1,11 @@
-+include $(CORE_DEPTH)/coreconf/Linux.mk
-+
-+OS_REL_CFLAGS   += -DLINUX2_1
-+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname 
-Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
-+
-+ifdef MAPFILE
-+  MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-18 Thread René Engelhard 
 configure.in |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit aaf48368c80e60d6bf325573bab89a2efae6da4c
Author: Rene Engelhard 
Date:   Tue Oct 18 21:26:40 2011 +0200

remove accidential Debian-only commit

diff --git a/configure.in b/configure.in
index 0fb9e7b..157a527 100644
--- a/configure.in
+++ b/configure.in
@@ -6485,9 +6485,8 @@ if test -n "$with_system_lpsolve" -o -n 
"$with_system_libs" && \
 # some systems need this. Like Ubuntu
 AC_CHECK_LIB(m, floor)
 AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_LIB(colamd, colamd)
 AC_CHECK_LIB(lpsolve55, make_lp, ,
-[ AC_MSG_ERROR(lpsolve library not found or too old.)], 
[-L/usr/lib/lpsolve])
+[ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
 MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS lpsolve55.dll"
 else
 AC_MSG_RESULT([internal])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source scp2/source

2011-10-18 Thread Stephan Bergmann 
 framework/source/services/substitutepathvars.cxx |9 ++---
 scp2/source/ooo/directory_ooo.scp|6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit d0a0513a9cbd25b2bcd933ec337f6366c86917cb
Author: Stephan Bergmann 
Date:   Tue Oct 18 18:49:34 2011 +0200

Undo basis/brand split: move program/{addin,filter,plugin} from basis to 
brand.

And let $(prog), $(progpath), $(progurl) point to brand program/
instead of basis program/.

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index e7648d2..d7e45ef 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1186,12 +1186,6 @@ void 
SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
 ::utl::Bootstrap::PathStatus aState;
 ::rtl::OUString  sVal  ;
 
-rtl::OUString basis(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
-rtl::Bootstrap::expandMacros(basis);
-if( basis.isEmpty() ) {
-LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", 
"Bootstrap code has no value for OOO_BASE_DIR!");
-}
-
 aState = utl::Bootstrap::locateUserData( sVal );
 //There can be the valid case that there is no user installation. For 
example, "unopkg sync"
 //is currently (OOo3.4) run as part of the setup. Then no user 
installation is required.
@@ -1215,7 +1209,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables( 
PredefinedPathVariable
 
 // Detect the program directory
 // Set $(prog), $(progpath), $(progurl)
-INetURLObject aProgObj( basis );
+INetURLObject aProgObj(
+aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] );
 if ( !aProgObj.HasError() && aProgObj.insertName( 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) )
 {
 aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = 
aProgObj.GetMainURL(INetURLObject::NO_DECODE);
diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 726834a..836e79a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -127,7 +127,7 @@ End
 
 Directory gid_Dir_Addin
 Styles = (CREATE);
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
 DosName = "addin";
 End
 
@@ -137,7 +137,7 @@ Directory gid_Dir_Addin_Source
 End
 
 Directory gid_Dir_Filter
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
 DosName = "filter";
 End
 
@@ -344,7 +344,7 @@ Directory gid_Dir_Work
 End
 
 Directory gid_Dir_Plugin
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
 DosName = "plugin";
 Styles = (WORKSTATION, CREATE);
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - moz/makefile.mk moz/patches moz/seamonkey-source-1.1.14.patch sal/rtl solenv/gbuild svx/source

2011-10-18 Thread Michael Stahl 
 moz/makefile.mk  |4 -
 moz/patches/nss-linux3.patch |   13 +++
 moz/seamonkey-source-1.1.14.patch|   16 
 sal/rtl/source/alloc_impl.h  |7 +
 solenv/gbuild/Library.mk |4 -
 solenv/gbuild/platform/ios.mk|1 
 solenv/gbuild/platform/macosx.mk |1 
 solenv/gbuild/platform/unxgcc.mk |1 
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |   53 +++
 9 files changed, 42 insertions(+), 58 deletions(-)

New commits:
commit d34a819233de940dcfe389fc87baebfbcbc7da66
Author: Michael Stahl 
Date:   Tue Oct 18 17:35:52 2011 +0200

fdo#41935: deadlock in ViewObjectContactOfUnoControl

Remove the mutex member of ViewObjectContactOfUnoControl_Impl and use
the SolarMutex instead, because the current usage of 2 mutexes is just
too prone to deadlock.

diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx 
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index a0056f8..ab1a2d1 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -564,19 +564,15 @@ namespace sdr { namespace contact {
 class SVX_DLLPRIVATE ViewObjectContactOfUnoControl_Impl : public 
ViewObjectContactOfUnoControl_Impl_Base
 {
 private:
+// fdo#41935 note that access to members is protected with SolarMutex;
+// the class previously had its own mutex but that is prone to deadlock
+
 /// the instance whose IMPL we are
 ViewObjectContactOfUnoControl*  m_pAntiImpl;
 
 /// are we currently inside impl_ensureControl_nothrow?
 boolm_bCreatingControl;
 
-/** thread safety
-
-(not really. ATM only our X* implementations are guarded with 
this, but not
-the object as a whole.)
-*/
-mutable ::osl::Mutexm_aMutex;
-
 /// the control we're responsible for
 ControlHolder   m_aControl;
 
@@ -683,9 +679,6 @@ namespace sdr { namespace contact {
 ControlHolder& _out_rControl
 );
 
-struct GuardAccess { friend class VOCGuard; private: GuardAccess() { } 
};
-::osl::Mutex&   getMutex( GuardAccess ) const { return m_aMutex; }
-
 const ViewContactOfUnoControl&
 getViewContact() const
 {
@@ -879,23 +872,6 @@ namespace sdr { namespace contact {
 };
 
 //
-//= VOCGuard
-//
-/** class for guarding a ViewObjectContactOfUnoControl_Impl method
- */
-class VOCGuard
-{
-private:
-::osl::MutexGuard   m_aMutexGuard;
-
-public:
-VOCGuard( const ViewObjectContactOfUnoControl_Impl& _rImpl )
-:m_aMutexGuard( _rImpl.getMutex( 
ViewObjectContactOfUnoControl_Impl::GuardAccess() ) )
-{
-}
-};
-
-//
 //= LazyControlCreationPrimitive2D
 //
 class LazyControlCreationPrimitive2D : public 
::drawinglayer::primitive2d::BufferedDecompositionPrimitive2D
@@ -1026,7 +1002,7 @@ namespace sdr { namespace contact {
 //
 void ViewObjectContactOfUnoControl_Impl::dispose()
 {
-VOCGuard aGuard( *this );
+SolarMutexGuard aSolarGuard;
 impl_dispose_nothrow( true );
 }
 
@@ -1441,7 +1417,6 @@ namespace sdr { namespace contact {
 // which alone needs the SolarMutex. Of course this - a 
removeFooListener needed the SolarMutex -
 // is the real bug. Toolkit really is infested with solar mutex 
usage ... :(
 // #i82169# / 2007-11-14 / frank.schoenh...@sun.com
-VOCGuard aGuard( *this );
 
 if ( !m_aControl.is() )
 return;
@@ -1474,14 +1449,14 @@ namespace sdr { namespace contact {
 //
 void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const 
EventObject& /*e*/ ) throw(RuntimeException)
 {
-VOCGuard aGuard( *this );
+SolarMutexGuard aSolarGuard;
 m_bControlIsVisible = true;
 }
 
 //
 void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const 
EventObject& /*e*/ ) throw(RuntimeException)
 {
-VOCGuard aGuard( *this );
+SolarMutexGuard aSolarGuard;
 m_bControlIsVisible = false;
 }
 
@@ -1495,7 +1470,6 @@ nam

[Libreoffice-commits] .: vcl/unx

2011-10-18 Thread Lubos Lunak 
 vcl/unx/kde4/KDESalFrame.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 7cd58dbe32e5421986216dd7c6b24a4bb0b9c1e5
Author: Luboš Luňák 
Date:   Tue Oct 18 16:52:47 2011 +0200

style tooltips properly with KDE4 vclplug (fdo#40461)

diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 10e7350..4dd54e5 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -38,6 +38,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #undef Region
 
@@ -239,11 +241,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 style.SetFieldTextColor( aText );
 style.SetFieldRolloverTextColor( aText );
 style.SetWindowTextColor( aText );
-style.SetHelpTextColor( aText );
 
 // Base
 style.SetFieldColor( aBase );
-style.SetHelpColor( aBase );
 style.SetWindowColor( aBase );
 style.SetActiveTabColor( aBase );
 
@@ -268,11 +268,14 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 style.SetHighlightColor( aHigh );
 style.SetHighlightTextColor( toColor(pal.color( 
QPalette::HighlightedText))  );
 
+// Tooltip
+style.SetHelpColor( toColor( QToolTip::palette().color( QPalette::Active, 
QPalette::ToolTipBase )));
+style.SetHelpTextColor( toColor( QToolTip::palette().color( 
QPalette::Active, QPalette::ToolTipText )));
+
 // Font
 Font aFont = toFont( kapp->font(), rSettings.GetUILocale() );
 
 style.SetAppFont( aFont );
-style.SetHelpFont( aFont );
 
 style.SetMenuFont( aFont ); // will be changed according to pMenuBar
 //style.SetToolFont( aFont ); //already set above
@@ -291,6 +294,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 }
 style.SetFloatTitleFont( aFont );
 
+style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale()));
+
 int flash_time = QApplication::cursorFlashTime();
 style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : 
STYLE_CURSOR_NOBLINKTIME );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 16 commits - formula/source sc/inc sc/Library_scfilt.mk sc/source

2011-10-18 Thread Tor Lillqvist 
 formula/source/core/api/FormulaCompiler.cxx |1 -
 sc/Library_scfilt.mk|2 +-
 sc/inc/scmod.hxx|4 ++--
 sc/source/filter/excel/xestream.cxx |2 +-
 sc/source/filter/xml/xmlexprt.cxx   |1 -
 sc/source/filter/xml/xmlimprt.cxx   |1 -
 sc/source/ui/inc/autostyl.hxx   |2 +-
 sc/source/ui/inc/prevloc.hxx|2 +-
 sc/source/ui/vba/vbaformatconditions.hxx|   17 +
 sc/source/ui/vba/vbamenubars.cxx|3 ---
 sc/source/ui/vba/vbarange.cxx   |4 ++--
 sc/source/ui/vba/vbaworkbooks.cxx   |2 +-
 sc/source/ui/vba/vbaworksheet.cxx   |1 -
 sc/source/ui/view/tabcont.cxx   |2 +-
 sc/source/ui/view/tabvwsh3.cxx  |2 +-
 sc/source/ui/view/viewfunc.cxx  |6 +++---
 16 files changed, 31 insertions(+), 21 deletions(-)

New commits:
commit 1836e37f831dd5da06f12bc34d995610a81b6181
Author: Tor Lillqvist 
Date:   Tue Oct 18 18:20:39 2011 +0300

WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation

diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index cc19a93..34bd426 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -542,7 +542,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 case FID_NORMALVIEWMODE:
 case FID_PAGEBREAKMODE:
 {
-sal_Bool bWantPageBreak = nSlot == FID_PAGEBREAKMODE;
+bool bWantPageBreak = nSlot == FID_PAGEBREAKMODE;
 
 // check whether there is an explicit argument, use it
 const SfxPoolItem* pItem;
commit 354f88b376195003841fc8474a600cf22d8b3a05
Author: Tor Lillqvist 
Date:   Tue Oct 18 18:20:16 2011 +0300

WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation

diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 6324fb2..dacdb11 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -488,16 +488,16 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB 
nTab, const String& rS
 do
 {
 bAgain = false;
-sal_Bool bAddEqual = false;
+bool bAddEqual = false;
 ScTokenArray* pArrFirst = pArr = aComp.CompileString( aFormula 
);
-sal_Bool bCorrected = aComp.IsCorrected();
+bool bCorrected = aComp.IsCorrected();
 if ( bCorrected )
 {   // probieren, mit erster Parser-Korrektur neu zu parsen
 pArr = aComp.CompileString( aComp.GetCorrectedFormula() );
 }
 if ( !pArr->GetCodeError() )
 {
-bAddEqual = sal_True;
+bAddEqual = true;
 aComp.CompileTokenArray();
 bCorrected |= aComp.IsCorrected();
 }
commit c4648a4c0f5920f8f070bbbe8f18b165b6b70802
Author: Tor Lillqvist 
Date:   Tue Oct 18 18:02:33 2011 +0300

WaE: '!=' : unsafe mix of type 'bool' and type 'sal_Bool' in operation

diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 676c806..18ec9bb 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -364,7 +364,7 @@ void ScTabControl::UpdateStatus()
 {
 bModified = false;  // 
Selektion
 for (i=0; i(i)+1) )
+if ( rMark.GetTableSelect(i) != (bool) 
IsPageSelected(static_cast(i)+1) )
 bModified = sal_True;
 
 // #i99576# the following loop is mis-optimized on unxsoli4 and the 
reason
commit 52974709b0ddf70e7dce5f85bae2bd1108f64002
Author: Tor Lillqvist 
Date:   Tue Oct 18 18:01:06 2011 +0300

WaE: type name first seen using 'class' now seen using 'struct'

diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index 936803c..3ecdd57 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -49,7 +49,7 @@ class Rectangle;
 class ScAddress;
 class ScRange;
 class ScDocument;
-class ScPreviewLocationEntry;
+struct ScPreviewLocationEntry;
 
 struct ScPreviewColRowInfo
 {
commit 7bbcea33a2aacece2d5f5abe1a97d9e7fc9615f6
Author: Tor Lillqvist 
Date:   Tue Oct 18 18:00:49 2011 +0300

WaE: type name first seen using 'class' now seen using 'struct'

diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index cbf2706..3ff5138 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -37,7 +37,7 @@
 
 class ScDocShell;
 class ScRange;
-class ScAutoStyleData;
+struct ScAutoStyleData;
 struct ScAutoStyleInitData;
 
 class ScAutoStyleList
commit a0bbe01a00b22a3fe62a101910564d6576cd3425
Author: Tor Lillqvist 
Date:   Tue Oct 18 17:54:35 2011 +0300

WaE: type name first seen using 'class' now seen us

[Libreoffice-commits] .: 3 commits - svl/inc svl/source

2011-10-18 Thread Michael Meeks 
 svl/inc/svl/inettype.hxx |   81 -
 svl/inc/svl/svl.hrc  |  131 ++--
 svl/source/misc/inettype.cxx |  106 ---
 svl/source/misc/mediatyp.src |  196 ---
 4 files changed, 46 insertions(+), 468 deletions(-)

New commits:
commit d6f2418d0828ec4275355502ae3f87c80e16e8f5
Author: Lior Kaplan 
Date:   Mon Oct 17 20:41:27 2011 +0200

Align a rebellious line

diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 5c0d061..2ac8213 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -54,7 +54,7 @@
 #define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+21)
 #define STR_SVT_MIMETYPE_TEXT_URL   (STR_SVT_MIMETYPE_START+22)
 #define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+23)
-#define STR_SVT_MIMETYPE_VIDEO_THEORA   (STR_SVT_MIMETYPE_START+24)
+#define STR_SVT_MIMETYPE_VIDEO_THEORA   (STR_SVT_MIMETYPE_START+24)
 #define STR_SVT_MIMETYPE_VIDEO_VDO  (STR_SVT_MIMETYPE_START+25)
 #define STR_SVT_MIMETYPE_VIDEO_MSVIDEO  (STR_SVT_MIMETYPE_START+26)
 #define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+27)
commit 89a4f63bc56c7525f9e1d3e5b5d30859536b062e
Author: Lior Kaplan 
Date:   Mon Oct 17 20:40:26 2011 +0200

Compact the enumeration spaces from previous commit

diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 1bc3cde..5c0d061 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -66,93 +66,54 @@
 #define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+33)
 #define STR_SVT_MIMETYPE_APP_SCHED_TVIEW(STR_SVT_MIMETYPE_START+34)
 
-(STR_SVT_MIMETYPE_START+35)
-(STR_SVT_MIMETYPE_START+36)
-(STR_SVT_MIMETYPE_START+37)
-(STR_SVT_MIMETYPE_START+38)
-(STR_SVT_MIMETYPE_START+39)
-(STR_SVT_MIMETYPE_START+40)
-(STR_SVT_MIMETYPE_START+41)
-(STR_SVT_MIMETYPE_START+42)
-(STR_SVT_MIMETYPE_START+43)
-(STR_SVT_MIMETYPE_START+44)
-(STR_SVT_MIMETYPE_START+45)
-(STR_SVT_MIMETYPE_START+46)
-(STR_SVT_MIMETYPE_START+47)
-(STR_SVT_MIMETYPE_START+48)
-(STR_SVT_MIMETYPE_START+49)
-(STR_SVT_MIMETYPE_START+50)
-(STR_SVT_MIMETYPE_START+51)
-#define STR_SVT_MIMETYPE_CNT_FSYSBOX(STR_SVT_MIMETYPE_START+52)
-#define STR_SVT_MIMETYPE_CNT_FSYSFLD(STR_SVT_MIMETYPE_START+53)
-(STR_SVT_MIMETYPE_START+54)
-(STR_SVT_MIMETYPE_START+55)
-(STR_SVT_MIMETYPE_START+56)
-(STR_SVT_MIMETYPE_START+57)
-(STR_SVT_MIMETYPE_START+58)
-(STR_SVT_MIMETYPE_START+59)
-(STR_SVT_MIMETYPE_START+60)
-(STR_SVT_MIMETYPE_START+61)
-(STR_SVT_MIMETYPE_START+62)
-(STR_SVT_MIMETYPE_START+63)
-(STR_SVT_MIMETYPE_START+64)
-(STR_SVT_MIMETYPE_START+65)
-(STR_SVT_MIMETYPE_START+66)
-(STR_SVT_MIMETYPE_START+67)
-(STR_SVT_MIMETYPE_START+68)
-(STR_SVT_MIMETYPE_START+69)
-(STR_SVT_MIMETYPE_START+70)
-(STR_SVT_MIMETYPE_START+71)
-(STR_SVT_MIMETYPE_START+72)
-(STR_SVT_MIMETYPE_START+73)
-#define STR_SVT_MIMETYPE_APP_GAL(STR_SVT_MIMETYPE_START+74)
-#define STR_SVT_MIMETYPE_APP_GAL_THEME  (STR_SVT_MIMETYPE_START+75)
-(STR_SVT_MIMETYPE_START+76)
-#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+77)
-#define STR_SVT_MIMETYPE_APP_SDM(STR_SVT_MIMETYPE_START+78)
-#define STR_SVT_MIMETYPE_APP_SMD(STR_SVT_MIMETYPE_START+79)
-#define STR_SVT_MIMETYPE_APP_STARW_WEB  (STR_SVT_MIMETYPE_START+80)
-#define STR_SVT_MIMETYPE_SCHEDULE   (STR_SVT_MIMETYPE_START+81)
-#define STR_SVT_MIMETYPE_SCHEDULE_EVT   (STR_SVT_MIMETYPE_START+82)
-#define STR_SVT_MIMETYPE_SCHEDULE_TASK  (STR_SVT_MIMETYPE_START+83)
-#define STR_SVT_MIMETYPE_SCHEDULE_FEVT  (STR_SVT_MIMETYPE_START+84)
-#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+85)
-#define STR_SVT_MIMETYPE_FRAMESET   (STR_SVT_MIMETYPE_START+86)
-#define STR_SVT_MIMETYPE_MACRO  (STR_SVT_MIMETYPE_START+87)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER(STR_SVT_MIMETYPE_START+88)
-(STR_SVT_MIMETYPE_START+89)
-#define STR_SVT_MIMETYPE_APP_TEMPLATE   (STR_SVT_MIMETYPE_START+90)
-#define STR_SVT_MIMETYPE_IMAGE_GENERIC  (STR_SVT_MIMETYPE_START+91)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL(STR_SVT_MIMETYPE_START+92)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+93)
-#define STR_SVT_MIMETYPE_APP_MSPPOINT   (STR_SVT_MIMETYPE_START+94)
-#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+95)
-#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+96)
-#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+97)
-#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+98)
-#define STR_SVT_MIMETYPE_INET_MSG_RFC822(STR_SVT_MIMETYPE_START+99)
-#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+100)
-#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST  (STR_SVT_MIMETYPE_START+101)
-#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL(STR_SVT_MIMETYPE_START+102)
-#define STR_SVT_MIMETYPE_INET_MULTI_RELATED

[Libreoffice-commits] .: smoketestoo_native/losmoketest.py

2011-10-18 Thread Petr Mladek 
 smoketestoo_native/losmoketest.py |  172 ++
 1 file changed, 121 insertions(+), 51 deletions(-)

New commits:
commit c55b2dcceed29c3e9df181b2775099d5b345a4e9
Author: Petr Mladek 
Date:   Tue Oct 18 14:51:37 2011 +0200

losmoketest.py: fix to work with LO-3.5 daily build and improved

+ use the version 3.5 instead of 3.4
+ use /opt/lo-dev instead of /opt/libreoffice3.4
+ new options:
+ -d/--download just download the last build
+ -s/--headless use the headless mode when running the smoke test
+ -l/--loop do download/install/smoketest in a loop; do it jsut once
  by default
+ uninstall the old version when -i/--install option is used
+ mention PASSED/FAILED in the test log
+ restore compat symlinks to prebuilt binaries when they do not exits
+ complain when build.cfg is missing

diff --git a/smoketestoo_native/losmoketest.py 
b/smoketestoo_native/losmoketest.py
index 8867fc2..42a8efb 100755
--- a/smoketestoo_native/losmoketest.py
+++ b/smoketestoo_native/losmoketest.py
@@ -47,8 +47,19 @@ try:
 except ImportError:
 import configparser
 
-build_version = "3.4"
-tag_version = "3-4"
+# FIXME: make this configurable via options or autodetect it
+build_version = "3.5"
+tag_version = "3-5"
+# devel build
+install_dirname="lo-dev"
+branding_pack="libo-dev"
+basis_pack="libobasis-dev"
+ure_pack="lodev"
+# stable build
+#install_dirname="libreoffice" + build_version
+#branding_pack="libreoffice"
+#basis_pack="libobasis"
+#ure_pack="libreoffice"
 
 build_check_interval = 5  #seconds
 
@@ -78,7 +89,7 @@ INSTALL_DIR = "" # Installation dir
 
 # SOFFICE_BIN bin
 if platform.system() == "Linux":
-SOFFICE_BIN= INSTALL_DIR + os.sep + "opt" + os.sep + "libreoffice" + 
build_version + os.sep + "program" + os.sep + "soffice"
+SOFFICE_BIN= INSTALL_DIR + os.sep + "opt" + os.sep + install_dirname + 
os.sep + "program" + os.sep + "soffice"
 
 # Relative build url
 ## pre-releases
@@ -145,6 +156,10 @@ def platform_info():
 
 def local_build_info(t):
 
+if not os.path.exists(LOCAL_BUILD_INFO_FILE):
+logger.error("Can't find the file: " + LOCAL_BUILD_INFO_FILE)
+sys.exit()
+
 config = configparser.RawConfigParser()
 config.read(LOCAL_BUILD_INFO_FILE)
 
@@ -271,10 +286,44 @@ def remote_build_info(url_reg):
 for b in build_list:
 if datetime.datetime.strptime(b[1] + ' ' + b[2], '%d-%b-%Y %H:%M') > 
build_time:
 build_name = b[0]
-build_time = datetime.datetime.strptime(b[1] + ' ' + b[2], 
'%d-%b-%Y %H:%M')
+try:
+build_time = datetime.datetime.strptime(b[1] + ' ' + b[2], 
'%d-%b-%Y %H:%M')
+except:
+print "remote_build_info: wrong time date&format"
 
 return build_name, build_time
 
+# return True when something was downloaded
+def download(url_reg, build_type):
+logger.info('Checking new build ...')
+
+try:
+remote_build = remote_build_info(url_reg)
+local_build = local_build_info(build_type)
+
+#print 'remote_build[1]=' + remote_build[1].isoformat()
+#print 'local_build[1]=' + local_build[1].isoformat()
+if remote_build[1] > local_build[1]:
+logger.info('Found New build: ' + remote_build[0])
+if fetch_build(url_reg[0], remote_build[0]):
+set_build_config(build_type, 'build_name', remote_build[0])
+set_build_config(build_type, 'build_time', 
datetime.datetime.strftime(remote_build[1], '%d-%b-%Y %H:%M'))
+else:
+logger.error('Download build failed!')
+else:
+return False
+
+except urllib2.URLError, HTTPError:
+logger.error('Error fetch remote build info.')
+return False
+except KeyboardInterrupt:
+sys.exit()
+except:
+print "Some Error"
+return False
+
+return True
+
 
 def fetch_build(url, filename):
 ''' Download a build from address url/filename '''
@@ -309,7 +358,7 @@ def uninstall():
 
 if pck == 'rpm':
 cmd_query  = ["rpm", "-qa"]
-cmd_filter = ["grep", "-e", "libreoffice"+build_version, "-e", 
"libobasis"+build_version]
+cmd_filter = ["grep", "-e", branding_pack+build_version, "-e", 
basis_pack+build_version,  "-e", ure_pack+build_version]
 
 P_query  = subprocess.Popen(cmd_query, stdout = subprocess.PIPE)
 P_filter = subprocess.Popen(cmd_filter, stdin = P_query.stdout, stdout 
= subprocess.PIPE)
@@ -322,7 +371,7 @@ def uninstall():
 else:
 cmd = ["sudo", "rpm", "-e"] + str_filter.split()
 elif pck == 'deb':
-cmd_query = ["dpkg", "--get-selections", 
"libreoffice"+build_version+"*", "libobasis"+build_version+"*"]
+cmd_query = ["dpkg", "--get-selections", 
branding_pack+build_version+"*", basis_pack+build_version+"*", 
ure_pack+build_version+"*"]
 cmd_filter = ["cut", "-f", "1"]
 
 P_quer

[Libreoffice-commits] .: 2 commits - .gitignore sc/qa

2011-10-18 Thread Caolán McNamara 
 .gitignore  |1 +
 sc/qa/unit/filters-test.cxx |   10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit dde2c5e5dcdbdebc61ab40586fb6b6451884a647
Author: Caolán McNamara 
Date:   Tue Oct 18 13:31:58 2011 +0100

ignore callcatcher dirs

diff --git a/.gitignore b/.gitignore
index b4fe3c2..e102c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@
 /*/unxand?.pro
 /*/unx*.obsolete
 /*/wnt*.obsolete
+/*/callcatcher
 /workdir
 /solver
 /instsetoo_native/util/LibreOffice
commit 87c2fd70ae2796ab3e964bd80592ef9ee5329fef
Author: Caolán McNamara 
Date:   Tue Oct 18 13:26:15 2011 +0100

Fix E_ACCESS failure under windows on attempt to remove temp qa data file

The reference counting of ScDocShell is very confused. It starts off with 
ref
count of 1, assigning it to a ScDocShellRef gives it a refcount of 2, so
clearing it or its dtor gives a refcount of 1 again, so it doesn't 
auto-delete,
and so doesn't close its stream, so the attempt to remove its stream gives
E_ACCESS under windows.

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 878d4bc..68885a5 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -216,8 +216,11 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString 
&rFilter, const rtl::OUStr
 SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READWRITE, true);
 pSrcMed->SetFilter(aFilter);
 if (!xDocShRef->DoLoad(pSrcMed))
+{
+xDocShRef->DoClose();
 // load failed.
 xDocShRef.Clear();
+}
 else if (nFormatType)
 {
 pSrcMed->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, 4));
@@ -230,7 +233,12 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString 
&rFilter, const rtl::OUStr
 bool ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString 
&rURL,
 const rtl::OUString &rUserData)
 {
-return load(rFilter, rURL, rUserData, rtl::OUString()).Is();
+ScDocShellRef xDocShRef = load(rFilter, rURL, rUserData, rtl::OUString());
+bool bLoaded = xDocShRef.Is();
+//reference counting of ScDocShellRef is very confused.
+if (bLoaded)
+xDocShRef->DoClose();
+return bLoaded;
 }
 
 void ScFiltersTest::createFileURL(const rtl::OUString& aFileBase, const 
rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: README.cross

2011-10-18 Thread Jan Holesovsky 
 README.cross |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c2ccc32df9787c4c32eb37fae4d639b82af80037
Author: Jan Holesovsky 
Date:   Tue Oct 18 14:34:15 2011 +0200

Add --disable-nss-module to the README.cross.

diff --git a/README.cross b/README.cross
index 7040685..04d208b 100644
--- a/README.cross
+++ b/README.cross
@@ -141,6 +141,7 @@ CXX_FOR_BUILD=ccache g++
 --disable-ext-wiki-publisher
 --disable-ext-wiki-publisher
 --disable-mozilla
+--disable-nss-module
 --disable-zenity
 --enable-python=system
 --with-external-tar=/mnt/hemulen/ooo/git/master/src
@@ -186,6 +187,7 @@ CXX_FOR_BUILD=ccache g++
 --disable-binfilter
 --disable-build-mozilla
 --disable-mozilla
+--disable-nss-module
 --with-system-altlinuxhyph
 --with-system-boost
 --with-system-cairo
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-10-18 Thread Cédric Bosdonnat 
 sw/source/ui/docvw/FrameControlsManager.cxx |   17 -
 sw/source/ui/inc/FrameControl.hxx   |   15 ++-
 sw/source/ui/inc/FrameControlsManager.hxx   |3 +++
 3 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit a12a2b63e2bc705c2dca85b9e3194c38dbe6d349
Author: Cédric Bosdonnat 
Date:   Tue Oct 18 12:59:27 2011 +0200

Removed some -Weffc++ warnings from the Header/Footer work

diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx 
b/sw/source/ui/docvw/FrameControlsManager.cxx
index 6fe07e2..62f9b32 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -45,6 +45,7 @@ namespace
 
 public:
 FramePredicate( const SwFrm* pFrm ) : m_pToMatch( pFrm ) { };
+virtual ~FramePredicate() {};
 
 virtual bool operator()( SwFrameControlPtr pToCheck )
 { return m_pToMatch == pToCheck->GetFrame(); };
@@ -52,7 +53,8 @@ namespace
 }
 
 SwFrameControlsManager::SwFrameControlsManager( SwEditWin* pEditWin ) :
-m_pEditWin( pEditWin )
+m_pEditWin( pEditWin ),
+m_aControls( )
 {
 }
 
@@ -68,6 +70,19 @@ SwFrameControlsManager::~SwFrameControlsManager()
 m_aControls.clear();
 }
 
+SwFrameControlsManager::SwFrameControlsManager( const SwFrameControlsManager& 
rCopy ) :
+m_pEditWin( rCopy.m_pEditWin ),
+m_aControls( rCopy.m_aControls )
+{
+}
+
+const SwFrameControlsManager& SwFrameControlsManager::operator=( const 
SwFrameControlsManager& rCopy )
+{
+m_pEditWin = rCopy.m_pEditWin;
+m_aControls = rCopy.m_aControls;
+return *this;
+}
+
 std::vector< SwFrameControlPtr >& SwFrameControlsManager::GetControls( 
FrameControlType eType )
 {
 return m_aControls[eType];
diff --git a/sw/source/ui/inc/FrameControl.hxx 
b/sw/source/ui/inc/FrameControl.hxx
index 0be643d..4e52918 100644
--- a/sw/source/ui/inc/FrameControl.hxx
+++ b/sw/source/ui/inc/FrameControl.hxx
@@ -41,7 +41,20 @@ class SwFrameControl
 public:
 SwFrameControl( SwEditWin* pEditWin, const SwFrm* pFrm ) :
 m_pEditWin( pEditWin ), m_pFrm( pFrm ) {};
-~SwFrameControl( ) {};
+virtual ~SwFrameControl( ) {};
+
+SwFrameControl( const SwFrameControl& rCopy ) :
+m_pEditWin( rCopy.m_pEditWin ),
+m_pFrm( rCopy.m_pFrm )
+{
+}
+
+const SwFrameControl& operator=( const SwFrameControl& rCopy )
+{
+m_pEditWin = rCopy.m_pEditWin;
+m_pFrm = rCopy.m_pFrm;
+return *this;
+}
 
 const SwFrm* GetFrame( ) { return m_pFrm; }
 SwEditWin*   GetEditWin( ) { return m_pEditWin; }
diff --git a/sw/source/ui/inc/FrameControlsManager.hxx 
b/sw/source/ui/inc/FrameControlsManager.hxx
index b79843f..798c0b9 100644
--- a/sw/source/ui/inc/FrameControlsManager.hxx
+++ b/sw/source/ui/inc/FrameControlsManager.hxx
@@ -57,6 +57,9 @@ class SwFrameControlsManager
 SwFrameControlsManager( SwEditWin* pEditWin );
 ~SwFrameControlsManager( );
 
+SwFrameControlsManager( const SwFrameControlsManager& rCopy );
+const SwFrameControlsManager& operator=( const SwFrameControlsManager& 
rCopy );
+
 std::vector< SwFrameControlPtr >& GetControls( FrameControlType eType 
);
 void AddControl( FrameControlType eType, SwFrameControlPtr pControl );
 void RemoveControls( const SwFrm* pFrm );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - connectivity/source scp2/source solenv/gbuild solenv/inc xml2cmp/source

2011-10-18 Thread Stephan Bergmann 
 connectivity/source/drivers/hsqldb/HDriver.cxx |6 +++---
 scp2/source/ooo/common_brand.scp   |2 +-
 scp2/source/ooo/directory_ooo.scp  |2 +-
 scp2/source/ooo/profileitem_ooo.scp|   11 +--
 solenv/gbuild/Jar.mk   |2 +-
 solenv/inc/settings.mk |3 ++-
 xml2cmp/source/support/list.hxx|4 ++--
 7 files changed, 11 insertions(+), 19 deletions(-)

New commits:
commit 2487c54d1c6ff00d3d37bb326fc86206764ecfdc
Author: Stephan Bergmann 
Date:   Tue Oct 18 12:51:45 2011 +0200

Fixed uses of memmove in DynamicList.

diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
index 80b9e5e..cf949a0 100644
--- a/xml2cmp/source/support/list.hxx
+++ b/xml2cmp/source/support/list.hxx
@@ -227,7 +227,7 @@ DynamicList::insert(unsigned pos, XY * const & elem_)
   return;
 
 this->checkSize(this->len+2);
-memmove(this->inhalt[pos+1], this->inhalt[pos], (this->len-pos) * 
sizeof(XY*) );
+memmove(&this->inhalt[pos+1], &this->inhalt[pos], (this->len-pos) * 
sizeof(XY*) );
 this->inhalt[pos] = elem_;
 this->len++;
 }
@@ -240,7 +240,7 @@ DynamicList::remove( unsigned   pos )
 return;
 this->len--;
 delete this->inhalt[pos];
-memmove(this->inhalt[pos], this->inhalt[pos+1], (this->len-pos) * 
sizeof(XY*) );
+memmove(&this->inhalt[pos], &this->inhalt[pos+1], (this->len-pos) * 
sizeof(XY*) );
 }
 
 
commit fd1db0b8eba8e86c5a7e1a3c685e76975d21d93c
Author: Stephan Bergmann 
Date:   Tue Oct 18 12:50:02 2011 +0200

Undo basis/brand split: move program/classes/ from basis to brand.

Also removed apparently unused UNO_JAVA_COMPPATH ProfileItem.

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 3973cf5..7d2623a 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -242,10 +242,10 @@ namespace connectivity
 ::rtl::OUString(
 #ifdef SYSTEM_HSQLDB
 RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR
-" 
vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
+" 
vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
 #else
-
RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/hsqldb.jar"
-" 
vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
+
RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/hsqldb.jar"
+" 
vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
 #endif
 ) );
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 830f7ea..52611ad 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1231,7 +1231,7 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
 ProfileID = gid_Brand_Profile_Fundamental_Ini;
 Section = "Bootstrap";
 Key = "URE_MORE_JAVA_TYPES";
-Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) 
":URE_MORE_JAVA_TYPES}";
+Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar 
${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) 
":URE_MORE_JAVA_TYPES}";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 2d52395..726834a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -152,7 +152,7 @@ Directory gid_Dir_Httphome
 End
 
 Directory gid_Dir_Classes
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
 DosName = "classes";
 End
 
diff --git a/scp2/source/ooo/profileitem_ooo.scp 
b/scp2/source/ooo/profileitem_ooo.scp
index 3c6dfef..78b9606 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -27,15 +27,6 @@
 
 #include "macros.inc"
 
-ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = "Bootstrap";
-Order = 1;
-Key = "UNO_JAVA_COMPPATH";
-Value = "$ORIGIN/classes";
-End
-
 ProfileItem gid_Profileitem_Setup_Uno_Services
 ProfileID = gid_Profile_Setup_Ini;
 ModuleID = gid_Module_Root;
@@ -358,7 +349,7 @@ ProfileItem 
gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
 ProfileID = gid_Profile_Fundamentalbasis_Ini;
 Section = "Bootstrap";
 Key = "URE_MORE_JAVA_TYPES";
-Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar 
${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} 
${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} 
${${$ORIGIN/

[Libreoffice-commits] .: configure.in libxmlsec/makefile.mk postprocess/packcomponents scp2/source

2011-10-18 Thread Jan Holesovsky 
 configure.in   |   83 +++--
 libxmlsec/makefile.mk  |4 -
 postprocess/packcomponents/makefile.mk |2 
 scp2/source/ooo/file_library_ooo.scp   |2 
 4 files changed, 44 insertions(+), 47 deletions(-)

New commits:
commit d37209912b44f5accee73e7f774122b195fe2183
Author: Jan Holesovsky 
Date:   Tue Oct 18 12:05:08 2011 +0200

Decouple NSS build from the Mozilla build.

This allows xmlsecurity to be built even when --disable-mozilla is provided.

diff --git a/configure.in b/configure.in
index 5a84e68..0fb9e7b 100644
--- a/configure.in
+++ b/configure.in
@@ -2321,13 +2321,11 @@ if test -n "$enable_dbgutil" && test "$enable_dbgutil" 
!= "no"; then
 fi
 if test $_os = WINNT -a \
 \( "$enable_mozilla" = yes -o \
-   "$enable_nss_module" = yes -o \
"$enable_build_mozilla" = yes \); then
 # We can't build against the Mozilla stuff if using _DEBUG, will get 
linking errors
 # See connectivity/drivers/mozab
 AC_MSG_WARN([Also disabling Mozilla stuff then])
 enable_mozilla=no
-enable_nss_module=no
 enable_build_mozilla=no
 fi
 else
@@ -5679,11 +5677,10 @@ else
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
-AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using 
components])
+AC_MSG_CHECKING([whether to enable build of Mozilla])
 if test "$enable_mozilla" = "no"; then
 AC_MSG_RESULT([no])
 WITH_MOZILLA=NO
-ENABLE_NSS_MODULE=NO
 else
 AC_MSG_RESULT([yes])
 WITH_MOZILLA=YES
@@ -5700,8 +5697,8 @@ else
 fi
 
 AC_MSG_CHECKING([whether to build XML Security support])
-if test "$enable_mozilla" = "no"; then
-AC_MSG_RESULT([no, since Mozilla (NSS) disabled but needed])
+if test "$enable_nss_module" = "no"; then
+AC_MSG_RESULT([no, NSS disabled])
 else
 AC_MSG_RESULT([yes])
 fi
@@ -5841,8 +5838,6 @@ Please recompile $tmp with --enable-ldap or use 
--with-openldap.])
 elif test "$enable_mozilla" = "no"; then
 AC_MSG_RESULT([none])
 WITH_MOZILLA=NO
-ENABLE_NSS_MODULE=NO
-enable_nss_module=no
 else
 AC_MSG_RESULT([internal])
 SYSTEM_MOZILLA=NO
@@ -5893,40 +5888,6 @@ else
 AC_MSG_RESULT([no])
 fi
 
-AC_MSG_CHECKING([whether to build provided NSS module])
-if test "$enable_nss_module" != "no"; then
-ENABLE_NSS_MODULE="YES"
-BUILD_TYPE="$BUILD_TYPE NSS"
-AC_MSG_RESULT([yes])
-if test "$build_os" = "cygwin"; then
-AC_MSG_CHECKING([for Mozilla build tooling])
-if test -z "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling not found.
-Use the --with-mozilla-build option after installing the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
-else
-if test \( "$WITH_MINGW" = "yes" \) ; then
-if test ! -d "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling incomplete!])
-else
-AC_MSG_RESULT([ok])
-fi
-else
-if test ! -d "$MOZILLABUILD/moztools" \
--o ! -d "$MOZILLABUILD/msys" ; then
-AC_MSG_ERROR([Mozilla build tooling incomplete!])
-else
-AC_MSG_RESULT([ok])
-fi
-fi
-fi
-fi
-else
-ENABLE_NSS_MODULE="NO"
-AC_MSG_RESULT([no])
-fi
-
-
 if test "$BUILD_MOZAB" = "TRUE"; then
 if test "$_os" = "WINNT"; then
 if test "$WITH_MINGW" != "yes"; then
@@ -6008,7 +5969,6 @@ fi
 AC_SUBST(BUILD_MOZAB)
 
 fi
-AC_SUBST(ENABLE_NSS_MODULE)
 AC_SUBST(MOZILLABUILD)
 AC_SUBST(SYSTEM_MOZILLA)
 AC_SUBST(MOZ_FLAVOUR)
@@ -6020,6 +5980,43 @@ AC_SUBST(MOZ_NSS_CFLAGS)
 AC_SUBST(MOZ_LDAP_CFLAGS)
 
 dnl ===
+dnl Check for system NSS
+dnl ===
+AC_MSG_CHECKING([whether to build provided NSS module])
+if test "$enable_nss_module" != "no"; then
+ENABLE_NSS_MODULE="YES"
+BUILD_TYPE="$BUILD_TYPE NSS"
+AC_MSG_RESULT([yes])
+if test "$build_os" = "cygwin"; then
+AC_MSG_CHECKING([for Mozilla build tooling])
+if test -z "$MOZILLABUILD" ; then
+AC_MSG_ERROR([Mozilla build tooling not found.
+Use the --with-mozilla-build option after installing the tools obtained
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
+else
+if test \( "$WITH_MINGW" = "yes" \) ; then
+if test ! -d "$MOZILLABUILD" ; then
+AC_MSG_ERROR([Mozilla build tooling incomplete!])
+else
+AC_MSG_RESULT([ok])
+fi
+else
+if test ! -d "$MOZILLABUILD/moztools" \
+-o ! -d "$MOZILLABUILD/msys" ; then
+AC_MSG_ERROR([Mozilla build tooling inc

[Libreoffice-commits] .: sc/source

2011-10-18 Thread Caolán McNamara 
 sc/source/filter/excel/impop.cxx|2 +-
 sc/source/filter/excel/xichart.cxx  |   10 --
 sc/source/filter/excel/xiescher.cxx |   21 +
 sc/source/ui/unoobj/chart2uno.cxx   |   13 ++---
 4 files changed, 32 insertions(+), 14 deletions(-)

New commits:
commit 5f3a31f6f5a0271a5d2d04852e88a66672027bd1
Author: Caolán McNamara 
Date:   Tue Oct 18 10:32:38 2011 +0100

survive some fuzz

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index d98376f..7892776 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -200,7 +200,7 @@ sal_uInt16 ImportExcel::ReadXFIndex( bool bBiff2 )
 sal_uInt16 nXFIdx = 0;
 if( bBiff2 )
 {
-sal_uInt8 nXFIdx2;
+sal_uInt8 nXFIdx2 = 0;
 maStrm >> nXFIdx2;
 maStrm.Ignore( 2 );
 nXFIdx = nXFIdx2 & 0x3F;
diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index 36c0fe4..0e9f8fa 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -3348,8 +3348,10 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const 
XclImpChTypeGroup& rTypeGroup
 {
 case cssc2::AxisType::CATEGORY:
 case cssc2::AxisType::SERIES:
+OSL_ENSURE( mxLabelRange, "Missing Label Range" );
 // #i71684# radar charts have reversed rotation direction
-mxLabelRange->Convert( aAxisProp, aScaleData, 
rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_RADAR );
+if (mxLabelRange)
+mxLabelRange->Convert( aAxisProp, aScaleData, 
rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_RADAR );
 break;
 case cssc2::AxisType::REALNUMBER:
 case cssc2::AxisType::PERCENT:
@@ -3401,7 +3403,11 @@ void XclImpChAxis::ConvertWall( ScfPropertySet& rPropSet 
) const
 void XclImpChAxis::ConvertAxisPosition( ScfPropertySet& rPropSet, const 
XclImpChTypeGroup& rTypeGroup ) const
 {
 if( ((GetAxisType() == EXC_CHAXIS_X) && 
rTypeGroup.GetTypeInfo().mbCategoryAxis) || (GetAxisType() == EXC_CHAXIS_Z) )
-mxLabelRange->ConvertAxisPosition( rPropSet, rTypeGroup.Is3dChart() );
+{
+OSL_ENSURE( mxLabelRange, "Missing Label Range" );
+if (mxLabelRange)
+mxLabelRange->ConvertAxisPosition( rPropSet, 
rTypeGroup.Is3dChart() );
+}
 else
 mxValueRange->ConvertAxisPosition( rPropSet );
 }
diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 2d88855..72af124 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -290,7 +290,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const 
XclImpRoot& rRoot, XclImpStr
 
 if( rStrm.GetRecLeft() >= 34 )
 {
-sal_uInt16 nObjType;
+sal_uInt16 nObjType(EXC_OBJTYPE_UNKNOWN);
 rStrm.Ignore( 4 );
 rStrm >> nObjType;
 switch( nObjType )
@@ -322,8 +322,13 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const 
XclImpRoot& rRoot, XclImpStr
 }
 }
 
-xDrawObj->mnTab = rRoot.GetCurrScTab();
-xDrawObj->ImplReadObj5( rStrm );
+OSL_ENSURE(xDrawObj, "object import failed");
+
+if (xDrawObj)
+{
+xDrawObj->mnTab = rRoot.GetCurrScTab();
+xDrawObj->ImplReadObj5( rStrm );
+}
 return xDrawObj;
 }
 
@@ -1664,7 +1669,7 @@ void XclImpChartObj::DoPostProcessSdrObj( 
XclImpDffConverter& rDffConv, SdrObjec
 mxChart->Convert( xModel, rDffConv, xPersist->getEntryName(), 
rSdrObj.GetLogicRect() );
 xPersist->storeOwn();
 }
-catch( Exception& )
+catch( const Exception& )
 {
 }
 }
@@ -3310,7 +3315,7 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const 
XclImpTbxObjBase& rTbxObj,
 }
 }
 }
-catch( Exception& )
+catch( const Exception& )
 {
 }
 
@@ -3349,7 +3354,7 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const 
XclImpPictureObj& rPicObj,
  }
 }
 }
-catch( Exception& )
+catch( const Exception& )
 {
 }
 }
@@ -3540,7 +3545,7 @@ sal_Bool XclImpDffConverter::InsertControl( const 
Reference< XFormComponent >& r
 if( pxShape ) *pxShape = xShape;
 return sal_True;
 }
-catch( Exception& )
+catch( const Exception& )
 {
 OSL_FAIL( "XclImpDffConverter::InsertControl - cannot create form 
control" );
 }
@@ -3712,7 +3717,7 @@ void XclImpDffConverter::InitControlForm()
 xFormsNC->insertByName( maStdFormName, Any( rConvData.mxCtrlForm ) 
);
 }
 }
-catch( Exception& )
+catch( const Exception& )
 {
 }
 }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 04c1537..757edb6 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.

[Libreoffice-commits] .: 2 commits - sfx2/source ucb/source

2011-10-18 Thread Cédric Bosdonnat 
 sfx2/source/doc/sfxbasemodel.cxx |   23 +++
 ucb/source/ucp/cmis/cmis_content.cxx |8 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 32d1dbdfadd0f3a3c71531c6f816568e7bd5d069
Author: Michael Stahl 
Date:   Tue Oct 18 10:47:59 2011 +0200

CMIS: Fixed the smoketests failure by catching some exceptions

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c335aea..cbd04f2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3771,23 +3771,30 @@ css::uno::Reference< css::frame::XUntitledNumbers > 
SfxBaseModel::impl_getUntitl
 SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
 if ( pMedium )
 {
-::ucbhelper::Content aContent( pMedium->GetName(), 
com::sun::star::uno::Reference < ucb::XCommandEnvironment >() );
-com::sun::star::uno::Reference < beans::XPropertySetInfo > xProps 
= aContent.getProperties();
-if ( xProps.is() )
-{
-::rtl::OUString aServerTitle( 
RTL_CONSTASCII_USTRINGPARAM("TitleOnServer") );
-if ( xProps->hasPropertyByName( aServerTitle ) )
+try {
+::ucbhelper::Content aContent( pMedium->GetName(),
+uno::Reference() );
+const uno::Reference < beans::XPropertySetInfo > xProps
+ = aContent.getProperties();
+if ( xProps.is() )
 {
-uno::Any aAny = aContent.getPropertyValue( aServerTitle );
-aAny >>= aResult;
+::rtl::OUString aServerTitle( 
RTL_CONSTASCII_USTRINGPARAM("TitleOnServer") );
+if ( xProps->hasPropertyByName( aServerTitle ) )
+{
+uno::Any aAny = aContent.getPropertyValue( 
aServerTitle );
+aAny >>= aResult;
+}
 }
 }
-else
+catch (ucb::ContentCreationException &)
+{
+}
+catch (ucb::CommandAbortedException &)
 {
-SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, 
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
-if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
-aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
 }
+SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, 
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
+if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
+aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
 }
 
 if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (pMedium && 
pMedium->IsReadOnly()) )
commit 228051c11a5757507656460f7d28852aa9b5b540
Author: Cédric Bosdonnat 
Date:   Tue Oct 18 08:03:11 2011 +0200

Reapply "CMIS: use another name to show than the one extracted from the 
base URL

This reverts commit 4901bdf4c4971e9b8235ab9bfbd0ee1088d51b45.

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 777929d..c335aea 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -65,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include   // can be removed when this is a "real" 
service
 
 #include 
@@ -3769,9 +3771,23 @@ css::uno::Reference< css::frame::XUntitledNumbers > 
SfxBaseModel::impl_getUntitl
 SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
 if ( pMedium )
 {
-SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, 
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
-if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
-aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
+::ucbhelper::Content aContent( pMedium->GetName(), 
com::sun::star::uno::Reference < ucb::XCommandEnvironment >() );
+com::sun::star::uno::Reference < beans::XPropertySetInfo > xProps 
= aContent.getProperties();
+if ( xProps.is() )
+{
+::rtl::OUString aServerTitle( 
RTL_CONSTASCII_USTRINGPARAM("TitleOnServer") );
+if ( xProps->hasPropertyByName( aServerTitle ) )
+{
+uno::Any aAny = aContent.getPropertyValue( aServerTitle );
+aAny >>= aResult;
+}
+}
+else
+{
+SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, 
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
+if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
+aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
+}
 }
 
 if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (pMediu

[Libreoffice-commits] .: framework/source scp2/source setup_native/source unotools/source

2011-10-18 Thread Stephan Bergmann 
 framework/source/services/substitutepathvars.cxx   
|   11 +++---
 scp2/source/ooo/directory_ooo.scp  
|4 +--
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|2 -
 unotools/source/config/bootstrap.cxx   
|2 -
 4 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 538d29f5a4d36a836124d49bb29e19a8954b34f9
Author: Stephan Bergmann 
Date:   Tue Oct 18 09:47:41 2011 +0200

Undo basis/brand split: move presets/ from basis to brand.

Also let utl::Bootstrap::locateBaseInstallation return
$BRAND_BASE_DIR instead of $OOO_BASE_DIR, so that things match again.

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index d4a20da..e7648d2 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1186,13 +1186,10 @@ void 
SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
 ::utl::Bootstrap::PathStatus aState;
 ::rtl::OUString  sVal  ;
 
-rtl::OUString basis;
-aState = utl::Bootstrap::locateBaseInstallation( sVal );
-if( aState==::utl::Bootstrap::PATH_EXISTS ) {
-basis = ConvertOSLtoUCBURL( sVal );
-}
-else {
-LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", 
"Bootstrap code has no value for instpath!");
+rtl::OUString basis(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
+rtl::Bootstrap::expandMacros(basis);
+if( basis.isEmpty() ) {
+LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", 
"Bootstrap code has no value for OOO_BASE_DIR!");
 }
 
 aState = utl::Bootstrap::locateUserData( sVal );
diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index b505095..2d52395 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -172,9 +172,9 @@ End
 
 Directory gid_Dir_User
 #if defined MACOSX
-ParentID = gid_Brand_Dir_BasisLink;
+ParentID = gid_Dir_Bundle_Contents;
 #else
-ParentID = gid_Dir_Ooo_Basis;
+ParentID = gid_Dir_Brand_Root;
 #endif
 DosName = "presets";
 End
diff --git 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 9435118..1e30c46 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -244,7 +244,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
 return ERROR_SUCCESS;
 }
 
-// Removing complete directory "Basis\presets\bundled"
+// Removing complete directory "Basis\prereg\bundled"
 
 std::_tstring sCacheDir = sInstDir + TEXT("share\\prereg\\bundled");
 
diff --git a/unotools/source/config/bootstrap.cxx 
b/unotools/source/config/bootstrap.cxx
index c239854..1f960cf 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -58,7 +58,7 @@
 #define BOOTSTRAP_ITEM_VERSIONFILE  "Location"
 #define BOOTSTRAP_ITEM_BUILDID  "buildid"
 
-#define BOOTSTRAP_ITEM_BASEINSTALLATION "BaseInstallation"
+#define BOOTSTRAP_ITEM_BASEINSTALLATION "BRAND_BASE_DIR"
 #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation"
 
 #define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits