[Libreoffice-commits] .: editeng/inc editeng/qa sc/qa test/Library_test.mk test/source

[Kohei Yoshida]

 editeng/inc/editeng/eerdll.hxx   |2 +-
 editeng/qa/unit/core-test.cxx|2 --
 sc/qa/unit/ucalc.cxx |1 -
 test/Library_test.mk |1 +
 test/source/bootstrapfixture.cxx |2 ++
 5 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5b14929dd4f659420c5707b7c432fb9337cfff1d
Author: Kohei Yoshida 
Date:   Thu Apr 12 00:53:55 2012 -0400

Handle the correct deletion order of EditDLL in the base class.

Turns out that this change affected all cppunit runs.

diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 226aefe..5fd9896 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -53,7 +53,7 @@ public:
 ResMgr* GetResMgr() const   { return pResMgr; }
 GlobalEditData* GetGlobalData() const   { return pGlobalData; }
 static EditDLL& Get();
-static void Release();
+EDITENG_DLLPUBLIC static void Release();
 };
 
 #define EE_DLL() EditDLL::Get()
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 1e83599..fc5828f 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -74,8 +74,6 @@ void Test::setUp()
 void Test::tearDown()
 {
 SfxItemPool::Free(mpItemPool);
-EditDLL::Release();
-
 test::BootstrapFixture::tearDown();
 }
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8f15b8d..130ad67 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -303,7 +303,6 @@ void Test::setUp()
 void Test::tearDown()
 {
 m_xDocShRef.Clear();
-
 BootstrapFixture::tearDown();
 }
 
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 571d26c..f66e101 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,test,\
 comphelper \
 cppu \
 cppuhelper \
+editeng \
i18nisolang1 \
 sal \
tl \
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 284dbf7..f4b8139 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -107,6 +108,7 @@ void test::BootstrapFixture::setUp()
 void test::BootstrapFixture::tearDown()
 {
 ucbhelper::ContentBroker::deinitialize();
+EditDLL::Release();
 test::BootstrapFixtureBase::tearDown();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/qa

[Kohei Yoshida]

 editeng/qa/unit/core-test.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c0de63a858ee02bba2a9154b239085a64a277999
Author: Kohei Yoshida 
Date:   Wed Apr 11 23:42:19 2012 -0400

Remove the TODO comment that's no longer relevant.

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 49a6efb..1e83599 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -83,7 +83,6 @@ void Test::testConstruction()
 {
 EditEngine aEngine(mpItemPool);
 
-// TODO: This currently causes segfault in vcl.
 rtl::OUString aParaText = "I am Edit Engine.";
 aEngine.SetText(aParaText);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/qa editeng/source

[Kohei Yoshida]

 editeng/inc/editeng/eerdll.hxx|1 +
 editeng/qa/unit/core-test.cxx |5 +++--
 editeng/source/editeng/eerdll.cxx |   19 ++-
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit b5800fac1d57b80772823bd8bc288a6cebe82e6f
Author: Kohei Yoshida 
Date:   Wed Apr 11 23:29:01 2012 -0400

We need to delete EditDLL before de-initialize vcl to avoid crash.

Without manually releasing the EditDLL singleton instance, it gets
deleted *after* the cppunit does its cleanup, which de-initializes VCL.
The problem is, when the EditDLL instance is destroyed, its member
GlobalEditData instance deletes the OutputDevice instance that it owns,
which in turn accesses font caches in VCL.  But by the time we reach
that point, VCL is already de-initialized, hence the problem.

diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 00094cf..226aefe 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -53,6 +53,7 @@ public:
 ResMgr* GetResMgr() const   { return pResMgr; }
 GlobalEditData* GetGlobalData() const   { return pGlobalData; }
 static EditDLL& Get();
+static void Release();
 };
 
 #define EE_DLL() EditDLL::Get()
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index b8e3111..49a6efb 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -74,6 +74,7 @@ void Test::setUp()
 void Test::tearDown()
 {
 SfxItemPool::Free(mpItemPool);
+EditDLL::Release();
 
 test::BootstrapFixture::tearDown();
 }
@@ -83,8 +84,8 @@ void Test::testConstruction()
 EditEngine aEngine(mpItemPool);
 
 // TODO: This currently causes segfault in vcl.
-//  rtl::OUString aParaText = "I am Edit Engine.";
-//  aEngine.SetText(aParaText);
+rtl::OUString aParaText = "I am Edit Engine.";
+aEngine.SetText(aParaText);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/editeng/source/editeng/eerdll.cxx 
b/editeng/source/editeng/eerdll.cxx
index 1e0f3e4..ccec18e 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -72,18 +72,27 @@
 #include 
 #include 
 #include 
-#include 
+
+#include 
 
 using namespace ::com::sun::star;
 
-namespace
-{
-class theEditDLL : public rtl::Static {};
+namespace {
+
+boost::scoped_ptr pDLL;
+
 }
 
 EditDLL& EditDLL::Get()
 {
-return theEditDLL::get();
+if (!pDLL)
+pDLL.reset(new EditDLL);
+return *pDLL;
+}
+
+void EditDLL::Release()
+{
+pDLL.reset();
 }
 
 GlobalEditData::GlobalEditData()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sd/source svtools/source

[Rafael Dominguez]

 sd/source/ui/view/drviews2.cxx |   13 ++---
 svtools/source/contnr/imivctl1.cxx |   16 ++--
 2 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit 3b887c8d3fef676e0037a4f3381f6a491ec0da4f
Author: Rafael Dominguez 
Date:   Sat Mar 31 21:12:50 2012 -0430

Replace deprecated List for std::vector.

diff --git a/svtools/source/contnr/imivctl1.cxx 
b/svtools/source/contnr/imivctl1.cxx
index eec11d1..4cbaa46 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3558,25 +3558,13 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( 
SvxIconChoiceCtrlPositionMode eMod
 
 if( ePositionMode == IcnViewPositionModeAutoArrange )
 {
-List aMovedEntries;
 for( size_t nCur = 0; nCur < nCount; nCur++ )
 {
 SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
 if( pEntry->GetFlags() & (ICNVIEW_FLAG_POS_LOCKED | 
ICNVIEW_FLAG_POS_MOVED))
-{
-SvxIconChoiceCtrlEntry_Impl* pE = new 
SvxIconChoiceCtrlEntry_Impl(
-pEntry, GetEntryBoundRect( pEntry ));
-aMovedEntries.Insert( pE, LIST_APPEND );
-}
+SetEntryPos(pEntry, GetEntryBoundRect( pEntry ).TopLeft());
 }
-nCount = aMovedEntries.Count();
-for( size_t nCur = 0; nCur < nCount; nCur++ )
-{
-SvxIconChoiceCtrlEntry_Impl* pE = 
(SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject(nCur);
-SetEntryPos( pE->_pEntry, pE->_aPos );
-}
-for( size_t nCur = 0; nCur < nCount; nCur++ )
-delete (SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject( nCur 
);
+
 if( aEntries.size() )
 aAutoArrangeTimer.Start();
 }
commit a9a05a06ac275ec2695ff607ed118e1b46ab7a4e
Author: Rafael Dominguez 
Date:   Thu Mar 29 19:26:11 2012 -0430

Replace deprecated List for vector.

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 179fe66..6ecad4c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -804,7 +804,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 // der harten Attribute sowie der UserCall eingetragen, da 
diese beim nachfolgenden
 // mpDrawView->SetAttributes( *pSet, sal_True ) verloren gehen 
und spaeter restauriert
 // werden muessen
-List* pAttrList = new List();
+std::vector > aAttrList;
 SdPage* pPresPage = (SdPage*) 
mpDrawView->GetSdrPageView()->GetPage();
 sal_uLong i;
 
@@ -816,8 +816,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 {
 SfxItemSet* pNewSet = new SfxItemSet( 
GetDoc()->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 
0 );
 pNewSet->Put(pObj->GetMergedItemSet());
-pAttrList->Insert( pNewSet, LIST_APPEND );
-pAttrList->Insert( pObj->GetUserCall(), LIST_APPEND );
+aAttrList.push_back(std::make_pair(pNewSet, 
pObj->GetUserCall()));
 }
 }
 
@@ -857,8 +856,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
 if( pPresPage->IsPresObj( pObj ) )
 {
-SfxItemSet* pNewSet = (SfxItemSet*) 
pAttrList->GetObject(j++);
-SdrObjUserCall* pUserCall = (SdrObjUserCall*) 
pAttrList->GetObject(j++);
+std::pair &rAttr = 
aAttrList[j++];
+
+SfxItemSet* pNewSet = rAttr.first;
+SdrObjUserCall* pUserCall = rAttr.second;
 
 if ( pNewSet && pNewSet->GetItemState( 
SDRATTR_TEXT_MINFRAMEHEIGHT ) == SFX_ITEM_ON )
 {
@@ -876,8 +877,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 delete pNewSet;
 }
 }
-
-delete pAttrList;
 }
 
 delete pSet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/CppunitTest_editeng_core.mk editeng/qa

[Kohei Yoshida]

 editeng/CppunitTest_editeng_core.mk |1 -
 editeng/qa/unit/core-test.cxx   |   30 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

New commits:
commit a9448bd1b7b64eff74198ead63154ae132ed853b
Author: Kohei Yoshida 
Date:   Wed Apr 11 21:53:33 2012 -0400

Avoid duplicate symbols & use setUp() and tearDown() for the item pool.

diff --git a/editeng/CppunitTest_editeng_core.mk 
b/editeng/CppunitTest_editeng_core.mk
index c94ff95..90117c8 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
 comphelper \
 cppu \
 cppuhelper \
-editeng \
 i18nisolang1 \
 i18nutil \
 lng \
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index e5c556f..b8e3111 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -49,20 +49,42 @@ class Test : public test::BootstrapFixture
 public:
 Test();
 
+virtual void setUp();
+virtual void tearDown();
+
 void testConstruction();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testConstruction);
 CPPUNIT_TEST_SUITE_END();
+
+private:
+EditEngineItemPool* mpItemPool;
 };
 
-Test::Test() {}
+Test::Test() : mpItemPool(NULL) {}
+
+void Test::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mpItemPool = new EditEngineItemPool(true);
+}
+
+void Test::tearDown()
+{
+SfxItemPool::Free(mpItemPool);
+
+test::BootstrapFixture::tearDown();
+}
 
 void Test::testConstruction()
 {
-EditEngineItemPool* pPool = new EditEngineItemPool(true);
-EditEngine aEngine(pPool);
-SfxItemPool::Free(pPool);
+EditEngine aEngine(mpItemPool);
+
+// TODO: This currently causes segfault in vcl.
+//  rtl::OUString aParaText = "I am Edit Engine.";
+//  aEngine.SetText(aParaText);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/qa editeng/source

[Kohei Yoshida]

 editeng/qa/unit/core-test.cxx  |   73 ++---
 editeng/source/editeng/editdoc.hxx |4 +-
 2 files changed, 6 insertions(+), 71 deletions(-)

New commits:
commit 1bcd2c94930c95c1807c6112559f5b0041aeb4fa
Author: Kohei Yoshida 
Date:   Wed Apr 11 21:27:34 2012 -0400

Just use the internal item pool already written for the edit engine.

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 66707fa..e5c556f 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -40,75 +40,10 @@
 #include "editeng/editeng.hxx"
 #include "editeng/eeitem.hxx"
 #include "editeng/editids.hrc"
+#include "editeng/editdoc.hxx"
 
 namespace {
 
-const SfxItemInfo aItemInfos[] = {
-{ SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // 
EE_PARA_WRITINGDIR
-{ 0, SFX_ITEM_POOLABLE },   // 
EE_PARA_XMLATTRIBS
-{ SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE },   // 
EE_PARA_HANGINGPUNCTUATION
-{ SID_ATTR_PARA_FORBIDDEN_RULES, SFX_ITEM_POOLABLE },
-{ SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE },   // 
EE_PARA_ASIANCJKSPACING
-{ SID_ATTR_NUMBERING_RULE, SFX_ITEM_POOLABLE }, // EE_PARA_NUMBULL
-{ 0, SFX_ITEM_POOLABLE },   // 
EE_PARA_HYPHENATE
-{ 0, SFX_ITEM_POOLABLE },   // 
EE_PARA_BULLETSTATE
-{ 0, SFX_ITEM_POOLABLE },   // 
EE_PARA_OUTLLRSPACE
-{ SID_ATTR_PARA_OUTLLEVEL, SFX_ITEM_POOLABLE }, // 
EE_PARA_OUTLLEVEL
-{ SID_ATTR_PARA_BULLET, SFX_ITEM_POOLABLE },// EE_PARA_BULLET
-{ SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE },// EE_PARA_LRSPACE
-{ SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE },// EE_PARA_ULSPACE
-{ SID_ATTR_PARA_LINESPACE, SFX_ITEM_POOLABLE }, // EE_PARA_SBL
-{ SID_ATTR_PARA_ADJUST, SFX_ITEM_POOLABLE },// EE_PARA_JUST
-{ SID_ATTR_TABSTOP, SFX_ITEM_POOLABLE },// EE_PARA_TABS
-{ SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, SFX_ITEM_POOLABLE }, // 
EE_PARA_JUST_METHOD
-{ SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE },  // EE_PARA_VER_JUST
-{ SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_ESCAPEMENT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_AUTOKERN, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_KERNING, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE },
-{ SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE },
-{ 0, SFX_ITEM_POOLABLE },   // EE_CHAR_RUBI_DUMMY
-{ 0, SFX_ITEM_POOLABLE },   // EE_CHAR_XMLATTRIBS
-{ SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE },
-{ 0, SFX_ITEM_POOLABLE },   // EE_FEATURE_TAB
-{ 0, SFX_ITEM_POOLABLE },   // EE_FEATURE_LINEBR
-{ SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE },  // EE_FEATURE_NOTCONV
-{ SID_FIELD, SFX_ITEM_POOLABLE }
-};
-
-class TestPool : public SfxItemPool
-{
-public:
-TestPool() : SfxItemPool("TestPool", EE_ITEMS_START, EE_ITEMS_END, 
aItemInfos, NULL, true)
-{
-SfxPoolItem** ppDefItems = 
EditDLL::Get().GetGlobalData()->GetDefItems();
-SetDefaults(ppDefItems);
-}
-virtual ~TestPool() {}
-};
-
 class Test : public test::BootstrapFixture
 {
 public:
@@ -125,9 +60,9 @@ Test::Test() {}
 
 void Test::testConstruction()
 {
-TestPool aPool;
-
-EditEngine aEngine(&aPool);
+EditEngineItemPool* pPool = new EditEngineItemPool(true);
+EditEngine aEngine(pPool);
+SfxItemPool::Free(pPool);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 27c5b14..afd1398 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hx

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/ui/inc/tpformula.hxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit c510670e3cab5322ed82e5702f6f6e311c9823f6
Author: Albert Thuswaldner 
Date:   Thu Apr 12 01:01:06 2012 +0200

removed unused includes in tpformula.hxx

diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 033f61d..c547849 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -35,14 +35,6 @@
 #include 
 #include 
 
-#include 
-
-#include 
-
-class ScAppOptions;
-class SfxItemSet;
-class Window;
-
 class ScTpFormulaOptions : public SfxTabPage
 {
 public:
@@ -50,7 +42,6 @@ public:
 
 static  SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
 
-//  static  USHORT* GetRanges();
 virtual sal_Bool FillItemSet(SfxItemSet& rCoreSet);
 virtual void Reset( const SfxItemSet& rCoreSet );
 virtual int DeactivatePage(SfxItemSet* pSet = NULL);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/qa

[Kohei Yoshida]

 editeng/qa/unit/core-test.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e487d2fbf67cc6c7f4506d08eb7aa080a7d37c18
Author: Kohei Yoshida 
Date:   Wed Apr 11 20:47:58 2012 -0400

You *are* fixed.

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 27af952..66707fa 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -127,7 +127,6 @@ void Test::testConstruction()
 {
 TestPool aPool;
 
-// TODO: fix me
 EditEngine aEngine(&aPool);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/CppunitTest_editeng_core.mk editeng/qa

[Kohei Yoshida]

 editeng/CppunitTest_editeng_core.mk |3 +++
 editeng/qa/unit/core-test.cxx   |   10 --
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 8b216a7aa3c88a6b18f62079757567a2d4e4d737
Author: Kohei Yoshida 
Date:   Wed Apr 11 20:46:45 2012 -0400

Set default items to the item pool, do this and that, and now the test 
passes.

diff --git a/editeng/CppunitTest_editeng_core.mk 
b/editeng/CppunitTest_editeng_core.mk
index 77e203d..c94ff95 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -35,6 +35,8 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,editeng_core, \
 editeng/qa/unit/core-test \
 ))
 
+$(eval $(call gb_CppunitTest_use_library_objects,editeng_core,editeng))
+
 $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
 basegfx \
 comphelper \
@@ -64,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_core,\
 ))
 
 $(eval $(call gb_CppunitTest_set_include,editeng_core,\
+-I$(SRCDIR)/editeng/source \
 $$(INCLUDE) \
 ))
 
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index d631923..27af952 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -35,6 +35,8 @@
 #include 
 
 #include "svl/itempool.hxx"
+#include "editeng/eerdll.hxx"
+#include "editeng/eerdll2.hxx"
 #include "editeng/editeng.hxx"
 #include "editeng/eeitem.hxx"
 #include "editeng/editids.hrc"
@@ -99,7 +101,11 @@ const SfxItemInfo aItemInfos[] = {
 class TestPool : public SfxItemPool
 {
 public:
-TestPool() : SfxItemPool("TestPool", EE_ITEMS_START, EE_ITEMS_END, 
aItemInfos, NULL, true) {}
+TestPool() : SfxItemPool("TestPool", EE_ITEMS_START, EE_ITEMS_END, 
aItemInfos, NULL, true)
+{
+SfxPoolItem** ppDefItems = 
EditDLL::Get().GetGlobalData()->GetDefItems();
+SetDefaults(ppDefItems);
+}
 virtual ~TestPool() {}
 };
 
@@ -122,7 +128,7 @@ void Test::testConstruction()
 TestPool aPool;
 
 // TODO: fix me
-//  EditEngine aEngine(&aPool);
+EditEngine aEngine(&aPool);
 }
 
 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

[Kohei Yoshida]

 sc/source/filter/oox/sharedformulabuffer.cxx |  213 ---
 1 file changed, 213 deletions(-)

New commits:
commit ddfa209fc0422c544292ad23413851d1b654de7c
Author: Kohei Yoshida 
Date:   Wed Apr 11 20:06:02 2012 -0400

Removed the source file of SharedFormulaBuffer, which is no longer used.

It has been replaced by SheetDataBuffer.

diff --git a/sc/source/filter/oox/sharedformulabuffer.cxx 
b/sc/source/filter/oox/sharedformulabuffer.cxx
deleted file mode 100644
index 9646534..000
--- a/sc/source/filter/oox/sharedformulabuffer.cxx
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include 
-#include 
-#include "oox/helper/propertyset.hxx"
-#include "addressconverter.hxx"
-#include "biffinputstream.hxx"
-#include "formulaparser.hxx"
-
-namespace oox {
-namespace xls {
-
-// 
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::sheet;
-using namespace ::com::sun::star::table;
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-// 
-
-namespace {
-
-bool operator==( const CellAddress& rAddr1, const CellAddress& rAddr2 )
-{
-return
-(rAddr1.Sheet == rAddr2.Sheet) &&
-(rAddr1.Column == rAddr2.Column) &&
-(rAddr1.Row == rAddr2.Row);
-}
-
-bool lclContains( const CellRangeAddress& rRange, const CellAddress& rAddr )
-{
-return
-(rRange.Sheet == rAddr.Sheet) &&
-(rRange.StartColumn <= rAddr.Column) && (rAddr.Column <= 
rRange.EndColumn) &&
-(rRange.StartRow <= rAddr.Row) && (rAddr.Row <= rRange.EndRow);
-}
-
-} // namespace
-
-// 
-
-ExtCellFormulaContext::ExtCellFormulaContext( const WorksheetHelper& rHelper,
-const Reference< XFormulaTokens >& rxTokens, const CellAddress& 
rCellPos ) :
-SimpleFormulaContext( rxTokens, false, false ),
-WorksheetHelper( rHelper )
-{
-setBaseAddress( rCellPos );
-}
-
-void ExtCellFormulaContext::setSharedFormula( const CellAddress& rBaseAddr )
-{
-getSharedFormulas().setSharedFormulaCell( *this, rBaseAddr );
-}
-
-// 
-
-SharedFormulaBuffer::SharedFormulaBuffer( const WorksheetHelper& rHelper ) :
-WorksheetHelper( rHelper )
-{
-}
-
-void SharedFormulaBuffer::importSharedFmla( const OUString& rFormula, const 
OUString& rSharedRange, sal_Int32 nSharedId, const CellAddress& rBaseAddr )
-{
-CellRangeAddress aFmlaRange;
-if( getAddressConverter().convertToCellRange( aFmlaRange, rSharedRange, 
getSheetIndex(), true, true ) )
-{
-// create the defined name representing the shared formula
-OSL_ENSURE( lclContains( aFmlaRange, rBaseAddr ), 
"SharedFormulaBuffer::importSharedFmla - invalid range for shared formula" );
-BinAddress aMapKey( nSharedId, 0 );
-Reference< XNamedRange > xNamedRange = createDefinedName( aMapKey );
-// convert the formula definition
-Reference< XFormulaTokens > xTokens( xNamedRange, UNO_QUERY );
-if( xTokens.is() )
-{
-SimpleFormulaContext aContext( xTokens, true, false );
-aContext.setBaseAddress( rBaseAddr );
-getFormulaParser().importFormula( aContext, rFormula );
-updateCachedCell( rBaseAddr, aMapKey );
-}
-}
-}
-
-void SharedFormulaBuffer::importSharedFmla( SequenceInputStream& rStrm, const 
CellAddress& rBaseAddr )
-{
-BinRange aRange;
-rStrm >> aRange;
-CellRangeAddress aFmlaRange;
-if( getAddressConverter().convertToCellRange( aFmlaRange, aRange, 
getSh

[Libreoffice-commits] .: editeng/CppunitTest_editeng_core.mk editeng/qa

[Caolán McNamara]

 editeng/CppunitTest_editeng_core.mk |2 ++
 editeng/qa/unit/core-test.cxx   |7 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 6089be1a7a17ae849d8793520e9d8d36296ed5cf
Author: Caolán McNamara 
Date:   Wed Apr 11 21:22:30 2012 +0100

needs ure and base-class setUp does necessary stuff

diff --git a/editeng/CppunitTest_editeng_core.mk 
b/editeng/CppunitTest_editeng_core.mk
index fb14e16..77e203d 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -72,6 +72,8 @@ $(eval $(call gb_CppunitTest_use_api,editeng_core,\
 udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_use_ure,editeng_core))
+
 $(eval $(call gb_CppunitTest_use_components,editeng_core,\
 configmgr/source/configmgr \
 framework/util/fwk \
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 43e668c..d631923 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -108,9 +108,6 @@ class Test : public test::BootstrapFixture
 public:
 Test();
 
-virtual void setUp();
-virtual void tearDown();
-
 void testConstruction();
 
 CPPUNIT_TEST_SUITE(Test);
@@ -120,10 +117,6 @@ public:
 
 Test::Test() {}
 
-void Test::setUp() {}
-
-void Test::tearDown() {}
-
 void Test::testConstruction()
 {
 TestPool aPool;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/inc/document.hxx|2 
 sc/inc/table.hxx   |1 
 sc/qa/unit/ucalc.cxx   |   35 +++
 sc/source/core/data/table2.cxx |5 
 sc/source/core/data/table4.cxx |  464 +++--
 5 files changed, 308 insertions(+), 199 deletions(-)

New commits:
commit 73ff3a49a0891c7787f08eec86357c320a76c263
Author: Markus Mohrhard 
Date:   Wed Apr 11 22:02:06 2012 +0200

first part for ScTable::GetAutoFillPreview

Actually this is a bit more tricky. Currently it is showing wrong values
for hidden rows/columns

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 7c9fcf9..e091504 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1027,7 +1027,7 @@ String ScTable::GetAutoFillPreview( const ScRange& 
rSource, SCCOL nEndX, SCROW n
 aValue = ((ScStringCell*)pCell)->GetString();
 else
 aValue = ((ScEditCell*)pCell)->GetString();
-if ( !(nScFillModeMouseModifier & KEY_MOD1) && 
!IsDataFiltered(nCol1, nRow1, nEndX, nEndY) )
+if ( !(nScFillModeMouseModifier & KEY_MOD1) )
 {
 sal_Int32 nVal;
 sal_uInt16 nCellDigits = 0; // look at each source 
cell individually
@@ -1048,7 +1048,7 @@ String ScTable::GetAutoFillPreview( const ScRange& 
rSource, SCCOL nEndX, SCROW n
 {
 //  dabei kann's keinen Ueberlauf geben...
 double nVal = ((ScValueCell*)pCell)->GetValue();
-if ( !(nScFillModeMouseModifier & KEY_MOD1) && 
!IsDataFiltered(nCol1, nRow1, nEndX, nEndY) )
+if ( !(nScFillModeMouseModifier & KEY_MOD1) )
 nVal += (double) nDelta;
 
 Color* pColor;
commit 290a851bdc42a78426dea987ffbcb511e36c34fb
Author: Markus Mohrhard 
Date:   Wed Apr 11 21:53:30 2012 +0200

ScTable::FillAuto should work with hidden rows/columsn now too

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index fa23055..7c9fcf9 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -536,7 +536,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 sal_uLong nIMin = nIStart;
 sal_uLong nIMax = nIEnd;
 PutInOrder(nIMin,nIMax);
-bool bHasFiltered = IsDataFiltered(aFillRange.aStart.Col(), 
aFillRange.aStart.Row(), aFillRange.aEnd.Col(), aFillRange.aEnd.Row());
+bool bHasFiltered = IsDataFiltered(aFillRange);
 
 if (!bHasFiltered)
 {
@@ -569,52 +569,52 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 rInner = nIStart;
 while (true)// #i53728# with "for (;;)" old solaris/x86 
compiler mis-optimizes
 {
-if ( bGetPattern )
+if (!ColHidden(nCol) && !RowHidden(nRow))
 {
-delete pNewPattern;
-if (bVertical)  // rInner&:=nRow, rOuter&:=nCol
-pSrcPattern = 
aCol[nCol].GetPattern(static_cast(nAtSrc));
-else// rInner&:=nCol, rOuter&:=nRow
-pSrcPattern = 
aCol[nAtSrc].GetPattern(static_cast(nRow));
-bGetPattern = false;
-pStyleSheet = pSrcPattern->GetStyleSheet();
-//  Merge/Mergeflag nicht uebernehmen,
-const SfxItemSet& rSet = pSrcPattern->GetItemSet();
-if ( rSet.GetItemState(ATTR_MERGE, false) == SFX_ITEM_SET
-  || rSet.GetItemState(ATTR_MERGE_FLAG, false) == SFX_ITEM_SET 
)
+if ( bGetPattern )
 {
-pNewPattern = new ScPatternAttr( *pSrcPattern );
-SfxItemSet& rNewSet = pNewPattern->GetItemSet();
-rNewSet.ClearItem(ATTR_MERGE);
-rNewSet.ClearItem(ATTR_MERGE_FLAG);
+delete pNewPattern;
+if (bVertical)  // rInner&:=nRow, rOuter&:=nCol
+pSrcPattern = 
aCol[nCol].GetPattern(static_cast(nAtSrc));
+else// rInner&:=nCol, rOuter&:=nRow
+pSrcPattern = 
aCol[nAtSrc].GetPattern(static_cast(nRow));
+bGetPattern = false;
+pStyleSheet = pSrcPattern->GetStyleSheet();
+//  Merge/Mergeflag nicht uebernehmen,
+const SfxItemSet& rSet = pSrcPattern->GetItemSet();
+if ( rSet.GetItemState(ATTR_MERGE, false) == SFX_ITEM_SET
+|| rSet.GetItemState(ATTR_MERGE_FLAG, false) == 
SFX_ITEM_SET )
+{
+pNewPattern = new ScPatternAttr( *pSrcPattern );
+SfxItemSet& rNew

[Libreoffice-commits] .: editeng/source

[Kohei Yoshida]

 editeng/source/editeng/editdoc.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a78a7ee9f7b1db56a6fa7e082f410db5a8db2f18
Author: Kohei Yoshida 
Date:   Wed Apr 11 15:36:00 2012 -0400

Do this special case search only when the array is large enough.

Otherwise the normal linear search should be sufficient.  Eventually
we need to use a better algorithm here than this special case handling...

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index f797d24..c791aa2 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -688,7 +688,7 @@ size_t FastGetPos(const _Array& rArray, const _Val* p, 
size_t& rLastPos)
 // Through certain filter code-paths we do a lot of appends, which in
 // turn call GetPos - creating some N^2 nightmares. If we have a
 // non-trivially large list, do a few checks from the end first.
-if (rLastPos > 16)
+if (rLastPos > 16 && nArrayLen > 16)
 {
 size_t nEnd;
 if (rLastPos > nArrayLen - 2)
@@ -698,7 +698,7 @@ size_t FastGetPos(const _Array& rArray, const _Val* p, 
size_t& rLastPos)
 
 for (size_t nIdx = rLastPos - 2; nIdx < nEnd; ++nIdx)
 {
-if (&rArray[nIdx] == p)
+if (&rArray.at(nIdx) == p)
 {
 rLastPos = nIdx;
 return nIdx;
@@ -707,7 +707,7 @@ size_t FastGetPos(const _Array& rArray, const _Val* p, 
size_t& rLastPos)
 }
 // The world's lamest linear search from svarray ...
 for (size_t nIdx = 0; nIdx < nArrayLen; ++nIdx)
-if (&rArray[nIdx] == p)
+if (&rArray.at(nIdx) == p)
 return rLastPos = nIdx;
 
 // 0x is used to signify "not found" condition. We need to change this.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/CppunitTest_editeng_core.mk

[Kohei Yoshida]

 editeng/CppunitTest_editeng_core.mk |   39 +++-
 1 file changed, 21 insertions(+), 18 deletions(-)

New commits:
commit e981a102333feb2a4d71bb3803210434b14b5d39
Author: Kohei Yoshida 
Date:   Wed Apr 11 14:55:58 2012 -0400

Add the right license header here...

diff --git a/editeng/CppunitTest_editeng_core.mk 
b/editeng/CppunitTest_editeng_core.mk
index e612de1..fb14e16 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -1,29 +1,32 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# This file is part of OpenOffice.org.
+# The Initial Developer of the Original Code is
+#   Bjoern Michaelsen, Canonical Ltd. 
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+# Major Contributor(s):
+#   Kohei Yoshida 
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
+# For minor contributions see the git repository.
 #
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
 #*
 
 $(eval $(call gb_CppunitTest_CppunitTest,editeng_core))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - editeng/CppunitTest_editeng_core.mk editeng/Module_editeng.mk editeng/qa sc/inc sc/source

[Kohei Yoshida]

 editeng/CppunitTest_editeng_core.mk |   84 +
 editeng/Module_editeng.mk   |1 
 editeng/qa/unit/core-test.cxx   |  141 
 sc/inc/document.hxx |1 
 sc/source/core/data/documen2.cxx|2 
 5 files changed, 226 insertions(+), 3 deletions(-)

New commits:
commit d241251638d80bc6e2b737088e02c96bfa8c5c63
Author: Kohei Yoshida 
Date:   Wed Apr 11 14:29:11 2012 -0400

Attempt to add general-purpose unit test for editeng.

But instantiating EditEngine causes segfault.  The line is commented
out for now.

diff --git a/editeng/CppunitTest_editeng_core.mk 
b/editeng/CppunitTest_editeng_core.mk
new file mode 100644
index 000..e612de1
--- /dev/null
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -0,0 +1,84 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# 
+# for a copy of the LGPLv3 License.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,editeng_core))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,editeng_core, \
+editeng/qa/unit/core-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+i18nisolang1 \
+i18nutil \
+lng \
+sal \
+salhelper \
+sot \
+svl \
+svt \
+test \
+tk \
+tl \
+ucbhelper \
+utl \
+vcl \
+xo \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,editeng_core,\
+icuuc \
+))
+
+$(eval $(call gb_CppunitTest_set_include,editeng_core,\
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,editeng_core,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_components,editeng_core,\
+configmgr/source/configmgr \
+framework/util/fwk \
+i18npool/util/i18npool \
+sfx2/util/sfx \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,editeng_core))
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index fd49b94..b767098 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,editeng,\
 # add any runtime tests (unit tests) here
 # remove if no tests
 $(eval $(call gb_Module_add_check_targets,editeng,\
+CppunitTest_editeng_core \
 CppunitTest_editeng_borderline \
 ))
 
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
new file mode 100644
index 000..43e668c
--- /dev/null
+++ b/editeng/qa/unit/core-test.cxx
@@ -0,0 +1,141 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ *   Copyright (C) 2012 Kohei Yoshida 
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
+#

[Libreoffice-commits] .: xmloff/source

[Ivan Timofeev]

 xmloff/source/chart/SchXMLExport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c323a4bbe0f7dec33523e87e1c1010dd832d4bf
Author: Ivan Timofeev 
Date:   Wed Apr 11 22:18:22 2012 +0400

fix windows build

diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 0d253d2..6632b47 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3137,7 +3137,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const 
ReferencegetPropertyValue( bYError ? "ErrorBarY" : 
"ErrorBarX" );
+aAny = xSeriesProp->getPropertyValue( bYError ? 
rtl::OUString("ErrorBarY") : rtl::OUString("ErrorBarX") );
 aAny >>= xErrorBarProp;
 
 if ( xErrorBarProp.is() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/win

[Ivan Timofeev]

 vcl/win/source/gdi/salnativewidgets-luna.cxx |   18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

New commits:
commit a4cc4d3ec982ac61100b337125983afa0bb6fbc3
Author: Ivan Timofeev 
Date:   Wed Apr 11 21:34:06 2012 +0400

vcl: win: fix RTL menu separator and gutter, checkmarks are still misplaced

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 2bc2f4b..bcf80cd 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -984,8 +984,16 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 if( nPart == PART_ENTIRE_CONTROL )
 {
 RECT aGutterRC = rc;
-aGutterRC.left += aValue.getNumericVal();
-aGutterRC.right = aGutterRC.left+3;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aGutterRC.right -= aValue.getNumericVal();
+aGutterRC.left = aGutterRC.right-3;
+}
+else
+{
+aGutterRC.left += aValue.getNumericVal();
+aGutterRC.right = aGutterRC.left+3;
+}
 return
 ImplDrawTheme( hTheme, hDC, MENU_POPUPBACKGROUND, 0, rc, 
aCaption ) &&
 ImplDrawTheme( hTheme, hDC, MENU_POPUPGUTTER, 0, aGutterRC, 
aCaption )
@@ -1028,7 +1036,11 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 }
 else if( nPart == PART_MENU_SEPARATOR )
 {
-rc.left += aValue.getNumericVal(); // adjust for gutter 
position
+// adjust for gutter position
+if( Application::GetSettings().GetLayoutRTL() )
+rc.right -= aValue.getNumericVal();
+else
+rc.left += aValue.getNumericVal();
 Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
 MENU_POPUPSEPARATOR, 0, Rectangle( rc.left, rc.top, 
rc.right, rc.bottom ) ) );
 // center the separator inside the passed rectangle
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 framework/inc/uielement/toolbarmanager.hxx|7 +-
 framework/source/uielement/toolbarmanager.cxx |   28 +-
 2 files changed, 12 insertions(+), 23 deletions(-)

New commits:
commit 6ae314ece2ecd6743a2d0f8a5eaca9b8b5dbeeaa
Author: Tor Lillqvist 
Date:   Wed Apr 11 20:30:26 2012 +0300

Bin pointless "added by shizhoubo" style comments

diff --git a/framework/inc/uielement/toolbarmanager.hxx 
b/framework/inc/uielement/toolbarmanager.hxx
index 98430b9..98e351d 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -61,9 +61,8 @@
 #include 
 #include 
 
-//shizhoubo
 #include 
-//end
+
 
//_
 //  other includes
 
//_
@@ -161,10 +160,8 @@ class ToolBarManager : public 
::com::sun::star::frame::XFrameActionListener
 typedef std::vector< ControllerParams > ControllerParamsVector;
 
 protected:
-//added for 33668 by shizhoubo : 2008:04
 DECL_LINK( Command, CommandEvent * );
 PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
-//end
 DECL_LINK(Click, void *);
 DECL_LINK(DropdownClick, void *);
 DECL_LINK(DoubleClick, void *);
@@ -188,7 +185,7 @@ class ToolBarManager : public 
::com::sun::star::frame::XFrameActionListener
 ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue > GetPropsForCommand( const 
::rtl::OUString& rCmdURL );
 void CreateControllers();
 void UpdateControllers();
-//for update controller via Support Visiable by shizhoubo
+//for update controller via Support Visiable
 void UpdateController( ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XToolbarController > xController);
 //end
 void AddFrameActionListener();
diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index cc874b6..4fe4712 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -283,9 +283,8 @@ ToolBarManager::ToolBarManager( const Reference< 
XMultiServiceFactory >& rServic
 sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
 if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog"
  nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
-//added for issue33668 by shizhoubo
+
 m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) );
-//end
 m_pToolBar->SetMenuType( nMenuType );
 m_pToolBar->SetMenuButtonHdl( LINK( this, ToolBarManager, MenuButton ) );
 m_pToolBar->GetMenu()->SetSelectHdl( LINK( this, ToolBarManager, 
MenuSelect ) );
@@ -507,7 +506,8 @@ void ToolBarManager::UpdateControllers()
 }
 m_bUpdateControllers = sal_False;
 }
-//for update toolbar controller via Support Visible by shizhoubo
+
+//for update toolbar controller via Support Visible
 void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XToolbarController > xController)
 {
 RTL_LOGFILE_CONTEXT( aLog, "framework (cd13) 
::ToolBarManager::UpdateControllers" );
@@ -531,7 +531,7 @@ void ToolBarManager::UpdateController( 
::com::sun::star::uno::Reference< ::com::
 }
 m_bUpdateControllers = sal_False;
 }
-//end
+
 void ToolBarManager::frameAction( const FrameActionEvent& Action )
 throw ( RuntimeException )
 {
@@ -1086,7 +1086,7 @@ void ToolBarManager::CreateControllers()
 
 Sequence< Any > aArgs( comphelper::containerToSequence( 
aPropertyVector ));
 xInit->initialize( aArgs );
-//for Support Visiblitly by shizhoubo
+
 if (pController)
 {
 if(aCommandURL == rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) ||
@@ -1096,8 +1096,6 @@ void ToolBarManager::CreateControllers()
)
 
pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True));
 }
-
-//end
 }
 
 // Request a item window from the toolbar controller and set it at 
the VCL toolbar
@@ -1118,7 +1116,8 @@ void ToolBarManager::CreateControllers()
 }
 }
 }
-//for update Controller via support visiable state by shizhoubo
+
+//for update Controller via support visiable state
 Reference< XPropertySet > xPropSet( xController, UNO_QUERY );
 if ( xPropSet.is() )
 {
@@ -1141,8 +1140,6 @@ void ToolBarManager::CreateControllers()
 {
 }
 }
-//end
-
 }
 
 AddFrameActionListener();
@@ -1724,7 +1721,6 @@ bool ToolBarMa

[Libreoffice-commits] .: 4 commits - cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_uno.mk framework/source vcl/android vcl/inc vcl/Library_vcl.mk

[Tor Lillqvist]

 cpputools/Executable_regcomp.mk   |1 +
 cpputools/Executable_regsingleton.mk  |1 +
 cpputools/Executable_uno.mk   |1 +
 framework/source/uielement/toolbarmanager.cxx |   20 +++-
 vcl/Library_vcl.mk|1 -
 vcl/android/androidinst.cxx   |   10 --
 vcl/inc/android/androidinst.hxx   |5 -
 7 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit 3bc628b9c9f07dd6def2fff365233e9be4b9158c
Author: Tor Lillqvist 
Date:   Wed Apr 11 20:20:08 2012 +0300

Link the executables with gb_STDLIBS

diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
index 1c0dc12..75653d0 100644
--- a/cpputools/Executable_regcomp.mk
+++ b/cpputools/Executable_regcomp.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\
 cppu \
 cppuhelper \
 sal \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,regcomp,\
diff --git a/cpputools/Executable_regsingleton.mk 
b/cpputools/Executable_regsingleton.mk
index eb919da..0bc2a39 100644
--- a/cpputools/Executable_regsingleton.mk
+++ b/cpputools/Executable_regsingleton.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\
 cppu \
 cppuhelper \
 sal \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,regsingleton,\
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
index b54f18b..252de3f 100644
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_use_libraries,uno,\
 cppuhelper \
 sal \
 salhelper \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_use_externals,uno,\
commit 63c95085db6ecf6254e3f73d8483006ad3e5
Author: Iain Billett 
Date:   Wed Apr 11 18:36:00 2012 +0300

fdo#38276: Improve the ">>" toolbar overflow menu

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 80adbd7..cc874b6 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1880,7 +1880,25 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, 
pToolBar )
 if ( m_bDisposed )
 return 1;
 //modify for i33668 by shizhoubo:2008:04
-GetToolBarCustomMenu(pToolBar);
+PopupMenu * pMenu = GetToolBarCustomMenu(pToolBar);
+if (pMenu)
+{
+sal_uInt16 nObsoleteItems = 6;
+sal_uInt16 positionInMenu;
+sal_uInt32 obsoleteItems[]  = {  MENUITEM_TOOLBAR_CLOSE ,
+ MENUITEM_TOOLBAR_VISIBLEBUTTON ,
+ MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR,
+ MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION,
+ MENUITEM_TOOLBAR_DOCKTOOLBAR,
+ MENUITEM_TOOLBAR_DOCKALLTOOLBAR
+   };
+for( int i = 0 ; i < nObsoleteItems ; i++ )
+{
+positionInMenu = pMenu->GetItemPos( obsoleteItems[i] );
+if ( positionInMenu != MENU_ITEM_NOTFOUND )
+pMenu->RemoveItem( positionInMenu );
+}
+}
 //end
  return 0;
  }
commit adef30c0b8d9c5404f37cb9ae3b16040cb4dded7
Author: Tor Lillqvist 
Date:   Tue Apr 10 21:48:31 2012 +0300

Drop unused EGL stuff

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9020a67..7194420 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -478,7 +478,6 @@ ifeq ($(GUIBASE),android)
 $(eval $(call gb_Library_add_libs,vcl,\
-llog \
-landroid \
-   -lEGL -lGLESv1_CM \
-llo-bootstrap \
 ))
 $(eval $(call gb_Library_add_defs,vcl,\
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ffb9ab4..53d197c 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -564,9 +564,6 @@ AndroidSalInstance::AndroidSalInstance( SalYieldMutex 
*pMutex )
 : SvpSalInstance( pMutex )
 , mpApp( NULL )
 , mbQueueReDraw( false )
-, mxDisplay( EGL_NO_DISPLAY )
-, mxSurface( EGL_NO_SURFACE )
-, mxContext( EGL_NO_CONTEXT )
 {
 mpApp = lo_get_app();
 fprintf (stderr, "created Android Sal Instance for app %p window %p 
thread: %d\n",
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 9f8d22f..addec80 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -71,11 +71,6 @@ protected:
 struct android_app *mpApp;
 Region maRedrawRegion;
 bool   mbQueueReDraw;
-
-private:
-EGLDisplay mxDisplay;
-EGLSurface mxSurface;
-EGLContext mxContext;
 };
 
 #endif // ANDROID_SALINST_H
commit 7a77147e66fdd348d949b711f8d8871f1110be33
Author: Tor Lillqvist 
Date:   Tue Apr 10 21:44:19 2012 +0300

Drop plasma_now()

diff --git a/vcl/android/androidinst.cxx b/v

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/globals.pm   |4 
 solenv/bin/modules/installer/scriptitems.pm   |6 --
 solenv/bin/modules/installer/windows/directory.pm |9 -
 solenv/bin/modules/installer/windows/property.pm  |   12 
 4 files changed, 31 deletions(-)

New commits:
commit efa4580b8f4a86566fda9be87e02d0ed9a346aa3
Author: Andras Timar 
Date:   Wed Apr 11 18:09:26 2012 +0200

remove sundir* stuff from installer that was used for the proprietary 
product

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index c07f3f6..fc65622 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -262,7 +262,6 @@ BEGIN
 %dependfilenames = ();
 $manufacturer = "";
 $longmanufacturer = "";
-$sundirname = "Oracle";
 $codefilename = "codes.txt";
 $componentfilename = "components.txt";
 $productcode = "";
@@ -343,7 +342,6 @@ BEGIN
 @pcfdiffcomment = ();
 @epmdifflist = ();
 $desktoplinkexists = 0;
-$sundirexists = 0;
 $analyze_spellcheckerlanguage = 0;
 %spellcheckerlanguagehash = ();
 %spellcheckerfilehash = ();
@@ -372,11 +370,9 @@ BEGIN
 $officedirhostname = "";
 $basisdirhostname = "";
 $uredirhostname = "";
-$sundirhostname = "";
 $officedirgid = "";
 $basisdirgid = "";
 $uredirgid = "";
-$sundirgid = "";
 
 %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
 %treestyles = ();
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index ad42ab1..4050ca5 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -528,12 +528,6 @@ sub set_global_directory_hostnames
 $installer::globals::officedirgid = $onedir->{'gid'};
 $allvariables->{'OFFICEDIRECTORYHOSTNAME'} = 
$installer::globals::officedirhostname;
 }
-if ( $styles =~ /\bSUNDIRECTORY\b/ )
-{
-$installer::globals::sundirhostname = $onedir->{'HostName'};
-$installer::globals::sundirgid = $onedir->{'gid'};
-$allvariables->{'SUNDIRECTORYHOSTNAME'} = 
$installer::globals::sundirhostname;
-}
 }
 }
 
diff --git a/solenv/bin/modules/installer/windows/directory.pm 
b/solenv/bin/modules/installer/windows/directory.pm
index cd922ad..4c71610 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -235,15 +235,6 @@ sub create_unique_directorynames
 if ( $installer::globals::installlocationdirectoryset ) { 
installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION 
alread set: \"$installer::globals::installlocationdirectory\".", 
"create_unique_directorynames"); }
 $installer::globals::installlocationdirectory = $uniquename;
 $installer::globals::installlocationdirectoryset = 1;
-if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) 
{ $installer::globals::sundirexists = 1; }
-}
-
-# setting the sundirectory
-if ( $styles =~ /\bSUNDIRECTORY\b/ )
-{
-if ( $installer::globals::vendordirectoryset ) { 
installer::exiter::exit_program("ERROR: Directory with flag SUNDIRECTORY alread 
set: \"$installer::globals::vendordirectory\".", 
"create_unique_directorynames"); }
-$installer::globals::vendordirectory = $uniquename;
-$installer::globals::vendordirectoryset = 1;
 }
 }
 
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 8650883..c402de9 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -309,12 +309,6 @@ sub set_important_properties
 $onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n";
 push(@{$propertyfile}, $onepropertyline);
 
-if ( $installer::globals::sundirexists )
-{
-my $onepropertyline = "SUNDIREXISTS" . "\t" . "1" . "\n";
-push(@{$propertyfile}, $onepropertyline);
-}
-
 if ( $installer::globals::officedirhostname )
 {
 my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . 
$installer::globals::officedirhostname . "\n";
@@ -326,12 +320,6 @@ sub set_important_properties
 push(@{$propertyfile}, $onepropertyline);
 }
 
-if ( $installer::globals::sundirhostname )
-{
-my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . 
$installer::globals::sundirhostname . "\n";
-push(@{$propertyfile}, $onepropertyline);
-}
-
 if ( $installer::globals::desktoplinkexists )
 {
 my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/li

[Libreoffice-commits] .: 5 commits - chart2/source sc/inc sc/source xmloff/source

[Markus Mohrhard]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |   41 
 chart2/source/controller/dialogs/DataBrowserModel.hxx |2 
 chart2/source/view/charttypes/VSeriesPlotter.cxx  |7 
 chart2/source/view/inc/VDataSeries.hxx|2 
 chart2/source/view/main/VDataSeries.cxx   |   15 +
 sc/inc/document.hxx   |4 
 sc/inc/table.hxx  |6 
 sc/source/core/data/documen3.cxx  |4 
 sc/source/core/data/table4.cxx|   68 ---
 sc/source/ui/docshell/dbdocfun.cxx|9 -
 sc/source/ui/docshell/dbdocimp.cxx|8 
 sc/source/ui/docshell/docfunc.cxx |   41 
 sc/source/ui/undo/undoblk3.cxx|   18 +-
 xmloff/source/chart/SchXMLExport.cxx  |  154 ++
 14 files changed, 228 insertions(+), 151 deletions(-)

New commits:
commit f1c9be8706683075b581f85d34c1eafdd41be9b5
Author: Rafael Dominguez 
Date:   Wed Apr 4 09:58:52 2012 -0430

Export chart X,Y errorbars.

- Remove using older properties to get errorbars data.
- Only export X errorbars when using ODF VERSION >= 1.2.
- Use the dimension attribute to set errorbar direction.

diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index b8d9935..0d253d2 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -248,8 +248,8 @@ public:
 sal_Bool bExportContent );
 
 void exportErrorBar (
-const ::com::sun::star::uno::Reference 
&xSeriesProp,
-sal_Bool bExportContent );
+const ::com::sun::star::uno::Reference 
&xSeriesProp, bool bYError,
+bool bExportContent );
 
 /// add svg position as attribute for current element
 void addPosition( const ::com::sun::star::awt::Point & rPosition );
@@ -2992,7 +2992,8 @@ void SchXMLExportHelper_Impl::exportSeries(
 exportRegressionCurve( aSeriesSeq[nSeriesIdx], 
xPropSet, rPageSize, bExportContent );
 }
 
-exportErrorBar( xPropSet,bExportContent );
+exportErrorBar( xPropSet,false, bExportContent );   // X 
ErrorBar
+exportErrorBar( xPropSet,true, bExportContent );// Y 
ErrorBar
 
 exportDataPoints(
 uno::Reference< beans::XPropertySet >( 
aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ),
@@ -3116,24 +3117,40 @@ void SchXMLExportHelper_Impl::exportRegressionCurve(
 }
 
 void SchXMLExportHelper_Impl::exportErrorBar( const 
Reference &xSeriesProp,
-  sal_Bool bExportContent )
+  bool bYError, bool 
bExportContent )
 {
 assert(mxExpPropMapper.is());
 
+const SvtSaveOptions::ODFDefaultVersion nCurrentVersion( 
SvtSaveOptions().GetODFDefaultVersion() );
+
+/// Dont export X ErrorBars for older ODF versions.
+if ( !bYError && nCurrentVersion < SvtSaveOptions::ODFVER_012 )
+return;
+
 if (xSeriesProp.is())
 {
-Any aAny;
-std::vector< XMLPropertyState > aPropertyStates;
+bool bNegative = false, bPositive = false;
 sal_Int32 nErrorBarStyle = chart::ErrorBarStyle::NONE;
-chart::ChartErrorIndicatorType eErrorType = 
chart::ChartErrorIndicatorType_NONE;
+Reference< beans::XPropertySet > xErrorBarProp;
 
 try
 {
-aAny = xSeriesProp->getPropertyValue("ErrorIndicator" );
-aAny >>= eErrorType;
+Any aAny;
 
-aAny = xSeriesProp->getPropertyValue("ErrorBarStyle" );
-aAny >>= nErrorBarStyle;
+aAny = xSeriesProp->getPropertyValue( bYError ? "ErrorBarY" : 
"ErrorBarX" );
+aAny >>= xErrorBarProp;
+
+if ( xErrorBarProp.is() )
+{
+aAny = xErrorBarProp->getPropertyValue("ShowNegativeError" );
+aAny >>= bNegative;
+
+aAny = xErrorBarProp->getPropertyValue("ShowPositiveError" );
+aAny >>= bPositive;
+
+aAny = xErrorBarProp->getPropertyValue("ErrorBarStyle" );
+aAny >>= nErrorBarStyle;
+}
 }
 catch( const beans::UnknownPropertyException & rEx )
 {
@@ -3144,56 +3161,37 @@ void SchXMLExportHelper_Impl::exportErrorBar( const 
Reference xErrorBarProp;
-try
-{
-aAny = xSeriesProp->getPropertyValue("DataErrorProperties" );
-aAny >>= xErrorBarProp;
-}
-catch( const uno::Exception & rEx )
-{
-(void)rEx; // avoid warning for pro build
-OSL_TRACE( "Exception caught during Export of series - 
optional DataErrorProperties not available: %s",
-OUStringToOSt

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin

[Caolán McNamara]

 solenv/bin/modules/installer/windows/property.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e83ae5b4cb52845231489d2f0d9bc380f0522be
Author: Andras Timar 
Date:   Wed Apr 11 16:01:06 2012 +0200

set correct value of FINDPRODUCT property
(cherry picked from commit ee7084c4f720c932df67c8ff033dab4d8d556179)

Signed-off-by: Caolán McNamara 

diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 1e6e921..7113a01 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -256,9 +256,9 @@ sub set_important_properties
 push(@{$propertyfile}, $onepropertyline);
 }
 
-if (( $allvariables->{'PRODUCTNAME'} ) && ( 
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'MANUFACTURER'} ) && ( 
$allvariables->{'PRODUCTCODE'} ))
+if (( $allvariables->{'PRODUCTNAME'} ) && ( 
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'REGISTRYLAYERNAME'} ))
 {
-my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\" . 
$allvariables->{'MANUFACTURER'} . "\\" . $allvariables->{'PRODUCTNAME'} . 
$allvariables->{'PRODUCTADDON'} . "\\" . $allvariables->{'PRODUCTVERSION'} . 
"\\" . $allvariables->{'PRODUCTCODE'} . "\n";
+my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\LibreOffice" . 
"\\" . $allvariables->{'REGISTRYLAYERNAME'} . "\\" . 
$allvariables->{'PRODUCTNAME'} . "\\" . $allvariables->{'PRODUCTVERSION'} . 
"\n";
 push(@{$propertyfile}, $onepropertyline);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 12 commits - sd/inc sd/source

[Caolán McNamara]

 sd/inc/sdabstdlg.hxx   |4 
 sd/source/core/drawdoc3.cxx|  179 +++--
 sd/source/ui/dlg/inspagob.cxx  |   20 
 sd/source/ui/dlg/sddlgfact.cxx |6 +
 sd/source/ui/dlg/sddlgfact.hxx |1 
 sd/source/ui/dlg/sdtreelb.cxx  |   15 +++
 sd/source/ui/inc/View.hxx  |   15 +++
 sd/source/ui/inc/inspagob.hxx  |   11 ++
 sd/source/ui/inc/sdtreelb.hxx  |   11 ++
 sd/source/ui/view/sdview2.cxx  |   62 ++
 10 files changed, 213 insertions(+), 111 deletions(-)

New commits:
commit 09fa378e11cec924f9cd2b95d0eedb2599fa088e
Author: Caolán McNamara 
Date:   Wed Apr 11 16:14:08 2012 +0100

this can be a reference surely

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index fe6b48a..91a0570 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -336,12 +336,12 @@ void SdDrawDocument::IterateBookmarkPages( 
SdDrawDocument* pBookmarkDoc, List* p
 class InsertBookmarkAsPage_FindDuplicateLayouts : public 
SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase
 {
 public:
-InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
*pLayoutsToTransfer )
-: mpLayoutsToTransfer(pLayoutsToTransfer) {}
+InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
&rLayoutsToTransfer )
+: mrLayoutsToTransfer(rLayoutsToTransfer) {}
 virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {};
 virtual void operator()( SdDrawDocument&, SdPage* );
 private:
-std::vector *mpLayoutsToTransfer;
+std::vector &mrLayoutsToTransfer;
 };
 
 void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& 
rDoc, SdPage* pBMMPage )
@@ -355,9 +355,9 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( 
SdDrawDocument& rDoc
 rtl::OUString aLayout(aFullNameLayout);
 
 std::vector::const_iterator pIter =
-
find(mpLayoutsToTransfer->begin(),mpLayoutsToTransfer->end(),aLayout);
+find(mrLayoutsToTransfer.begin(), 
mrLayoutsToTransfer.end(),aLayout);
 
-bool bFound = pIter != mpLayoutsToTransfer->end();
+bool bFound = pIter != mrLayoutsToTransfer.end();
 
 const sal_uInt16 nMPageCount = rDoc.GetMasterPageCount();
 for (sal_uInt16 nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++)
@@ -376,7 +376,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( 
SdDrawDocument& rDoc
 }
 
 if (!bFound)
-mpLayoutsToTransfer->push_back(aLayout);
+mrLayoutsToTransfer.push_back(aLayout);
 }
 
 /** Just add one page to the container given to the constructor.
@@ -514,7 +514,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 // Refactored copy'n'pasted layout name collection into 
IterateBookmarkPages
 //
 std::vector aLayoutsToTransfer;
-InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
&aLayoutsToTransfer );
+InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
aLayoutsToTransfer );
 IterateBookmarkPages( pBookmarkDoc, pBookmarkList, nBMSdPageCount, 
aSearchFunctor );
 
 
commit 5c3b81d21d163d89ea95c2ca0c23b467b6537025
Author: Caolán McNamara 
Date:   Wed Apr 11 16:07:00 2012 +0100

drop unused members

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 0ec3a1e..fe6b48a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -336,18 +336,12 @@ void SdDrawDocument::IterateBookmarkPages( 
SdDrawDocument* pBookmarkDoc, List* p
 class InsertBookmarkAsPage_FindDuplicateLayouts : public 
SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase
 {
 public:
-InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
*pLayoutsToTransfer,
-   SdDrawDocument* pBookmarkDoc,
-   List* pBookmarkList, sal_uInt16 
nBMSdPageCount ) :
-mpLayoutsToTransfer(pLayoutsToTransfer), mpBookmarkDoc(pBookmarkDoc),
-mpBookmarkList(pBookmarkList), mnBMSdPageCount(nBMSdPageCount) {}
+InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
*pLayoutsToTransfer )
+: mpLayoutsToTransfer(pLayoutsToTransfer) {}
 virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {};
 virtual void operator()( SdDrawDocument&, SdPage* );
 private:
 std::vector *mpLayoutsToTransfer;
-SdDrawDocument* mpBookmarkDoc;
-List*   mpBookmarkList;
-sal_uInt16  mnBMSdPageCount;
 };
 
 void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& 
rDoc, SdPage* pBMMPage )
@@ -520,8 +514,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 // Refactored copy'n'pasted layout name collection into 
IterateBookmarkPages
 //
 std::vector aLayoutsToTransfer;
-InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
&aLayoutsToTransfer, pBookmarkDoc,
-  pBookmarkList, 
nBMSdPageCount );
+InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
&aLayoutsToT

[Libreoffice-commits] .: 3 commits - sfx2/source

[Takeshi Abe]

 sfx2/source/control/bindings.cxx  |6 
 sfx2/source/control/dispatch.cxx  |4 ---
 sfx2/source/control/macrconf.cxx  |3 --
 sfx2/source/dialog/filtergrouping.cxx |   41 --
 sfx2/source/doc/doctempl.cxx  |   10 
 sfx2/source/menu/mnumgr.cxx   |3 --
 sfx2/source/notify/hintpost.cxx   |3 --
 7 files changed, 70 deletions(-)

New commits:
commit 08908961901ee0a7db4b6ee6005f1591d2d56e04
Author: Takeshi Abe 
Date:   Thu Apr 12 00:40:08 2012 +0900

removed dead code

diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index bf04732..25f7a39 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -54,9 +54,6 @@ namespace sfx2
 {
 //
 
-//#define DISABLE_GROUPING_AND_CLASSIFYING
-// not using the functionallity herein, yet
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::lang;
@@ -808,34 +805,6 @@ namespace sfx2
 }
 }
 
-#ifdef DISABLE_GROUPING_AND_CLASSIFYING
-//
-void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, const 
Reference< XFilterManager >& _rxFilterManager, ::rtl::OUString& _rFirstNonEmpty 
)
-{
-// ===
-String sAllFilterName;
-if ( !lcl_hasAllFilesFilter( _rFilterMatcher, sAllFilterName ) )
-{
-try
-{
-_rxFilterManager->appendFilter( sAllFilterName, 
DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
-_rFirstNonEmpty = sAllFilterName;
-}
-catch( const IllegalArgumentException& )
-{
-#ifdef DBG_UTIL
-rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM(
-"sfx2::lcl_EnsureAllFilesEntry: could not append Filter"));
-aMsg.append(rtl::OUStringToOString(sAllFilterName,
-RTL_TEXTENCODING_UTF8));
-OSL_FAIL( aMsg.getStr() );
-#endif
-}
-}
-
-}
-#endif
-
 // ===
 // = filling an XFilterManager
 // ===
@@ -1180,15 +1149,6 @@ namespace sfx2
 if ( !_rxFilterManager.is() )
 return;
 
-#ifdef DISABLE_GROUPING_AND_CLASSIFYING
-// ===
-// ensure that there's an entry "all" (with wildcard *.*)
-lcl_EnsureAllFilesEntry( _rFilterMatcher, _rxFilterManager, 
_rFirstNonEmpty );
-
-// ===
-appendFilters( _rFilterMatcher, _rxFilterManager, _rFirstNonEmpty );
-#else
-
 // ===
 // group and classify the filters
 GroupedFilterList aAllFilters;
@@ -1221,7 +1181,6 @@ namespace sfx2
 aAllFilters.end(),
 AppendFilterGroup( _rxFilterManager, &_rFileDlgImpl ) );
 }
-#endif
 }
 
 ::rtl::OUString addExtension( const ::rtl::OUString& _rDisplayText,
commit 25c70a72327116d257e41bcc67a3992a07bf7863
Author: Takeshi Abe 
Date:   Thu Apr 12 00:39:22 2012 +0900

removed useless static data

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ec29ed9..a4de3f3 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -97,9 +97,6 @@ static sal_uInt16 nTimeOut = 300;
 #define TIMEOUT_UPDATING 20
 #define TIMEOUT_IDLE   2500
 
-static sal_uInt32 nCache1 = 0;
-static sal_uInt32 nCache2 = 0;
-
 typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
 
 //
@@ -916,15 +913,12 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, 
sal_uInt16 nStartSearchAt )
 if ( pImp->nCachedFunc1 < pImp->pCaches->Count() &&
  (*pImp->pCaches)[pImp->nCachedFunc1]->GetId() == nId )
 {
-++nCache1;
 DBG_PROFSTOP(SfxBindingsMsgPos);
 return pImp->nCachedFunc1;
 }
 if ( pImp->nCachedFunc2 < pImp->pCaches->Count() &&
  (*pImp->pCaches)[pImp->nCachedFunc2]->GetId() == nId )
 {
-++nCache2;
-
 // swap the caches
 sal_uInt16 nTemp = pImp->nCachedFunc1;
 pImp->nCachedFunc1 = pImp->nCachedFunc2;
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 03ee7e1..c649a25 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -59,9 +59,6 @@
 #include "objshimp.hxx"
 #include 
 
-static const sal_uInt16 nCompatV

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - filter/source

[Thorsten Behrens]

 filter/source/svg/parserfragments.cxx |8 
 filter/source/svg/svgreader.cxx   |9 +
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 6a763c4bcd1100ff14625cb924e7672866708c3d
Author: Christina Rossmanith 
Date:   Sun Apr 1 21:14:10 2012 +0200

SVG: treat skewX and skewY correct

Signed-off-by: Thorsten Behrens 

diff --git a/filter/source/svg/parserfragments.cxx 
b/filter/source/svg/parserfragments.cxx
index 4edd90f..d4b31f2 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -93,16 +93,16 @@ void calcRotation(std::vector& 
rTransforms,
 void calcSkewX(std::vector& rTransforms,
double fSkewAngle)
 {
-geometry::AffineMatrix2D aMat(1.0,0.0,0.0,
-  tan(fSkewAngle*M_PI/180),1.0,0.0);
+geometry::AffineMatrix2D aMat(1.0,tan(fSkewAngle*M_PI/180),0.0,
+  0.0,1.0,0.0);
 rTransforms.push_back(aMat);
 }
 
 void calcSkewY(std::vector& rTransforms,
double fSkewAngle)
 {
-geometry::AffineMatrix2D aMat(1.0,tan(fSkewAngle*M_PI/180),0.0,
-  0.0,1.0,0.0);
+geometry::AffineMatrix2D aMat(1.0,0.0,0.0,
+  tan(fSkewAngle*M_PI/180),1.0,0.0);
 rTransforms.push_back(aMat);
 }
 
commit 4567e9cd0126e6a718fa5b09a96df160538cbe2a
Author: Christina Rossmanith 
Date:   Sat Mar 17 22:06:22 2012 +0100

SVG import: keep aspect ratio when transforming viewbox to viewport

Signed-off-by: Thorsten Behrens 

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 796bea9..c25d183 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -293,12 +293,13 @@ struct AnnotatingVisitor
 maCurrState.maViewBox.getWidth() != 0.0 &&
 maCurrState.maViewBox.getHeight() != 0.0 )
 {
-// transform aViewBox into viewport, such that they
-// coincide
+// transform aViewBox into viewport, keep aspect ratio
 aLocalTransform.translate(-maCurrState.maViewBox.getMinX(),
   
-maCurrState.maViewBox.getMinY());
-
aLocalTransform.scale(maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth(),
-  
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight());
+double scaleW = 
maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth();
+double scaleH = 
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight();
+double scale = (scaleW < scaleH) ? scaleW : scaleH;
+aLocalTransform.scale(scale,scale);
 }
 maCurrState.maCTM = 
maCurrState.maCTM*maCurrState.maTransform*aLocalTransform;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: smoketest/CppunitTest_smoketest.mk

[Stephan Bergmann]

 smoketest/CppunitTest_smoketest.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit e175c3f3e728e0526086b7a5d6b07c2ed6389016
Author: Stephan Bergmann 
Date:   Wed Apr 11 16:33:00 2012 +0200

smoketest CppUnit lib is only a thin wrapper around smoketest lib

diff --git a/smoketest/CppunitTest_smoketest.mk 
b/smoketest/CppunitTest_smoketest.mk
index 0fc2ab5..cbfc3d3 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_CppunitTest_use_api,smoketest,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
-   cppu \
-   cppuhelper \
-   sal \
-   unotest \
smoketest \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/property.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee7084c4f720c932df67c8ff033dab4d8d556179
Author: Andras Timar 
Date:   Wed Apr 11 16:01:06 2012 +0200

set correct value of FINDPRODUCT property

diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 27b19d7..8650883 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -255,9 +255,9 @@ sub set_important_properties
 push(@{$propertyfile}, $onepropertyline);
 }
 
-if (( $allvariables->{'PRODUCTNAME'} ) && ( 
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'MANUFACTURER'} ) && ( 
$allvariables->{'PRODUCTCODE'} ))
+if (( $allvariables->{'PRODUCTNAME'} ) && ( 
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'REGISTRYLAYERNAME'} ))
 {
-my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\" . 
$allvariables->{'MANUFACTURER'} . "\\" . $allvariables->{'PRODUCTNAME'} . 
$allvariables->{'PRODUCTADDON'} . "\\" . $allvariables->{'PRODUCTVERSION'} . 
"\\" . $allvariables->{'PRODUCTCODE'} . "\n";
+my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\LibreOffice" . 
"\\" . $allvariables->{'REGISTRYLAYERNAME'} . "\\" . 
$allvariables->{'PRODUCTNAME'} . "\\" . $allvariables->{'PRODUCTVERSION'} . 
"\n";
 push(@{$propertyfile}, $onepropertyline);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/inc_ooohelppack solenv/bin

[Caolán McNamara]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt |7 
+++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt |7 
+++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt |3 +++
 solenv/bin/make_installer.pl|4 
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 3bb382338859eb278e4baca574ad613b348cb077
Author: Andras Timar 
Date:   Tue Apr 10 20:45:46 2012 +0200

fdo#48411 Find install location during help pack install
(cherry picked from commit da2ec9aac3699c951c544a51acd6ab3aede706eb)

Signed-off-by: Caolán McNamara 

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
new file mode 100644
index 000..85e9539
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
@@ -0,0 +1,7 @@
+Property   Signature_
+s72s72
+AppSearch  PropertySignature_
+INSTALLLOCATIONinstalluser
+INSTALLLOCATIONinstallmachine
+INSTALLLOCATIONinstalluserdev
+INSTALLLOCATIONinstallmachinedev
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
new file mode 100644
index 000..8a15810
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
@@ -0,0 +1,7 @@
+Signature_ RootKey NameType
+s72i2  s255S255I2
+RegLocator Signature_
+installuser1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
+installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
+installuserdev 1   
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
+installmachinedev  2   
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
new file mode 100644
index 000..5004a55
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
@@ -0,0 +1,3 @@
+Signature  FileNameMinVersion  MaxVersion  MinSize MaxSize 
MinDate MaxDate Languages
+s72s255S20 S20 I4  I4  I4  I4  S255
+Signature  Signature
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e427cd5..164e08f 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2142,10 +2142,6 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 # adding the files from the binary directory into the binary table
 installer::windows::binary::update_binary_table($languageidtdir, 
$filesinproductlanguageresolvedarrayref, $binarytablefiles);
 
-# setting patch codes to detect installed products
-
-if (( $installer::globals::patch ) || ( 
$installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( 
$allvariableshashref->{'PDFCONVERTER'} )) { 
installer::windows::patch::update_patch_tables($languageidtdir, 
$allvariableshashref); }
-
 # Adding Windows Installer CustomActions
 
 installer::windows::idtglobal::addcustomactions($languageidtdir, 
$windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - writerfilter/source

[Caolán McNamara]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |  122 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +
 2 files changed, 127 insertions(+), 1 deletion(-)

New commits:
commit 586d6a57564c4c75c6464ec91c6f676aa66b0638
Author: Miklos Vajna 
Date:   Wed Apr 11 11:53:05 2012 +0200

fdo#47107 rtftok: support bullet points in paragraph numberings

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8e0cbce..04160e6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -921,6 +921,7 @@ void RTFDocumentImpl::text(OUString& rString)
 case DESTINATION_ANNOTATIONAUTHOR:
 case DESTINATION_FALT:
 case DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER:
+case DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE:
 m_aStates.top().aDestinationText.append(rString);
 break;
 case DESTINATION_EQINSTRUCTION:
@@ -1349,6 +1350,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_PNTXTA:
 m_aStates.top().nDestinationState = 
DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER;
 break;
+case RTF_PNTXTB:
+m_aStates.top().nDestinationState = 
DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE;
+break;
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle destination '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -2089,6 +2093,12 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 
m_aStates.top().aTableSprms->push_back(make_pair(NS_rtf::LN_NFC, pValue));
 }
 break;
+case RTF_PNLVLBLT:
+{
+
m_aStates.top().aTableAttributes->push_back(make_pair(NS_rtf::LN_LSID, 
RTFValue::Pointer_t(new RTFValue(1;
+
m_aStates.top().aTableSprms->push_back(make_pair(NS_rtf::LN_NFC, 
RTFValue::Pointer_t(new RTFValue(23; // bullets, same as \levelnfc23
+}
+break;
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle flag '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -2744,6 +2754,13 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_PNSTART:
 
m_aStates.top().aTableSprms->push_back(make_pair(NS_rtf::LN_ISTARTAT, 
pIntValue));
 break;
+case RTF_PNF:
+{
+int nFontIndex = getFontIndex(nParam);
+RTFValue::Pointer_t pValue(new RTFValue(nFontIndex));
+lcl_putNestedSprm(m_aStates.top().aTableSprms, 
NS_ooxml::LN_CT_Lvl_rPr, NS_sprm::LN_CRgFtc0, pValue);
+}
+break;
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle value '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -3352,8 +3369,12 @@ int RTFDocumentImpl::popState()
 {
 // Abstract numbering
 RTFSprms aLeveltextAttributes;
-OUString aTextValue(RTL_CONSTASCII_USTRINGPARAM("%1"));
-RTFValue::Pointer_t pTextAfter = 
aState.aTableAttributes.find(NS_ooxml::LN_CT_LevelText_val);
+OUString aTextValue;
+RTFValue::Pointer_t pTextBefore = 
aState.aTableAttributes.find(NS_ooxml::LN_CT_LevelText_val);
+if (pTextBefore.get())
+aTextValue += pTextBefore->getString();
+aTextValue += OUString(RTL_CONSTASCII_USTRINGPARAM("%1"));
+RTFValue::Pointer_t pTextAfter = 
aState.aTableAttributes.find(NS_ooxml::LN_CT_LevelSuffix_val);
 if (pTextAfter.get())
 aTextValue += pTextAfter->getString();
 RTFValue::Pointer_t pTextValue(new RTFValue(aTextValue));
@@ -3374,6 +3395,9 @@ int RTFDocumentImpl::popState()
 
 RTFValue::Pointer_t pLeveltextValue(new 
RTFValue(aLeveltextAttributes));
 aLevelSprms->push_back(make_pair(NS_ooxml::LN_CT_Lvl_lvlText, 
pLeveltextValue));
+RTFValue::Pointer_t pRunProps = 
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_rPr);
+if (pRunProps.get())
+aLevelSprms->push_back(make_pair(NS_ooxml::LN_CT_Lvl_rPr, 
pRunProps));
 
 RTFSprms aAbstractAttributes;
 RTFSprms aAbstractSprms;
@@ -3410,6 +3434,11 @@ int RTFDocumentImpl::popState()
 else if (aState.nDestinationState == 
DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER)
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
+
m_aStates.top().aTableAttributes->push_back(make_pair(NS_ooxml::LN_CT_LevelSuffix_val,
 pValue));
+}
+else if (aState.nDestinationState == 
DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE)
+{
+RTFValue::Pointer_t pValue(new 
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
 
m_aStates.top().aTableAttribut

[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

[Caolán McNamara]

 binfilter/bf_svtools/source/misc/tl_strimp.cxx   |  108 ---
 binfilter/bf_svtools/source/misc/tl_tustring.cxx |  104 ++
 binfilter/inc/bf_tools/string.hxx|2 
 3 files changed, 104 insertions(+), 110 deletions(-)

New commits:
commit 61eb8ffd6f6e47f4c539b1cfbefba12cf5e650a9
Author: Caolán McNamara 
Date:   Wed Apr 11 10:09:05 2012 +0100

callcatcher: reduce ByteString

diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx 
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 7b82b64..36111fd 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -451,67 +451,6 @@ STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex )
 
 // ---
 
-STRING& STRING::Replace( xub_StrLen nIndex, xub_StrLen nCount, const STRING& 
rStr )
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
-
-// Wenn Index groessergleich Laenge ist, dann ist es ein Append
-if ( nIndex >= mpData->mnLen )
-{
-Append( rStr );
-return *this;
-}
-
-// Ist es eine Zuweisung
-if ( (nIndex == 0) && (nCount >= mpData->mnLen) )
-{
-Assign( rStr );
-return *this;
-}
-
-// Reicht ein Erase
-sal_Int32 nStrLen = rStr.mpData->mnLen;
-if ( !nStrLen )
-return Erase( nIndex, nCount );
-
-// nCount darf nicht ueber das Stringende hinnausgehen
-if ( nCount > mpData->mnLen - nIndex )
-nCount = static_cast< xub_StrLen >(mpData->mnLen-nIndex);
-
-// Reicht ein Insert
-if ( !nCount )
-return Insert( rStr, nIndex );
-
-// Reicht eine zeichenweise Zuweisung
-if ( nCount == nStrLen )
-{
-ImplCopyData();
-memcpy( mpData->maStr+nIndex, rStr.mpData->maStr, nCount*sizeof( 
STRCODE ) );
-return *this;
-}
-
-// Ueberlauf abfangen
-nStrLen = ImplGetCopyLen( mpData->mnLen-nCount, nStrLen );
-
-// Neue Daten anlegen
-STRINGDATA* pNewData = ImplAllocData( mpData->mnLen-nCount+nStrLen );
-
-// String kopieren
-memcpy( pNewData->maStr, mpData->maStr, nIndex*sizeof( STRCODE ) );
-memcpy( pNewData->maStr+nIndex, rStr.mpData->maStr, nStrLen*sizeof( 
STRCODE ) );
-memcpy( pNewData->maStr+nIndex+nStrLen, mpData->maStr+nIndex+nCount,
-(mpData->mnLen-nIndex-nCount+1)*sizeof( STRCODE ) );
-
-// Alte Daten loeschen und Neue zuweisen
-STRING_RELEASE((STRING_TYPE *)mpData);
-mpData = pNewData;
-
-return *this;
-}
-
-// ---
-
 STRING& STRING::Erase( xub_StrLen nIndex, xub_StrLen nCount )
 {
 DBG_CHKTHIS( STRING, DBGCHECKSTRING );
@@ -614,53 +553,6 @@ xub_StrLen STRING::Search( STRCODE c, xub_StrLen nIndex ) 
const
 
 // ---
 
-xub_StrLen STRING::Search( const STRING& rStr, xub_StrLen nIndex ) const
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
-
-sal_Int32 nLen = mpData->mnLen;
-sal_Int32 nStrLen = rStr.mpData->mnLen;
-
-// Falls die Laenge des uebergebenen Strings 0 ist oder der Index
-// hinter dem String liegt, dann wurde der String nicht gefunden
-if ( !nStrLen || (nIndex >= nLen) )
-return STRING_NOTFOUND;
-
-const STRCODE* pStr1 = mpData->maStr;
-pStr1 += nIndex;
-
-if ( nStrLen == 1 )
-{
-STRCODE cSearch = rStr.mpData->maStr[0];
-while ( nIndex < nLen )
-{
-if ( *pStr1 == cSearch )
-return nIndex;
-++pStr1,
-++nIndex;
-}
-}
-else
-{
-const STRCODE* pStr2 = rStr.mpData->maStr;
-
-// Nur innerhalb des Strings suchen
-while ( nLen - nIndex >= nStrLen )
-{
-// Stimmt der String ueberein
-if ( ImplStringCompareWithoutZero( pStr1, pStr2, nStrLen ) == 0 )
-return nIndex;
-++pStr1,
-++nIndex;
-}
-}
-
-return STRING_NOTFOUND;
-}
-
-// ---
-
 xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const
 {
 DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx 
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index eb29ea1..0e60670 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -1139,6 +1139,110 @@ xub_StrLen STRING::SearchAndReplace( const STRING& 
rStr, const STRING& rRepStr,
 return nSPos;
 }
 
+STRING& STRING::Replace( xub_StrLen nIndex, xub_StrLen nCount, const STRING& 
rStr )
+{
+DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
+
+// Wenn Index groes

[Libreoffice-commits] .: 5 commits - basctl/source boost/boost.6369.warnings.patch clucene/Package_source.mk cui/source oox/inc oox/source reportdesign/source sc/inc sc/source sd/source slideshow/qa s

[Caolán McNamara]

 basctl/source/basicide/linenumberwindow.cxx  |4 
 boost/boost.6369.warnings.patch  |   18 +
 clucene/Package_source.mk|  182 +--
 cui/source/options/optlingu.cxx  |6 
 oox/inc/oox/dump/dumperbase.hxx  |2 
 oox/source/dump/dumperbase.cxx   |   19 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx |2 
 sc/inc/dbdata.hxx|1 
 sc/source/core/tool/dbdata.cxx   |   16 -
 sc/source/core/tool/interpr1.cxx |2 
 sc/source/filter/excel/xiescher.cxx  |6 
 sc/source/filter/inc/pivotcachebuffer.hxx|2 
 sc/source/filter/inc/stylesbuffer.hxx|5 
 sc/source/filter/oox/pivotcachebuffer.cxx|8 
 sc/source/filter/oox/stylesbuffer.cxx|   35 ---
 sc/source/filter/oox/workbookhelper.cxx  |8 
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |   13 -
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx |8 
 slideshow/qa/debug/nodetree.sh   |2 
 slideshow/source/engine/animationnodes/nodetools.cxx |8 
 slideshow/source/engine/animationnodes/nodetools.hxx |3 
 svl/inc/svl/style.hxx|2 
 svl/source/items/intitem.cxx |2 
 svl/source/items/style.cxx   |4 
 svtools/source/uno/wizard/wizardshell.cxx|2 
 sw/inc/docstyle.hxx  |2 
 sw/source/ui/app/docstyle.cxx|6 
 unusedcode.easy  |   53 +
 28 files changed, 179 insertions(+), 242 deletions(-)

New commits:
commit bb7d331ecdb3a0a4723f770a9f891c00f4a25dbf
Author: Caolán McNamara 
Date:   Wed Apr 11 10:08:16 2012 +0100

callcatcher: update list

diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index fb1ede5..10b1e11 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -381,10 +381,8 @@ public:
 
 static void appendAddress( ::rtl::OUStringBuffer& rStr, const 
Address& rPos );
 static void appendRange( ::rtl::OUStringBuffer& rStr, const Range& 
rRange );
-static void appendRangeList( ::rtl::OUStringBuffer& rStr, const 
RangeList& rRanges );
 
 static void appendAddress( ::rtl::OUStringBuffer& rStr, const 
TokenAddress& rPos, bool bR1C1 );
-static void appendRange( ::rtl::OUStringBuffer& rStr, const 
TokenRange& rRange, bool bR1C1 );
 
 // encoded text output 
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 0d8039d..62a6d4c 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -511,18 +511,6 @@ void StringHelper::appendRange( OUStringBuffer& rStr, 
const Range& rRange )
 appendAddress( rStr, rRange.maLast );
 }
 
-void StringHelper::appendRangeList( OUStringBuffer& rStr, const RangeList& 
rRanges )
-{
-OUStringBuffer aData;
-for( RangeList::const_iterator aIt = rRanges.begin(), aEnd = 
rRanges.end(); aIt != aEnd; ++aIt )
-{
-OUStringBuffer aRange;
-appendRange( aRange, *aIt );
-appendToken( aData, aRange.makeStringAndClear(), OOX_DUMP_LISTSEP );
-}
-rStr.append( aData.makeStringAndClear() );
-}
-
 void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& 
rPos, bool bR1C1 )
 {
 if( bR1C1 && (rPos.mbRelCol || rPos.mbRelRow) )
@@ -537,13 +525,6 @@ void StringHelper::appendAddress( OUStringBuffer& rStr, 
const TokenAddress& rPos
 }
 }
 
-void StringHelper::appendRange( OUStringBuffer& rStr, const TokenRange& 
rRange, bool bR1C1 )
-{
-appendAddress( rStr, rRange.maFirst, bR1C1 );
-rStr.append( OOX_DUMP_RANGESEP );
-appendAddress( rStr, rRange.maLast, bR1C1 );
-}
-
 // encoded text output 
 
 void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool 
bPrefix )
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index cef02e1..9dcd457 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -243,7 +243,6 @@ public:
 ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool 
bStartOnly);
 const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2) const;
 ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2);
-const ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
 ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
 
 voidDeleteOnTab( SCTAB nTab );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 4c14735..36d1914 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/so

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 3 commits - scp2/source vcl/inc vcl/qa vcl/source

[Caolán McNamara]

 scp2/source/ooo/file_ooo.scp  |   11 ++
 scp2/source/ooo/module_hidden_ooo.scp |1 
 vcl/inc/vcl/layout.hxx|   20 +++--
 vcl/qa/cppunit/builder/demo.ui|  125 +++---
 vcl/source/window/builder.cxx |   15 
 vcl/source/window/layout.cxx  |   91 +---
 6 files changed, 175 insertions(+), 88 deletions(-)

New commits:
commit 0d705463411ed1a5139a1f609cd276a353d1a9de
Author: Caolán McNamara 
Date:   Wed Apr 11 11:45:33 2012 +0100

add a GtkFrame to the demo

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index ed75074..c8dc618 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -51,69 +51,92 @@
   
 
 
-  
+  
 True
 False
-vertical
-6
-True
+0
+none
 
-  
+  
 True
 False
-0
-left
+12
+
+  
+True
+False
+vertical
+6
+True
+
+  
+True
+False
+0
+left
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+1
+right
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+center
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+True
+●
+an edit 
control
+True
+  
+  
+False
+True
+3
+  
+
+  
+
   
-  
-False
-True
-0
-  
 
-
-  
+
+  
 True
 False
-1
-right
+Frame 
Label
+True
   
-  
-False
-True
-1
-  
-
-
-  
-True
-False
-center
-  
-  
-False
-True
-2
-  
-
-
-  
-True
-True
-●
-an edit 
control
-True
-  
-  
-False
-True
-3
-  
 
   
   
 False
 True
-2
+1
   
 
 
@@ -309,12 +332,6 @@
 
   
 
-
-  
-
-
-  
-
   
   
 True
commit 5c3a8d8fb299d106332cb925d462aaae08586a11
Author: Caolán McNamara 
Date:   Wed Apr 11 11:41:54 2012 +0100

implement a basic VclFrame

factor out common VclContainer pieces

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index fc7e0a1..cff021f 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -36,6 +36,9 @@ class VCL_DLLPUBLIC VclContainer : public Window
 {
 public:
 VclContainer(Window *pParent) : Window(pParent) {}
+virtual Size GetOptimalSize(WindowSizeType eType) const;
+using Window::SetPosSizePixel;
+virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
 protected:
 virtual Size calculateRequisition() const = 0;
 virtual void setAllocation(const Size &rAllocation) = 0;
@@ -60,10 +63,6 @@ public:
 {
 Show();
 }
-public:
-virtual Size GetOptimalSize(WindowSizeType eType) const;
-using Window::SetPosSizePixel;
-virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSi

[Libreoffice-commits] .: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtftok/data/fdo44176.rtf   |   10 ++
 sw/qa/extras/rtftok/rtftok.cxx  |   18 ++
 writerfilter/source/dmapper/PropertyMap.cxx |   15 ---
 3 files changed, 40 insertions(+), 3 deletions(-)

New commits:
commit b0edaff7e2d885f80e96277967bfe29664c83df1
Author: Miklos Vajna 
Date:   Wed Apr 11 09:45:53 2012 +0200

fdo#44176 dmapper: fix import of titlepg top/bottom margin

diff --git a/sw/qa/extras/rtftok/data/fdo44176.rtf 
b/sw/qa/extras/rtftok/data/fdo44176.rtf
new file mode 100644
index 000..c1754af
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo44176.rtf
@@ -0,0 +1,10 @@
+{\rtf1
+{\header foo
+\par }
+\titlepg
+First page has no header.
+\par
+\pagebb
+Second page has a header.
+\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index a8908d5..e81fa3a 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -79,6 +79,7 @@ public:
 void testFdo48104();
 void testFdo47107();
 void testFdo45182();
+void testFdo44176();
 
 CPPUNIT_TEST_SUITE(RtfModelTest);
 #if !defined(MACOSX) && !defined(WNT)
@@ -100,6 +101,7 @@ public:
 CPPUNIT_TEST(testFdo48104);
 CPPUNIT_TEST(testFdo47107);
 CPPUNIT_TEST(testFdo45182);
+CPPUNIT_TEST(testFdo44176);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -515,6 +517,22 @@ void RtfModelTest::testFdo45182()
 CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
 }
 
+void RtfModelTest::testFdo44176()
+{
+load("fdo44176.rtf");
+
+uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xPageStyles(xStyles->getByName("PageStyles"), uno::UNO_QUERY);
+uno::Reference 
xFirstPage(xPageStyles->getByName("First Page"), uno::UNO_QUERY);
+uno::Reference 
xDefault(xPageStyles->getByName("Default"), uno::UNO_QUERY);
+sal_Int32 nFirstTop = 0, nDefaultTop = 0, nDefaultHeader = 0;
+xFirstPage->getPropertyValue("TopMargin") >>= nFirstTop;
+xDefault->getPropertyValue("TopMargin") >>= nDefaultTop;
+xDefault->getPropertyValue("HeaderHeight") >>= nDefaultHeader;
+CPPUNIT_ASSERT_EQUAL(nFirstTop, nDefaultTop + nDefaultHeader);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index ee3ba7f..471f9b8 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -778,9 +778,18 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( 
bool bFirstPage )
 operator[]( PropertyDefinition( PROP_FOOTER_BODY_DISTANCE, false )) = 
uno::makeAny( m_nHeaderBottom );
 }
 
-//now set the top/bottom margin for the follow page style
-operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( 
m_nTopMargin );
-operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = 
uno::makeAny( m_nBottomMargin );
+//now set the top/bottom margin
+sal_Int32 nHeaderHeight = 0, nFooterHeight = 0;
+if (bFirstPage)
+{
+// make sure the height of the header/footer is added to the 
top/bottom margin if necessary
+if (m_aFollowPageStyle.is() && !HasHeader(true) && HasHeader(false))
+m_aFollowPageStyle->getPropertyValue("HeaderHeight") >>= 
nHeaderHeight;
+if (m_aFollowPageStyle.is() && !HasFooter(true) && HasFooter(false))
+m_aFollowPageStyle->getPropertyValue("FooterHeight") >>= 
nFooterHeight;
+}
+operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( 
m_nTopMargin + nHeaderHeight );
+operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = 
uno::makeAny( m_nBottomMargin + nFooterHeight );
 }
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cpputools/Module_cpputools.mk cpputools/Package_bin.mk solenv/gbuild

[David Tardon]

 cpputools/Module_cpputools.mk|6 ++
 cpputools/Package_bin.mk |   34 ++
 solenv/gbuild/TargetLocations.mk |1 +
 3 files changed, 41 insertions(+)

New commits:
commit dd9bbad2b19d7c8bbe68dd2cdcf3d90d763d747d
Author: David Tardon 
Date:   Wed Apr 11 10:01:25 2012 +0200

also deliver .bin variants of the tools

diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 17b41b3..3e5a063 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -40,6 +40,12 @@ $(eval $(call gb_Module_add_targets,cpputools,\
 Executable_regsingleton \
 Executable_uno \
 ))
+
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,cpputools,\
+Package_bin \
+))
+endif
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
new file mode 100644
index 000..9a0b8d4
--- /dev/null
+++ b/cpputools/Package_bin.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon 
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# because the installation system is so incredibly inflexible...
+$(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR)))
+
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp))
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2fbd434..df694b7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -253,6 +253,7 @@ gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call 
gb_StaticLibrary_get_
 
 # static members declared here because they are used globally
 
+gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
 gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
 gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
 gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_sp2bv.mk cpputools/Executable_uno.mk cpputools/Makefile cpputools/Module_

[David Tardon]

 Makefile   |3 
 Repository.mk  |   14 +++
 cpputools/Executable_regcomp.mk|   43 +++
 cpputools/Executable_regsingleton.mk   |   52 +
 cpputools/Executable_sp2bv.mk  |   43 +++
 cpputools/Executable_uno.mk|   48 
 cpputools/Makefile |7 +
 cpputools/Module_cpputools.mk  |   45 +++
 cpputools/StaticLibrary_uno.mk |   38 +
 cpputools/prj/build.lst|7 -
 cpputools/prj/d.lst|   10 --
 cpputools/prj/makefile.mk  |1 
 cpputools/source/registercomponent/makefile.mk |   82 -
 cpputools/source/regsingleton/makefile.mk  |   86 --
 cpputools/source/sp2bv/makefile.mk |   56 --
 cpputools/source/unoexe/makefile.mk|   97 -
 solenv/gbuild/StaticLibrary.mk |3 
 17 files changed, 297 insertions(+), 338 deletions(-)

New commits:
commit 7c489dc2ec5543c3481d0d5385f3a7a328276cff
Author: David Tardon 
Date:   Wed Apr 11 09:11:09 2012 +0200

re-run bootstrap after make clean

diff --git a/Makefile b/Makefile
index 709332a..865a324 100644
--- a/Makefile
+++ b/Makefile
@@ -304,6 +304,7 @@ clean: clean-host clean-build
 clean-host:
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr install
+   rm -f $(WORKDIR_BOOTSTRAP)
 
 clean-build:
 ifeq ($(CROSS_COMPILING),YES)
commit 5342bc073b6dff059f9e60ad5fea6905752f0f9c
Author: David Ostrovsky 
Date:   Sun Apr 1 16:07:41 2012 +0200

gbuild conversion: cpputools module

dmake stuff removed

diff --git a/Makefile b/Makefile
index e660c36..709332a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ configmgr\
 cppcanvas\
 cppu\
 cppuhelper\
+cpputools\
 cui\
 dbaccess\
 desktop\
@@ -155,7 +156,6 @@ codemaker\
 connectivity\
 cosv\
 cppunit\
-cpputools\
 crashrep\
 ct2n\
 curl\
diff --git a/Repository.mk b/Repository.mk
index 1fe0aa3..1a3851e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -41,10 +41,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 pdf2xml \
 pdfunzip \
 rdbmaker \
+regsingleton \
 rsc \
 rscdep \
 saxparser \
 so_checksum \
+sp2bv \
 svidl \
 typesconfig \
 xml2cmp \
@@ -126,6 +128,15 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 
 endif
 
+ifneq ($(OS),IOS)
+
+$(eval $(call gb_Helper_register_executables,UREBIN,\
+   regcomp \
+   uno \
+))
+
+endif
+
 ifneq ($(OS),MACOSX)
 
 $(eval $(call gb_Helper_register_executables,UREBIN,\
@@ -547,6 +558,9 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
 ulingu \
 vclmain \
 writerperfect \
+$(if $(filter $(OS),IOS), \
+uno \
+) \
 $(if $(filter $(OS),WNT), \
 odma_lib \
 ) \
diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
new file mode 100644
index 000..1c0dc12
--- /dev/null
+++ b/cpputools/Executable_regcomp.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,regcomp))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,regcomp,\
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,regcomp,\
+cppu \
+cppuhelper \
+sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcomp,\
+cpputools/source/registercomponent/registercomponent \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_regsingleton.mk 
b/cpputools/Executable_regsingleton.mk
new file mode 100644
index 000..eb919da
--- /dev/null
+++ b/cpputools/Executable_regsingleton.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-wi