date:20110919

[Libreoffice-commits] .: solenv/bin

2011-09-19 Thread Andras Timar

 solenv/bin/linkoo |   18 --
 1 file changed, 18 deletions(-)

New commits:
commit 9899ed3dcf1d2317760eb8f5d01d83c00c2e93d9
Author: Andras Timar 
Date:   Tue Sep 20 08:53:36 2011 +0200

there is no special iso.res case any more

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 107553f..212cb56 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -332,23 +332,6 @@ sub link_gdb_py()
 print "\n";
 }
 
-sub link_iso_res()
-{
-print "Special iso.res case: ";
-my $ooo_res="$OOO_INSTALL/" . $brand_program_dir . 
"/resource/ooo".$LIBVER.$LANG.".res";
-my $star_res="$OOO_INSTALL/" . $brand_program_dir . 
"/resource/iso".$LIBVER.$LANG.".res";
-if (-l $ooo_res && -l $star_res) {
-   if ($dry_run) {
-   print "link $ooo_res to $star_res";
-   } else {
-   unlink ($star_res);
-   symlink ($ooo_res, $star_res);
-   print "clobbered";
-   }
-}
-print "\n";
-}
-
 sub link_pagein_files()
 {
 print "pagein case:";
@@ -404,7 +387,6 @@ my $installed_files = build_installed_list ($OOO_INSTALL);
 
 scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
 link_gdb_py();
-link_iso_res();
 link_pagein_files();
 
 if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Repository.mk

2011-09-19 Thread David Tardon

 Repository.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 37bf43f4907bd6ce96c732f192a92ebcbc78c95a
Author: David Tardon 
Date:   Tue Sep 20 07:52:02 2011 +0200

register all built executables

diff --git a/Repository.mk b/Repository.mk
index 175adbd..6b172ca 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -33,9 +33,15 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 bmp \
 bmpsum \
 g2g \
+gencoll_rule \
+genconv_dict \
+gendict \
+genindex_data \
 mkunroll \
 rscdep \
+saxparser \
 so_checksum \
+svidl \
 xml2cmp \
 ))
 
@@ -50,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,BRAND,\
guiloader \
guistdio \
loader2 \
+   odbcconfig \
officeloader \
quickstart \
sbase \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-09-19 Thread Stephan Bergmann

 solenv/gbuild/platform/macosx.mk |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a3cd73f3153b4a6c337144bd0f85769f059b3019
Author: Stephan Bergmann 
Date:   Tue Sep 20 07:22:26 2011 +0200

Reverted previous ff1c626, instead renamed NONEBIN -> NONE.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index cabf855..aa560a3 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -273,7 +273,7 @@ gb_LinkTarget__RPATHS := \
OOO:@__OOO/ \
BRAND: \
SDKBIN: \
-   NONEBIN: \
+   NONE: \
 
 define gb_LinkTarget__get_installname
 $(if $(2),-install_name '$(2)$(1)',)
@@ -338,9 +338,8 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) \
`cat $${DYLIB_FILE}` && \
 $(if $(filter Executable,$(TARGETTYPE)), \
-$(if $(filter-out NONEBIN,$(LAYER)), \
 $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
-$(LAYER) $(1) &&)) \
+$(LAYER) $(1) &&) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1) && \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
@@ -452,7 +451,7 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-   $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+   $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
 
 
 gb_Executable_get_rpath :=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-09-19 Thread Norbert Thiebaud

 solenv/gbuild/platform/macosx.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ff1c626fa1380c7af5a135f80b45de7e62025eed
Author: Norbert Thiebaud 
Date:   Tue Sep 20 00:01:41 2011 -0500

do not call macosx-change-install-name for NONEBIN executable

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e30201b..cabf855 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -338,8 +338,9 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) \
`cat $${DYLIB_FILE}` && \
 $(if $(filter Executable,$(TARGETTYPE)), \
+$(if $(filter-out NONEBIN,$(LAYER)), \
 $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
-$(LAYER) $(1) &&) \
+$(LAYER) $(1) &&)) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1) && \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Package_scripts.mk

2011-09-19 Thread David Tardon

 desktop/Package_scripts.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8033c5093ee57b3896e40a83e9b3c8560b31b160
Author: David Tardon 
Date:   Tue Sep 20 06:51:13 2011 +0200

soffice.sh should not be delivered on MacOS

diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 9292940..1bc67b7 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -33,10 +33,15 @@ $(eval $(call 
gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/smaster,smaster.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/sweb,sweb.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
+ifneq ($(OS),MACOSX)
+
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
+
+endif
+
 # vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-09-19 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |  174 +--
 1 file changed, 87 insertions(+), 87 deletions(-)

New commits:
commit 7171daea4be16dd3298023349b771993e5b9fd0f
Author: Kohei Yoshida 
Date:   Mon Sep 19 22:43:20 2011 -0400

Unit test for refreshing while source data contains empty field name.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6afc80b..45ae344 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1098,9 +1098,8 @@ void Test::testDataPilot()
 
 // This time clear the cache to refresh the data from the source range.
 CPPUNIT_ASSERT_MESSAGE("This datapilot should be based on sheet data.", 
pDPObj2->IsSheetData());
-ScDPCollection::SheetCaches& rCaches = pDPs->GetSheetCaches();
-const ScSheetSourceDesc* pDesc = pDPObj2->GetSheetDesc();
-rCaches.removeCache(pDesc->GetSourceRange());
+sal_uLong nErrId = pDPs->ClearCache(pDPObj2);
+CPPUNIT_ASSERT_MESSAGE("Cache removal failed.", nErrId == 0);
 pDPObj2->ClearSource();
 pDPObj2->Output(aOutRange.aStart);
 
@@ -1122,6 +1121,28 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
+// Now, intentionally delete one of the field header names from the source 
range.
+ScMarkData aMarkData;
+aMarkData.SelectOneTable(0);
+m_pDoc->DeleteArea(1, 0, 1, 0, aMarkData, IDF_CONTENTS);
+printer.resize(nRow2 - nRow1 + 1, nCol2 - nCol1 + 1);
+for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
+{
+for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+{
+String aVal;
+m_pDoc->GetString(nCol, nRow, 0, aVal);
+printer.set(nRow, nCol, aVal);
+}
+}
+printer.print("Data sheet content (header removed)");
+printer.clear();
+
+// An attempt to clear the cache whose original data now has an invalid
+// field name (empty name) should not succeed.
+nErrId = pDPs->ClearCache(pDPObj2);
+CPPUNIT_ASSERT_MESSAGE("Clearing the cache while the source data is 
invalid should not be allowed.", nErrId != 0);
+
 pDPs->FreeTable(pDPObj2);
 CPPUNIT_ASSERT_MESSAGE("There shouldn't be any data pilot table stored 
with the document.",
pDPs->GetCount() == 0);
commit 311dbc3b4ccd202c3ca0f8f1b577262f3f666e69
Author: Kohei Yoshida 
Date:   Mon Sep 19 22:16:54 2011 -0400

Use the method to insert source data.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index fd46aaf..6afc80b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -997,52 +997,21 @@ void Test::testDataPilot()
 };
 
 // Raw data
-struct {
-const char* pName; const char* pGroup; int nScore;
-} aData[] = {
-{ "Andy","A", 30 },
-{ "Bruce",   "A", 20 },
-{ "Charlie", "B", 45 },
-{ "David",   "B", 12 },
-{ "Edward",  "C",  8 },
-{ "Frank",   "C", 15 },
+const char* aData[][3] = {
+{ "Andy","A", "30" },
+{ "Bruce",   "A", "20" },
+{ "Charlie", "B", "45" },
+{ "David",   "B", "12" },
+{ "Edward",  "C",  "8" },
+{ "Frank",   "C", "15" },
 };
 
 size_t nFieldCount = SAL_N_ELEMENTS(aFields);
 size_t nDataCount = SAL_N_ELEMENTS(aData);
 
-// Insert field names in row 0.
-for (size_t i = 0; i < nFieldCount; ++i)
-m_pDoc->SetString(static_cast(i), 0, 0, 
OUString(aFields[i].pName, strlen(aFields[i].pName), RTL_TEXTENCODING_UTF8));
-
-// Insert data into row 1 and downward.
-for (size_t i = 0; i < nDataCount; ++i)
-{
-SCROW nRow = static_cast(i) + 1;
-m_pDoc->SetString(0, nRow, 0, OUString(aData[i].pName, 
strlen(aData[i].pName), RTL_TEXTENCODING_UTF8));
-m_pDoc->SetString(1, nRow, 0, OUString(aData[i].pGroup, 
strlen(aData[i].pGroup), RTL_TEXTENCODING_UTF8));
-m_pDoc->SetValue(2, nRow, 0, aData[i].nScore);
-}
-
-SCROW nRow1 = 0, nRow2 = 0;
-SCCOL nCol1 = 0, nCol2 = 0;
-m_pDoc->GetDataArea(0, nCol1, nRow1, nCol2, nRow2, true, false);
-CPPUNIT_ASSERT_MESSAGE("Data is expected to start from (col=0,row=0).", 
nCol1 == 0 && nRow1 == 0);
-CPPUNIT_ASSERT_MESSAGE("Unexpected data range.",
-   nCol2 == static_cast(nFieldCount - 1) && 
nRow2 == static_cast(nDataCount));
-
-SheetPrinter printer(nRow2 - nRow1 + 1, nCol2 - nCol1 + 1);
-for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
-{
-for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
-{
-String aVal;
-m_pDoc->GetString(nCol, nRow, 0, aVal);
-printer.set(nRow, nCol, aVal);
-}
-}
-printer.print("Data sheet content");
-printer.clear();
+ScRange aSrcRange = insertDPSourceData(m_pDoc, aFields, nFieldCount, 
aData, nDataCount);
+SCROW nRow1 = aSrcRange.aStart.Row(), nRow2 = aSrcRange.aEnd.Row();
+SCCOL nCol1 = aSrcRange.aStart.Col(), nCol2 = aSrcRange.aEnd.C

[Libreoffice-commits] .: 2 commits - sw/inc sw/source

2011-09-19 Thread Takeshi Abe

 sw/inc/pam.hxx  |   47 +++--
 sw/source/core/crsr/pam.cxx |   88 
 sw/source/core/undo/unredln.cxx |2 
 3 files changed, 43 insertions(+), 94 deletions(-)

New commits:
commit 0aa547c18dee940d7e9726c85880790710d3ec76
Author: Takeshi Abe 
Date:   Tue Sep 20 03:17:10 2011 +0900

reduce duplicate code to one template

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 9d83947..5be01df 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -94,14 +94,51 @@ enum SwComparePosition {
 POS_COLLIDE_START,  // Pos1 start touches at Pos2 end.
 POS_COLLIDE_END // Pos1 end touches at Pos2 start.
 };
-SwComparePosition ComparePosition(
-const SwPosition& rStt1, const SwPosition& rEnd1,
-const SwPosition& rStt2, const SwPosition& rEnd2 );
 
+template
 SwComparePosition ComparePosition(
-const unsigned long nStt1, const unsigned long nEnd1,
-const unsigned long nStt2, const unsigned long nEnd2 );
+const T& rStt1, const T& rEnd1,
+const T& rStt2, const T& rEnd2 )
+{
+SwComparePosition nRet;
+if( rStt1 < rStt2 )
+{
+if( rEnd1 > rStt2 )
+{
+if( rEnd1 >= rEnd2 )
+nRet = POS_OUTSIDE;
+else
+nRet = POS_OVERLAP_BEFORE;
 
+}
+else if( rEnd1 == rStt2 )
+nRet = POS_COLLIDE_END;
+else
+nRet = POS_BEFORE;
+}
+else if( rEnd2 > rStt1 )
+{
+if( rEnd2 >= rEnd1 )
+{
+if( rEnd2 == rEnd1 && rStt2 == rStt1 )
+nRet = POS_EQUAL;
+else
+nRet = POS_INSIDE;
+}
+else
+{
+if (rStt1 == rStt2)
+nRet = POS_OUTSIDE;
+else
+nRet = POS_OVERLAP_BEHIND;
+}
+}
+else if( rEnd2 == rStt1 )
+nRet = POS_COLLIDE_START;
+else
+nRet = POS_BEHIND;
+return nRet;
+}
 
 // SwPointAndMark / SwPaM
 struct SwMoveFnCollection;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 5d5f39d..a229fc5 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -165,94 +165,6 @@ SwDoc * SwPosition::GetDoc() const
 return nNode.GetNode().GetDoc();
 }
 
-SwComparePosition ComparePosition(
-const SwPosition& rStt1, const SwPosition& rEnd1,
-const SwPosition& rStt2, const SwPosition& rEnd2 )
-{
-SwComparePosition nRet;
-if( rStt1 < rStt2 )
-{
-if( rEnd1 > rStt2 )
-{
-if( rEnd1 >= rEnd2 )
-nRet = POS_OUTSIDE;
-else
-nRet = POS_OVERLAP_BEFORE;
-
-}
-else if( rEnd1 == rStt2 )
-nRet = POS_COLLIDE_END;
-else
-nRet = POS_BEFORE;
-}
-else if( rEnd2 > rStt1 )
-{
-if( rEnd2 >= rEnd1 )
-{
-if( rEnd2 == rEnd1 && rStt2 == rStt1 )
-nRet = POS_EQUAL;
-else
-nRet = POS_INSIDE;
-}
-else
-{
-if (rStt1 == rStt2)
-nRet = POS_OUTSIDE;
-else
-nRet = POS_OVERLAP_BEHIND;
-}
-}
-else if( rEnd2 == rStt1 )
-nRet = POS_COLLIDE_START;
-else
-nRet = POS_BEHIND;
-return nRet;
-}
-
-SwComparePosition ComparePosition(
-const unsigned long nStt1, const unsigned long nEnd1,
-const unsigned long nStt2, const unsigned long nEnd2 )
-{
-SwComparePosition nRet;
-if( nStt1 < nStt2 )
-{
-if( nEnd1 > nStt2 )
-{
-if( nEnd1 >= nEnd2 )
-nRet = POS_OUTSIDE;
-else
-nRet = POS_OVERLAP_BEFORE;
-
-}
-else if( nEnd1 == nStt2 )
-nRet = POS_COLLIDE_END;
-else
-nRet = POS_BEFORE;
-}
-else if( nEnd2 > nStt1 )
-{
-if( nEnd2 >= nEnd1 )
-{
-if( nEnd2 == nEnd1 && nStt2 == nStt1 )
-nRet = POS_EQUAL;
-else
-nRet = POS_INSIDE;
-}
-else
-{
-if (nStt1 == nStt2)
-nRet = POS_OUTSIDE;
-else
-nRet = POS_OVERLAP_BEHIND;
-}
-}
-else if( nEnd2 == nStt1 )
-nRet = POS_COLLIDE_START;
-else
-nRet = POS_BEHIND;
-return nRet;
-}
-
 
 enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 
commit 2defcfa33e86150ac936cc8a9a8edb1dcb242b5b
Author: Takeshi Abe 
Date:   Mon Sep 19 11:34:37 2011 +0900

removed an assignment in no use

diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index c0879af..bbb75dd 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -162,7 +162,7 @@ void SwUndoRedline::RedoRedlineImpl(SwDoc & rDoc, SwPaM & 
rPam)
 // SwUndoRedlin

[Libreoffice-commits] .: sc/source

2011-09-19 Thread Kohei Yoshida

 sc/source/ui/view/viewfun2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 012e7d8a2889da23b3c9fc11da9e9097f3b03a61
Author: Kohei Yoshida 
Date:   Mon Sep 19 20:53:18 2011 -0400

sal_True to true.

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 7728043..a0e22f3 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1742,7 +1742,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 
 break;  // break 'while (TRUE)'
 }
-}   // of while sal_True
+}   // of while true
 
 if (!aOldSelectedTables.empty())
 {
@@ -1774,7 +1774,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 //  if nothing is marked, DoneBlockMode, then marking can start
 //  directly from this place via Shift-Cursor
 if (!rMark.IsMarked() && !rMark.IsMultiMarked())
-DoneBlockMode(sal_True);
+DoneBlockMode(true);
 
 AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
 SetCursor( nCol, nRow, true );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-09-19 Thread Kohei Yoshida

 sc/source/ui/view/viewfun2.cxx |   35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 0835658b7d71c8289c04f17220def9f199d98efe
Author: Kohei Yoshida 
Date:   Mon Sep 19 20:49:19 2011 -0400

Store previously selected tables in std::set.

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 191771a..7728043 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1597,9 +1597,8 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 SCROW nRow = GetViewData()->GetCurY();
 SCTAB nTab = GetViewData()->GetTabNo();
 sal_uInt16 nCommand = pSearchItem->GetCommand();
-sal_Bool bAllTables = pSearchItem->IsAllTables();
-sal_Bool* pOldSelectedTables = NULL;
-sal_uInt16 nOldSelectedCount = 0;
+bool bAllTables = pSearchItem->IsAllTables();
+std::set aOldSelectedTables;
 SCTAB nOldTab = nTab;
 SCTAB nLastTab = pDoc->GetTableCount() - 1;
 SCTAB nStartTab, nEndTab;
@@ -1607,13 +1606,8 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 {
 nStartTab = 0;
 nEndTab = nLastTab;
-pOldSelectedTables = new sal_Bool [ nEndTab + 1 ];
-for ( SCTAB j = 0; j <= nEndTab; j++ )
-{
-pOldSelectedTables[j] = rMark.GetTableSelect( j );
-if ( pOldSelectedTables[j] )
-++nOldSelectedCount;
-}
+std::set aTmp(rMark.begin(), rMark.end());
+aOldSelectedTables.swap(aTmp);
 }
 else
 {   //! at least one is always selected
@@ -1750,21 +1744,24 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 }
 }   // of while sal_True
 
-if ( pOldSelectedTables )
-{   // restore originally selected table
-for ( SCTAB j = nStartTab; j <= nEndTab; j++ )
-{
-rMark.SelectTable( j, pOldSelectedTables[j] );
-}
+if (!aOldSelectedTables.empty())
+{
+// restore originally selected table
+for (SCTAB i = 0; i <= nEndTab; ++i)
+rMark.SelectTable(i, false);
+
+std::set::const_iterator itr = aOldSelectedTables.begin(), 
itrEnd = aOldSelectedTables.end();
+for (; itr != itrEnd; ++itr)
+rMark.SelectTable(*itr, true);
+
 if ( bFound )
-{   // if a table is selected as a "match" it remains (selected)
+{   // if a table is selected as a "match" it remains selected.
 rMark.SelectTable( nTab, true );
 // It's a swap if only one table was selected before
 //! otherwise now one table more might be selected
-if ( nOldSelectedCount == 1 && nTab != nOldTab )
+if ( aOldSelectedTables.size() == 1 && nTab != nOldTab )
 rMark.SelectTable( nOldTab, false );
 }
-delete [] pOldSelectedTables;
 }
 
 MarkDataChanged();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-09-19 Thread Kohei Yoshida

 sc/source/ui/view/viewfun2.cxx |   26 +++---
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit c2ab21aa25f5ae95f6faebe3cc7b2e44729f7ad7
Author: Kohei Yoshida 
Date:   Mon Sep 19 20:19:16 2011 -0400

A little cleanup.

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 88196cb..191771a 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1627,15 +1627,15 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 
 //! account for bAttrib during Undo !!!
 
-ScDocument* pUndoDoc = NULL;
-ScMarkData* pUndoMark = NULL;
+std::auto_ptr pUndoDoc;
+std::auto_ptr pUndoMark;
 rtl::OUString aUndoStr;
 if (bAddUndo)
 {
-pUndoMark = new ScMarkData( rMark );// Mark is being 
modified
+pUndoMark.reset(new ScMarkData(rMark));// Mark is 
being modified
 if ( nCommand == SVX_SEARCHCMD_REPLACE_ALL )
 {
-pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
+pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
 pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab );
 }
 }
@@ -1644,7 +1644,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 {   //! select all, after pUndoMark has been created
 for ( SCTAB j = nStartTab; j <= nEndTab; j++ )
 {
-rMark.SelectTable( j, sal_True );
+rMark.SelectTable( j, true );
 }
 }
 
@@ -1652,7 +1652,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 InitOwnBlockMode();
 
 //  If search starts at the beginning don't ask again whether it shall 
start at the beginning
-sal_Bool bFirst = true;
+bool bFirst = true;
 if ( nCol == 0 && nRow == 0 && nTab == nStartTab && 
!pSearchItem->GetBackward()  )
 bFirst = false;
 
@@ -1661,17 +1661,16 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 {
 GetFrameWin()->EnterWait();
 ScRangeList aMatchedRanges;
-if (pDoc->SearchAndReplace(*pSearchItem, nCol, nRow, nTab, rMark, 
aMatchedRanges, aUndoStr, pUndoDoc))
+if (pDoc->SearchAndReplace(*pSearchItem, nCol, nRow, nTab, rMark, 
aMatchedRanges, aUndoStr, pUndoDoc.get()))
 {
-bFound = sal_True;
-bFirst = sal_True;
+bFound = true;
+bFirst = true;
 if (bAddUndo)
 {
 GetViewData()->GetDocShell()->GetUndoManager()->AddUndoAction(
 new ScUndoReplace( GetViewData()->GetDocShell(), 
*pUndoMark,
 nCol, nRow, nTab,
-aUndoStr, pUndoDoc, pSearchItem ) );
-pUndoDoc = NULL;
+aUndoStr, pUndoDoc.release(), 
pSearchItem ) );
 }
 
 rMark.ResetMark();
@@ -1781,7 +1780,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 DoneBlockMode(sal_True);
 
 AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
-SetCursor( nCol, nRow, sal_True );
+SetCursor( nCol, nRow, true );
 
 if (   nCommand == SVX_SEARCHCMD_REPLACE
 || nCommand == SVX_SEARCHCMD_REPLACE_ALL )
@@ -1796,9 +1795,6 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 pDocSh->PostPaintGridAll(); // mark
 GetFrameWin()->LeaveWait();
 }
-
-delete pUndoDoc;// remove if not used
-delete pUndoMark;   // can always be removed
 }
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-09-19 Thread Kohei Yoshida

 sc/inc/document.hxx  |8 +-
 sc/inc/table.hxx |   45 +++---
 sc/source/core/data/documen3.cxx |   20 ++
 sc/source/core/data/markdata.cxx |2 
 sc/source/core/data/table6.cxx   |  122 ++-
 sc/source/ui/unoobj/cellsuno.cxx |   25 ---
 sc/source/ui/view/viewfun2.cxx   |   17 -
 7 files changed, 124 insertions(+), 115 deletions(-)

New commits:
commit 0783e78de2ce265e19b739effbff80c37ee98576
Author: Kohei Yoshida 
Date:   Mon Sep 19 19:09:19 2011 -0400

Let's avoid modifying the selection data during search and replace.

The previous code was modifying the selection data (ScMarkData) in
a not-so-obvious fashion during the search and/or replace.  Let's only
modify selection in the view code to avoid surprises.  The document
model shouldn't be modifying the view model.

Those methods that were taking a reference to ScMarkData now take a
const reference instead.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 77439d1..ca98063 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1260,10 +1260,10 @@ public:
 sal_uInt16 nFormatNo, const ScMarkData& 
rMark );
 voidGetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCROW nEndRow,
 ScAutoFormatData& rData );
-sal_BoolSearchAndReplace( const SvxSearchItem& rSearchItem,
-SCCOL& rCol, SCROW& rRow, SCTAB& rTab,
-ScMarkData& rMark,
-String& rUndoStr, ScDocument* pUndoDoc 
= NULL );
+boolSearchAndReplace( const SvxSearchItem& rSearchItem,
+  SCCOL& rCol, SCROW& rRow, SCTAB& rTab,
+  const ScMarkData& rMark, ScRangeList& 
rMatchedRanges,
+  rtl::OUString& rUndoStr, ScDocument* 
pUndoDoc = NULL );
 
 // determine Col/Row of subsequent calls
 // (e.g. not found from the beginning, or subsequent 
tables)
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 347b9cc..9cd3c57 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -498,9 +498,9 @@ public:
 sal_uInt16 nFormatNo );
 voidGetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL 
nEndCol, SCROW nEndRow, ScAutoFormatData& rData);
 voidScReplaceTabsStr( String& rStr, const String& rSrch, const 
String& rRepl ); // from sw
-boolSearchAndReplace(const SvxSearchItem& rSearchItem,
-SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
-String& rUndoStr, ScDocument* pUndoDoc);
+boolSearchAndReplace(
+const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const 
ScMarkData& rMark,
+ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* 
pUndoDoc);
 
 voidFindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, 
SCCOL nX2 );
 
@@ -819,33 +819,36 @@ private:
 voidGetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, 
ScAutoFormatData& rData);
 voidGetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, 
sal_uInt16 nIndex, ScAutoFormatData& rData);
 boolSearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW 
nRow,
-   const ScMarkData& rMark, String& rUndoStr, 
ScDocument* pUndoDoc);
+   const ScMarkData& rMark, rtl::OUString& rUndoStr, 
ScDocument* pUndoDoc);
 boolSearch(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& 
rRow,
-   const ScMarkData& rMark, String& rUndoStr, ScDocument* 
pUndoDoc);
-boolSearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
-String& rUndoStr, ScDocument* pUndoDoc);
+   const ScMarkData& rMark, rtl::OUString& rUndoStr, 
ScDocument* pUndoDoc);
+boolSearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& 
rMark,
+  ScRangeList& rMatchedRanges, rtl::OUString& 
rUndoStr, ScDocument* pUndoDoc);
 boolReplace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& 
rRow,
-const ScMarkData& rMark, String& rUndoStr, ScDocument* 
pUndoDoc);
-boolReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
-String& rUndoStr, ScDocument* pUndoDoc);
+const ScMarkData& rMark, rtl::OUString& rUndoStr, 
ScDocument* pUndoDoc);
+boolReplaceAll(
+const SvxSearchItem& rSearchItem, const ScMarkData& rMark, 
ScRangeList& rMatchedRanges,
+rtl::OUString& rUndoStr, ScDocument* pUndoDoc);
 
 bool

[Libreoffice-commits] .: 2 commits - automation/Executable_miniapp.mk automation/Executable_testtool.mk RepositoryFixes.mk Repository.mk set_soenv.in solenv/inc vcl/StaticLibrary_vclmain.mk

2011-09-19 Thread Jan Holesovsky

 Repository.mk |1 -
 RepositoryFixes.mk|4 
 automation/Executable_miniapp.mk  |2 +-
 automation/Executable_testtool.mk |2 +-
 set_soenv.in  |4 +---
 solenv/inc/_tg_app.mk |   20 ++--
 solenv/inc/tg_app.mk  |2 +-
 solenv/inc/unxgcc.mk  |1 -
 solenv/inc/unxiosr.mk |2 --
 solenv/inc/unxmacx.mk |1 -
 solenv/inc/unxsogi.mk |1 -
 solenv/inc/unxsogs.mk |1 -
 solenv/inc/unxsoli4.mk|2 --
 solenv/inc/unxsols4.mk|2 --
 solenv/inc/unxsolu4.mk|2 --
 solenv/inc/wntgcci.mk |1 -
 solenv/inc/wntmsc.mk  |1 -
 vcl/StaticLibrary_vclmain.mk  |   18 --
 18 files changed, 14 insertions(+), 53 deletions(-)

New commits:
commit f62a449a53a73db81768082b89f3b9db466af460
Author: Jan Holesovsky 
Date:   Tue Sep 20 00:49:49 2011 +0200

Kill the explicit linking to salmain.o, use vclmain instead.

diff --git a/Repository.mk b/Repository.mk
index 950a239..175adbd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -361,7 +361,6 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
 libeay32 \
 ssleay32 \
 ooopathutils \
-   salmain \
sample \
 salcpprt \
vclmain \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index aa37877..16f1c8f 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -39,9 +39,6 @@ gb_Library_FILENAMES := $(patsubst 
salhelper:libsalhelper%,salhelper:libuno_salh
 gb_Library_FILENAMES := $(patsubst 
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
ucb:libucb%,ucb:libucb1%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_FILENAMES))
-
-# TODO: this is a hack; we should really build salmain as a regular static 
library
-gb_StaticLibrary_FILENAMES := $(subst 
salmain:libsalmain.a,salmain:salmain.o,$(gb_StaticLibrary_FILENAMES))
 endif
 
 ifeq ($(OS),WNT)
@@ -59,7 +56,6 @@ gb_Library_FILENAMES := $(patsubst 
tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
 
 gb_StaticLibrary_FILENAMES := $(patsubst 
graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
-gb_StaticLibrary_FILENAMES := $(subst 
salmain:salmain.lib,salmain:salmain.obj,$(gb_StaticLibrary_FILENAMES))
 
 ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst 
crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk
index 7ddd9d9..e9ae6f1 100644
--- a/automation/Executable_miniapp.mk
+++ b/automation/Executable_miniapp.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Executable_add_linked_libs,miniapp,\
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,miniapp,\
-salmain \
+vclmain \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,miniapp,\
diff --git a/automation/Executable_testtool.mk 
b/automation/Executable_testtool.mk
index 8d9327c..0d782c7 100644
--- a/automation/Executable_testtool.mk
+++ b/automation/Executable_testtool.mk
@@ -69,7 +69,7 @@ $(eval $(call gb_Executable_add_linked_libs,testtool,\
 
 $(eval $(call gb_Executable_add_linked_static_libs,testtool,\
 app \
-salmain \
+vclmain \
 sample \
 ))
 
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 4a98fae..b5a7956 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -32,7 +32,7 @@ APP1STACKN=
 
 .IF "$(APP1NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP1OBJS+= $(STDOBJVCL)
+APP1STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -242,7 +242,7 @@ APP2STACKN=
 
 .IF "$(APP2NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP2OBJS+= $(STDOBJVCL)
+APP2STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -452,7 +452,7 @@ APP3STACKN=
 
 .IF "$(APP3NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP3OBJS+= $(STDOBJVCL)
+APP3STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -662,7 +662,7 @@ APP4STACKN=
 
 .IF "$(APP4NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP4OBJS+= $(STDOBJVCL)
+APP4STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -872,7 +872,7 @@ APP5STACKN=
 
 .IF "$(APP5NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP5OBJS+= $(STDOBJVCL)
+APP5STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -1082,7 +1082,7 @@ APP6STACKN=
 
 .IF "$(APP6NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP6OBJS+= $(STDOBJVCL)
+APP6STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -1292,7 +1292,7 @@ APP7STACKN=
 
 .IF "$(APP7NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP7OBJS+= $(STDOBJVCL)
+APP7STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -1502,7 +1502,7 @@ APP8STACKN=
 
 .IF "$(APP8NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP8OBJS+= $(STDOBJVCL)
+APP8STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
@@ -1712,7 +1712,7 @@ APP9STACKN=
 
 .IF "$(APP9NOSAL)"==""
 .IF "$(TARGETTYPE)" ==

[Libreoffice-commits] .: 7 commits - bug/bug bug/bug.xhtml bug/component_comments.xsl bug/components.xsl bug/query.pl bug/subcomponents.xsl

2011-09-19 Thread Loic Dachary

 bug/bug.xhtml |  115 +++---
 bug/bug/bug.css   |  278 +++---
 bug/bug/bug.js|   49 +++--
 bug/bug/images/description.png|binary
 bug/bug/images/error-bottom-left.png  |binary
 bug/bug/images/error-bottom-right.png |binary
 bug/bug/images/error-bottom.png   |binary
 bug/bug/images/error-left.png |binary
 bug/bug/images/error-right.png|binary
 bug/bug/images/error-top-left.png |binary
 bug/bug/images/error-top-right.png|binary
 bug/bug/images/error-top.png  |binary
 bug/bug/images/login-container.png|binary
 bug/bug/images/login-input.png|binary
 bug/bug/images/signin-hover.png   |binary
 bug/bug/images/signin.png |binary
 bug/bug/images/subject.png|binary
 bug/bug/images/submit-hover.png   |binary
 bug/bug/images/submit.png |binary
 bug/bug/images/upload-hover.png   |binary
 bug/bug/images/upload.png |binary
 bug/bug/skin.js   |   61 +++
 bug/component_comments.xsl|   11 -
 bug/components.xsl|   33 +++-
 bug/query.pl  |   32 +++
 bug/subcomponents.xsl |4 
 26 files changed, 446 insertions(+), 137 deletions(-)

New commits:
commit 1b20ec920288d88e1ede17b3cc180665e8893431
Author: Loic Dachary 
Date:   Tue Sep 20 00:41:52 2011 +0200

attachment integration

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index f8554f4..94e74b7 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -134,17 +134,23 @@
 
 
 
+  
   Upload an attachment illustrating the problem
+  
  
 
 
 
-
+
 
-
-
+ 
+  
+ 
+ 
+  
+ 
  
- 
+ 

 
   
diff --git a/bug/bug/bug.css b/bug/bug/bug.css
index d5d983c..ef22aa5 100644
--- a/bug/bug/bug.css
+++ b/bug/bug/bug.css
@@ -377,11 +377,46 @@ body {
 /* state_success */
 .state_success {
 display: none;
+text-align: center;
+padding: 30px;
+font-weight: bold;
+}
+
+.state_success a {
+color: #025587;
+}
+
+.state_success a:hover {
+color: #29a1e0;
 }
 
 /* state_attach */
 .state_attach {
 display: none;
+text-align: center;
+}
+
+.state_attach .attach-invite {
+color: #18a403;
+padding: 10px;
+}
+
+.state_attach .attach-submit input {
+margin-left: auto;
+margin-right: 40px;
+background: url('images/upload.png') no-repeat;
+width: 163px;
+height: 49px;
+font-weight: bold;
+font-size: 20px;
+color: #fff;
+text-align: center;
+line-height: 49px;
+border: 0;
+}
+
+.state_attach .attach-submit input:hover {
+background: url('images/upload-hover.png') no-repeat;
 }
 
 /* skin */
diff --git a/bug/bug/images/upload-hover.png b/bug/bug/images/upload-hover.png
new file mode 100644
index 000..886c540
Binary files /dev/null and b/bug/bug/images/upload-hover.png differ
diff --git a/bug/bug/images/upload.png b/bug/bug/images/upload.png
new file mode 100644
index 000..886c540
Binary files /dev/null and b/bug/bug/images/upload.png differ
commit c71f8f3fbfb1c8b6284086562728e9befe4527ad
Author: Loic Dachary 
Date:   Tue Sep 20 00:14:29 2011 +0200

integrate the error message

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index ad61d5f..f8554f4 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -42,6 +42,24 @@
 
   
   
+
+   
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+
 
 
 
@@ -129,23 +147,6 @@
  

 
-   
-  
-
-  
-
-  
-  
-  
-  
-  
-  
-
-  
-
-  
-
-

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

2011-09-19 Thread Stephan Bergmann

 sw/inc/index.hxx|   12 ++--
 sw/source/core/bastyp/index.cxx |4 ++--
 sw/source/core/bastyp/init.cxx  |4 
 sw/source/core/crsr/crsrsh.cxx  |2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

New commits:
commit e1945ba903faa567d90addaf13a0eb8a2f688d15
Author: Stephan Bergmann 
Date:   Mon Sep 19 23:33:09 2011 +0200

Do not delete SwIndexReg::pEmptyIndexArray while SwXTextCursor instances 
can still reference it.

Found during termination of sw/qa/unoapi soffice.bin run under 
Valgrind/memcheck.

diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 551e31d..2a3a792 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -29,6 +29,8 @@
 #define _INDEX_HXX
 
 #include 
+
+#include "rtl/instance.hxx"
 #include 
 #include// for RTTI of SwIndexReg
 #include  // for xub_StrLen
@@ -117,12 +119,6 @@ class SwIndexReg
 
 const SwIndex *pFirst, *pLast, *pMiddle;
 
-// A global array for holding indices that need to be "swapped" temporarily
-// or do not know a valid array (SwPaM/SwPosition!).
-friend void _InitCore();
-friend void _FinitCore();
-static SwIndexReg* pEmptyIndexArray;
-
 protected:
 virtual void Update( SwIndex const & rPos, const xub_StrLen nChangeLen,
  const bool bNegative = false, const bool bDelete = false );
@@ -142,6 +138,10 @@ public:
 void MoveTo( SwIndexReg& rArr );
 };
 
+// A global array for holding indices that need to be "swapped" temporarily or
+// do not know a valid array (SwPaM/SwPosition!):
+struct EmptyIndexArray: rtl::Static< SwIndexReg, EmptyIndexArray > {};
+
 #if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL < 2
 
 inline xub_StrLen SwIndex::operator++()
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 84db722..bff5760 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -48,7 +48,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const 
nIdx)
 {
 if( !pArray )
 {
-pArray = SwIndexReg::pEmptyIndexArray;
+pArray = &EmptyIndexArray::get();
 nIndex = 0; // steht immer auf 0 !!!
 }
 
@@ -225,7 +225,7 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, xub_StrLen nIdx 
)
 {
 if( !pArr )
 {
-pArr = SwIndexReg::pEmptyIndexArray;
+pArr = &EmptyIndexArray::get();
 nIdx = 0;   // steht immer auf 0 !!!
 }
 
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 1e3e5dc..72e6ec4 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -430,7 +430,6 @@ sal_uInt16* SwAttrPool::pVersionMap4 = 0;
 // #i18732#
 sal_uInt16* SwAttrPool::pVersionMap5 = 0;
 sal_uInt16* SwAttrPool::pVersionMap6 = 0;
-SwIndexReg* SwIndexReg::pEmptyIndexArray = 0;
 
 const sal_Char* pMarkToTable= "table";
 const sal_Char* pMarkToFrame= "frame";
@@ -725,8 +724,6 @@ void _InitCore()
 SwSelPaintRects::pMapMode = new MapMode;
 SwFntObj::pPixMap = new MapMode;
 
-SwIndexReg::pEmptyIndexArray = new SwIndexReg;
-
 pGlobalOLEExcludeList = new SvPtrarr;
 
 const SvxSwAutoFmtFlags& rAFlags = 
SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
@@ -813,7 +810,6 @@ void _FinitCore()
 
 ::ClearFEShellTabCols();
 
-delete SwIndexReg::pEmptyIndexArray;
 delete[] SwAttrPool::pVersionMap1;
 delete[] SwAttrPool::pVersionMap2;
 delete[] SwAttrPool::pVersionMap3;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 6278e62..8a8cd4e 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3164,7 +3164,7 @@ const SwStartNode* lcl_NodeContext( const SwNode& rNode )
 bool lcl_PosOk(const SwPosition & aPos)
 {
 return NULL != aPos.nNode.GetNode().GetCntntNode() &&
-   SwIndexReg::pEmptyIndexArray != aPos.nContent.GetIdxReg();
+   &EmptyIndexArray::get() != aPos.nContent.GetIdxReg();
 }
 
 /**
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild

2011-09-19 Thread Bjoern Michaelsen

 solenv/gbuild/platform/macosx.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85
Author: Stephan Bergmann 
Date:   Mon Sep 19 21:39:46 2011 +0200

Call macosx-change-install-names on executables in gbuild, too.

Signed-off-by: Bjoern Michaelsen 

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2def0c9..ff7 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -274,6 +274,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
-o $(1) \
`cat $${DYLIB_FILE}` && \
+   $(if $(filter Executable,$(TARGETTYPE)),\
+   $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl 
Executable $(LAYER) $(1) &&) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1) && \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - configure.in

2011-09-19 Thread Norbert Thiebaud

 configure.in |4 
 1 file changed, 4 insertions(+)

New commits:
commit c2d12efbe7ef0c5563039df94a897e53b56088de
Author: Norbert Thiebaud 
Date:   Mon Sep 19 14:58:41 2011 -0500

don't forget to generate bootstrap

diff --git a/configure.in b/configure.in
index 0ff38f4..f3a67e1 100755
--- a/configure.in
+++ b/configure.in
@@ -9713,6 +9713,10 @@ AC_SUBST(gb_REPOS)
 AC_OUTPUT([Env.Host.sh Makefile bin/repo-list desktop/scripts/soffice.sh])
 sed -ie 's/export .*="@\(.*\)@"$/unset \1/' Env.Host.sh
 
+echo '#1/bin/sh' > bootstrap
+cat bootstrap.1 >> bootstrap
+chmod +x bootstrap
+
 # make sure this is executable
 chmod +x desktop/scripts/soffice.sh
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - 3 commits - configure.in

2011-09-19 Thread Norbert Thiebaud

 configure.in |   94 ---
 1 file changed, 71 insertions(+), 23 deletions(-)

New commits:
commit ed32cdbd67bfe9ef41cb7301e4474118d82f3d55
Author: Norbert Thiebaud 
Date:   Mon Sep 19 14:44:04 2011 -0500

add preliminary support for darwin for set_soenv killing

diff --git a/configure.in b/configure.in
index 2356ee8..0ff38f4 100755
--- a/configure.in
+++ b/configure.in
@@ -9560,12 +9560,60 @@ case "$host_os" in
 fi
 CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:."
 XCLASSPATH="$CLASSPATH"
-
PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr"
+
PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$"
 SOLAREXTRALIB=" -L..$LIB64"
 TMPDIR=/tmp
 ;;
+
+darwin*)
+COM=GCC;
+case "$host_cpu" in
+arm*)
+CPU=R
+CPUNAME=ARM
+OUTPATH=unxiosr
+GUI=UNX;
+OS=IOS;
+GUIBASE=cocoatouch
+;;
+powerpc*)
+CPU=P
+CPUNAME="POWERPC"
+OUTPATH="unxmacxp"
+OS="MACOSX"
+GUI="UNX"
+FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
+if test "$XLIB" = "no_x_libraries"; then
+GUIBASE="aqua"
+else
+GUIBASE="unx"
+fi
+;;
+*)
+CPU=I
+CPUNAME=INTEL
+OUTPATH=unxmacxi
+OS=MACOSX
+GUI=UNX
+FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
+if test "$XLIB" = "no_x_libraries"; then
+GUIBASE="aqua"
+else
+GUIBASE="unx"
+fi
+;;
+esac
+GVER=VCL
+INPATH=OUTPATH${PROEXT};
+PATH_SEPERATOR=:
+PATH_="$SRC_ROOT/solenv/$OUTPATH/bin:$SRC_ROOT/solenv/bin:$PATH"
+if test -x "$TMPDIR" ; then
+TMPDIR=/tmp
+fi
+;;
+
 *)
-AC_MSG_ERROR([Unknown host_os $host_cpu])
+AC_MSG_ERROR([Unknown host_os $host_os])
 ;;
 esac
 AC_MSG_RESULT([$INPATH])
commit 575dfb19366d4d41acbaf31d8a600a3121367f5f
Author: Norbert Thiebaud 
Date:   Mon Sep 19 14:43:16 2011 -0500

use if test rather than if [[ to avoid confusion

diff --git a/configure.in b/configure.in
index 69a9ae9..2356ee8 100755
--- a/configure.in
+++ b/configure.in
@@ -9385,7 +9385,7 @@ SRC_ROOT=`pwd -P`
 popd > /dev/null
 SOLARENV="$SRC_ROOT/solenv"
 SOLARVER="$SRC_ROOT/solver"
-if [[ "$TARFILE_LOCATION" == "DEFAULT" ]]
+if test "$TARFILE_LOCATION" = "DEFAULT"
 then
 TARFILE_LOCATION="$SRC_ROOT/src"
 fi
@@ -9445,22 +9445,22 @@ case "$host_os" in
 CPUNAME=GODSON
 JREPLATFORMNAME=mips
 OUTPATH=unxlngmips
-if [[ "$SIZEOF_LONG" == "8" ]]
+if test "$SIZEOF_LONG" = "8"
 then
 JREPLATFORMNAME=mips64
-if [[ "$WORDS_BIGENDIAN" != "yes" ]]
+if test "$WORDS_BIGENDIAN" != "yes"
 then
 EPM_FLAGS="-a mips64el"
-if [[ "$JDK" == "gcj" ]]
+if test "$JDK" = "gcj"
 then
 JREPLATFORMNAME=mips64el
 fi
-fi 
+fi
 else
-if [[ "$WORDS_BIGENDIAN" != "yes" ]]
+if test "$WORDS_BIGENDIAN" != "yes"
 then
 EPM_FLAGS="-a mipsel"
-if [[ `echo $JDK|grep sun` && -d 
$JAVA_HOME/jre/lib/mips32 ]]
+if test -n `echo $JDK|grep sun` -a -d 
$JAVA_HOME/jre/lib/mips32
 then
 JREPLATFORMNAME=mips32
 JREVMTYPE=client
@@ -9488,7 +9488,7 @@ case "$host_os" in
 CPUNAME=POWERPC64
 JREPLATFORMNAME=ppc64
 OUTPATH=unxlngppc64
-if [[ -z `echo $JDK|grep -i sun` ]]
+if test -z "`echo $JDK|grep -i sun`"
 then
 JREVMTYPE=server
 fi
@@ -9527,23 +9527,23 @@ case "$host_os" in
 #JRE fixups
 case "$host_cpu" in
 i*86)
-if [[ -n `echo $JDK|grep -i ^IBM` ]]
+if tests -n "`echo $JDK|grep -i ^IBM`"
 then
 JRELIBDIR=$JAVA_HOME/jre/bin
 JRETOOLKITDIR=$JAVA_HOME/jre/bin/classic

[Libreoffice-commits] .: 3 commits - dbaccess/source solenv/gbuild solenv/inc

2011-09-19 Thread Stephan Bergmann

 dbaccess/source/core/dataaccess/databasecontext.cxx |5 -
 solenv/gbuild/CppunitTest.mk|1 -
 solenv/gbuild/platform/macosx.mk|3 +++
 solenv/inc/settings.mk  |1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 79fdb70baf70aeb492437ef85de7f02ad4234f21
Author: Stephan Bergmann 
Date:   Mon Sep 19 21:39:46 2011 +0200

Call macosx-change-install-names on executables in gbuild, too.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f71c5af..e30201b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -337,6 +337,9 @@ $(call gb_Helper_abbreviate_dirs,\
$(LIBS) \
-o $(1) \
`cat $${DYLIB_FILE}` && \
+$(if $(filter Executable,$(TARGETTYPE)), \
+$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
+$(LAYER) $(1) &&) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1) && \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
commit 966f3c0f6df43185c572c451269604095428e917
Author: Stephan Bergmann 
Date:   Mon Sep 19 15:53:25 2011 +0200

Removed --leak-check=yes from CppUnit valgrind/memcheck calls.

Can be enabled via VALGRIND_OPTS=--leak-check=yes.

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cdfe4f0..e2010d5 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -43,7 +43,6 @@ endif
 ifneq ($(strip $(VALGRIND)),)
 gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
 ifeq ($(strip $(VALGRIND)),memcheck)
-gb_CppunitTest_VALGRINDTOOL += --leak-check=yes
 G_SLICE := always-malloc
 export G_SLICE
 GLIBCXX_FORCE_NEW := 1
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index f395fa1..b5b7e60 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1049,7 +1049,6 @@ GDBTRACE=gdb -nx 
--command=$(SOLARENV)/bin/gdbtrycatchtrace --args
 .IF "$(VALGRIND)" != ""
 VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50
 .IF "$(VALGRIND)" == "memcheck"
-VALGRINDTOOL+=--leak-check=yes
 G_SLICE*:=always-malloc
 .EXPORT : G_SLICE
 GLIBCXX_FORCE_NEW*:=1
commit c9b1cb5ae36b1057fb185945b52d3e45c5436bb6
Author: Stephan Bergmann 
Date:   Mon Sep 19 15:49:25 2011 +0200

Avoid premature deletion of objects in ODatabaseContext::m_aDatabaseObjects.

Access of deleted objects found with valgrind/memcheck of 
dbaccess/qa/unoapi.

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 22f77a7..f542d2b 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -291,7 +291,10 @@ void ODatabaseContext::disposing()
 ++aIter
 )
 {
-aIter->second->dispose();
+rtl::Reference< ODatabaseModelImpl > obj(aIter->second);
+// make sure obj is acquired and does not delete itself from within
+// dispose()
+obj->dispose();
 }
 m_aDatabaseObjects.clear();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bug/bug

2011-09-19 Thread Loic Dachary

 bug/bug/icons/icon-hover.png |binary
 bug/bug/images/comment.png   |binary
 2 files changed

New commits:
commit 99ec13a3d1c7fc2827a634314457e2fb5347015e
Author: Loic Dachary 
Date:   Mon Sep 19 21:11:24 2011 +0200

integration of the component state

diff --git a/bug/bug/icons/icon-hover.png b/bug/bug/icons/icon-hover.png
new file mode 100644
index 000..25b912f
Binary files /dev/null and b/bug/bug/icons/icon-hover.png differ
diff --git a/bug/bug/images/comment.png b/bug/bug/images/comment.png
new file mode 100644
index 000..1514954
Binary files /dev/null and b/bug/bug/images/comment.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - configure.in

2011-09-19 Thread Norbert Thiebaud

 configure.in |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5b5247de26736409fa8a292357d44f455e819193
Author: Norbert Thiebaud 
Date:   Mon Sep 19 13:58:30 2011 -0500

remove readlink gnu-ism

diff --git a/configure.in b/configure.in
index d21f906..bd78565 100755
--- a/configure.in
+++ b/configure.in
@@ -9380,8 +9380,9 @@ echo "setting up the post_download check script"
 autoconf post_download.in > post_download
 chmod +x post_download
 
-CONFIGURESCRIPT=`readlink -f $0`
-SRC_ROOT=`dirname $CONFIGURESCRIPT`
+pushd `dirname $0` > /dev/null
+SRC_ROOT=`pwd -P`
+popd > /dev/null
 SOLARENV="$SRC_ROOT/solenv"
 SOLARVER="$SRC_ROOT/solver"
 if [[ "$TARFILE_LOCATION" == "DEFAULT" ]]
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-09-19 Thread Cédric Bosdonnat

 sw/source/core/inc/bodyfrm.hxx |1 
 sw/source/core/inc/colfrm.hxx  |3 
 sw/source/core/inc/ftnfrm.hxx  |1 
 sw/source/core/inc/pagefrm.hxx |2 
 sw/source/core/inc/sectfrm.hxx |2 
 sw/source/core/layout/paintfrm.cxx |  393 +++--
 6 files changed, 257 insertions(+), 145 deletions(-)

New commits:
commit 0803f08bb135ec52d58171279d95b9ef542bcabd
Author: CÃ©dric Bosdonnat 
Date:   Mon Sep 19 18:42:37 2011 +0200

Page Break: draw a dashed line using the header/footer separator code

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 0e1ff5c..4fd60c3 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3265,32 +3265,27 @@ void SwLayoutFrm::Paint(SwRect const& rRect, 
SwPrintData const*const) const
 }
 }
 
-drawinglayer::primitive2d::Primitive2DSequence 
lcl_CreateHeaderFooterSeparatorPrimitives(
-const SwPageFrm* pPageFrm, double nLineY )
+drawinglayer::primitive2d::Primitive2DSequence 
lcl_CreateDashedIndicatorPrimitive(
+basegfx::B2DPoint aStart, basegfx::B2DPoint aEnd,
+basegfx::BColor aColor )
 {
-// Adjust the Y-coordinate of the line to the header/footer box
 drawinglayer::primitive2d::Primitive2DSequence aSeq( 1 );
 
-basegfx::B2DPoint aLeft ( pPageFrm->Frm().Left(), nLineY );
-basegfx::B2DPoint aRight( pPageFrm->Frm().Right(), nLineY );
-
-basegfx::BColor aLineColor = 
SwViewOption::GetHeaderFooterMarkColor().getBColor();
-
 std::vector< double > aStrokePattern;
 basegfx::B2DPolygon aLinePolygon;
-aLinePolygon.append( aLeft );
-aLinePolygon.append( aRight );
+aLinePolygon.append( aStart );
+aLinePolygon.append( aEnd );
 
 const StyleSettings& rSettings = 
Application::GetSettings().GetStyleSettings();
 if ( rSettings.GetHighContrastMode( ) )
 {
 // Only a solid line in high contrast mode
-aLineColor = rSettings.GetDialogTextColor().getBColor();
+aColor = rSettings.GetDialogTextColor().getBColor();
 }
 else
 {
 // Get a color for the contrast
-basegfx::BColor aHslLine = basegfx::tools::rgb2hsl( aLineColor );
+basegfx::BColor aHslLine = basegfx::tools::rgb2hsl( aColor );
 double nLuminance = aHslLine.getZ() * 2.5;
 if ( nLuminance == 0 )
 nLuminance = 0.5;
@@ -3318,7 +3313,7 @@ drawinglayer::primitive2d::Primitive2DSequence 
lcl_CreateHeaderFooterSeparatorPr
 drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D * pLine =
 new drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D (
 basegfx::B2DPolyPolygon( aLinePolygon ),
-drawinglayer::attribute::LineAttribute( aLineColor ),
+drawinglayer::attribute::LineAttribute( aColor ),
 drawinglayer::attribute::StrokeAttribute( aStrokePattern ) );
 
 aSeq[ aSeq.getLength( ) - 1 ] = 
drawinglayer::primitive2d::Primitive2DReference( pLine );
@@ -3326,6 +3321,18 @@ drawinglayer::primitive2d::Primitive2DSequence 
lcl_CreateHeaderFooterSeparatorPr
 return aSeq;
 }
 
+drawinglayer::primitive2d::Primitive2DSequence 
lcl_CreateHeaderFooterSeparatorPrimitives(
+const SwPageFrm* pPageFrm, double nLineY )
+{
+// Adjust the Y-coordinate of the line to the header/footer box
+basegfx::B2DPoint aLeft ( pPageFrm->Frm().Left(), nLineY );
+basegfx::B2DPoint aRight( pPageFrm->Frm().Right(), nLineY );
+
+basegfx::BColor aLineColor = 
SwViewOption::GetHeaderFooterMarkColor().getBColor();
+
+return lcl_CreateDashedIndicatorPrimitive( aLeft, aRight, aLineColor );
+}
+
 void SwPageFrm::PaintBreak( ) const
 {
 if ( !pGlobalShell->GetViewOptions()->IsPrinting() &&
@@ -3347,19 +3354,16 @@ void SwPageFrm::PaintBreak( ) const
 double nYLineOffset = double( pPageFrm->Frm().Top() + 
pPrevPageFrm->Frm().Bottom() ) / 2.0;
 SwRect aRect = pPageFrm->GetBoundRect();
 
-// Draw the line
-basegfx::B2DPolygon aLine;
-aLine.append( basegfx::B2DPoint( double( aRect.Left() ), 
nYLineOffset ) );
-aLine.append( basegfx::B2DPoint( double( aRect.Right() ), 
nYLineOffset ) );
-
-basegfx::BColor aLineColor = 
SwViewOption::GetPageBreakColor().getBColor();
+basegfx::BColor aColor = 
SwViewOption::GetPageBreakColor().getBColor();
 
-drawinglayer::primitive2d::PolygonHairlinePrimitive2D* pLine =
-new 
drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
-aLine, aLineColor );
+// Draw the line
+drawinglayer::primitive2d::Primitive2DSequence aSeq =
+lcl_CreateDashedIndicatorPrimitive(
+basegfx::B2DPoint( double( aRect.Left() ), 
nYLineOffset ),
+basegfx::B2DPoint( double( aRec

[Libreoffice-commits] .: 3 commits - bin/distro-install-desktop-integration .gitignore sysui/desktop

2011-09-19 Thread Tomáš Chvátal

 .gitignore |1 +
 bin/distro-install-desktop-integration |   26 +-
 sysui/desktop/share/create_tree.sh |   22 +++---
 3 files changed, 25 insertions(+), 24 deletions(-)

New commits:
commit 25fd1b81b1afc09b52a9a4471d565baf23d9bebb
Author: Tomas Chvatal 
Date:   Mon Sep 19 20:35:05 2011 +0200

Ignore config.params file.

diff --git a/.gitignore b/.gitignore
index 3a4e8a1..14e1c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@
 /config.guess
 /config.log
 /config.status
+/config.parms
 /configure
 /desktop/scripts/soffice.sh
 /Makefile
commit af37c0a988109b3b38e68591a5e9a7ea39e2c2a7
Author: Baptiste Daroussin 
Date:   Mon Sep 19 13:56:26 2011 +0200

Use PREFIXDIR when possible

diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 141e9a1..a694f6d 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -42,31 +42,31 @@ if [ "${GNOMEDIR}" ]; then
   chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".*
 fi
 
-mkdir -p "${DESTDIR}/usr/bin"
+mkdir -p "${DESTDIR}$PREFIXDIR/bin"
 
 test -n "${OFFICE_PREFIX}" && office_prefix="${OFFICE_PREFIX}" || 
office_prefix=/opt
 office_root=${office_prefix}/${PREFIX}
 
 #this symlink is needed to have the API boostrap functions running right
-ln -sf "${office_root}/program/soffice" "${DESTDIR}/usr/bin/${PREFIX}"
+ln -sf "${office_root}/program/soffice" "${DESTDIR}$PREFIXDIR/bin/${PREFIX}"
 
-cp printeradmin.sh "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
-chmod 0755 "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
+cp printeradmin.sh "${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin"
+chmod 0755 "${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin"
 
 if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then
 # compat symlinks
 mkdir -p "${DESTDIR}${office_prefix}"
 ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
-ln -sf /usr/bin/${PREFIX} "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}"
-ln -sf /usr/bin/${PREFIX}-printeradmin 
"${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin"
+ln -sf $PREFIXDIR/bin/${PREFIX} 
"${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}"
+ln -sf $PREFIXDIR/bin/${PREFIX}-printeradmin 
"${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}-printeradmin"
 fi
 
-mkdir -p "${DESTDIR}/usr/share/mime/packages"
-cp openoffice.org.xml 
"${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
-chmod 0644 
"${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
+mkdir -p "${DESTDIR}$PREFIXDIR/share/mime/packages"
+cp openoffice.org.xml 
"${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
+chmod 0644 
"${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
 
-mkdir -p "${DESTDIR}/usr/share/applications"
+mkdir -p "${DESTDIR}$PREFIXDIR/share/applications"
 for i in `cat launcherlist`; do
-  ln -sf "${office_root}/share/xdg/${i}" 
"${DESTDIR}/usr/share/applications/${PREFIX}-${i}"
+  ln -sf "${office_root}/share/xdg/${i}" 
"${DESTDIR}$PREFIXDIR/share/applications/${PREFIX}-${i}"
 done
 
commit 03996d64c7fceec611a6a40e42a39e9ad0237ceb
Author: Baptiste Daroussin 
Date:   Mon Sep 19 13:40:48 2011 +0200

Use PREFIXDIR each time possible to allow installing where /usr is not the 
prefix

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 80e5c4a..466a9ad 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -12,10 +12,10 @@ create_wrapper()
 echo "Install $PREFIXDIR/bin/$1"
 
 if test -L "$DESTDIR$PREFIXDIR/bin/$1" ; then
-# do not overwrite /usr/bin/libreoffice symlink created by 
create_tree.sh
+# do not overwrite $PREFIXDIR/bin/libreoffice symlink created by 
create_tree.sh
 # the symlink is necessary by java UNO components to find
 # the UNO installation using $PATH; this function used to be provided
-# by /usr/bin/soffice symlink, see
+# by $PREFIXDIR/bin/soffice symlink, see
 # 
http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
 # Note: if you want to support parallel installation of more OOo 
versions
 #   you cannot include this link directly into the package
@@ -87,7 +87,7 @@ add_wrapper()
 test -n "$oowrapper_name" && create_man_link "$oowrapper_name" 
"$used_man_page" "$file_list"
 
 # add desktop file to the right file list
-test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo 
"/usr/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
+test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo 
"$PREFIXDIR/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
 }
 
 # install desktop integration from plain packages
@@ -109,8 +109,8 @@ sed -i \
 export ICON_PREFIX=$INSTALLDIRNAME
 export ICON_SOURCE_DIR=$bui

[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - 3 commits - configure.in distro-configs/DevLean.conf distro-configs/LibreOfficeLinux.conf

2011-09-19 Thread Bjoern Michaelsen

 configure.in |4 
 distro-configs/DevLean.conf  |4 
 distro-configs/LibreOfficeLinux.conf |1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5d206f1c7fd779c13939a457a0345e9b8112296d
Author: Bjoern Michaelsen 
Date:   Mon Sep 19 19:08:19 2011 +0200

--enable-cairo is unknown to ./configure

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 4fe3325..eac3b4a 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -38,7 +38,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-nlpsolver
 --enable-epm
---enable-cairo
 --enable-binfilter
 --enable-python=internal
 --disable-xrender-link
commit fa281546f620cac1af5f20ac67281abdeeba5b5d
Author: Bjoern Michaelsen 
Date:   Mon Sep 19 19:07:31 2011 +0200

add distro DevLean buildable from core alone

diff --git a/distro-configs/DevLean.conf b/distro-configs/DevLean.conf
new file mode 100644
index 000..cf6dd4d
--- /dev/null
+++ b/distro-configs/DevLean.conf
@@ -0,0 +1,4 @@
+--disable-mozilla
+--disable-binfilter
+--without-help
+--without-myspell-dicts
commit 9dffe55d3fc24dad0b5ceb9be513999e81cdfe32
Author: Bjoern Michaelsen 
Date:   Mon Sep 19 18:56:50 2011 +0200

fix build with internal beanshell

diff --git a/configure.in b/configure.in
index f0d3018..d21f906 100755
--- a/configure.in
+++ b/configure.in
@@ -9604,6 +9604,10 @@ if [[ "$SYSTEM_LIBXSLT" != "YES" ]]
 then
 XSLTPROC="$SOLARVER/$INPATH/bin/xsltproc"
 fi
+if [[ "$SYSTEM_BSH" != "YES" ]]
+then
+BSH_JAR="$SOLARVER/$INPATH/bin/bsh.jar"
+fi
 
 AC_SUBST(BUILD_PLATFORM)
 AC_SUBST(CLASSPATH)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2011-09-19 Thread René Engelhard

 filter/source/svg/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f98bc4e19f4dbcb12c64b7c3999bce12b219581
Author: Baptiste Daroussin 
Date:   Mon Sep 19 19:22:32 2011 +0200

Do not hard code gperf

diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
index bd0e85e..20ed8f8 100644
--- a/filter/source/svg/Makefile
+++ b/filter/source/svg/Makefile
@@ -53,7 +53,7 @@ $(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf)
 $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
$(call gb_Output_announce,$@,build,GPF,1)
$(call gb_Helper_abbreviate_dirs, \
-gperf --compare-strncmp -C -m 20  
$(filter_GEN_svg_Tokens_gperf) \
+$(GPERF) --compare-strncmp -C -m 20  
$(filter_GEN_svg_Tokens_gperf) \
 | sed -e "s/(char\*)0/(char\*)0$(COMMA) 0/g" \
 > $(filter_GEN_svg_Tokens_cxx))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

2011-09-19 Thread Lubos Lunak

 vcl/source/window/msgbox.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit d808cb25b3f0c22f554ef7d60623abd0d7d84657
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Tue Sep 13 14:53:29 2011 +0200

delete does not need a NULL check

diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 3f8c568..e27cefe 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -216,12 +216,9 @@ void MessBox::ImplLoadRes( const ResId& )
 
 MessBox::~MessBox()
 {
-if ( mpFixedText )
-delete mpFixedText;
-if ( mpFixedImage )
-delete mpFixedImage;
-if ( mpCheckBox )
-delete mpCheckBox;
+delete mpFixedText;
+delete mpFixedImage;
+delete mpCheckBox;
 }
 
 // ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-09-19 Thread Caolán McNamara

 binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx|7 ---
 binfilter/bf_sw/source/core/inc/notxtfrm.hxx   |1 
 binfilter/bf_sw/source/core/layout/sw_calcmove.cxx |   31 
 binfilter/bf_sw/source/core/view/sw_viewsh.cxx |   39 -
 binfilter/bf_sw/source/core/view/sw_vnew.cxx   |5 --
 binfilter/inc/bf_sw/viewsh.hxx |8 
 6 files changed, 91 deletions(-)

New commits:
commit 08e4dea45941c961e5f1625c1d6f07bc2d9662f4
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 15:35:04 2011 +0100

callcatcher: remove freshly unused code

diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx 
b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index 1f84bf8..d90978b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -302,13 +302,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // 
TxtFly.Cxx
 /*N*/   pGrfNd->GetGrfObj().StopAnimation( pOut, long(this) );
 /*N*/ }
 
-
-/*N*/ BOOL SwNoTxtFrm::HasAnimation() const
-/*N*/ {
-/*N*/   const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
-/*N*/   return pGrfNd && pGrfNd->IsAnimated();
-/*N*/ }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx 
b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
index d749d67..044f075 100644
--- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
@@ -73,7 +73,6 @@ public:
 void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
 
 void StopAnimation( OutputDevice* = 0 ) const;
-BOOL HasAnimation()  const;
 
 // Routinen fuer den Grafik-Cache
 USHORT GetWeight() { return nWeight; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx 
b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index 644d285..e252511 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -485,37 +485,6 @@ namespace binfilter {
 |*  SwPageFrm::MakeAll()
 |*
 |*/
-
-/*N*/ void lcl_CheckObjects( SwSortDrawObjs* pSortedObjs, SwFrm* pFrm, long& 
rBot )
-/*N*/ {
-/*N*/   //Und dann kann es natuerlich noch Absatzgebundene
-/*N*/   //Rahmen geben, die unterhalb ihres Absatzes stehen.
-/*N*/   long nMax = 0;
-/*N*/   for ( USHORT i = 0; i < pSortedObjs->Count(); ++i )
-/*N*/   {
-/*N*/   SdrObject *pObj = (*pSortedObjs)[i];
-/*N*/   long nTmp = 0;
-/*N*/   if ( pObj->IsWriterFlyFrame() )
-/*N*/   {
-/*N*/   SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
-/*N*/   if( pFly->Frm().Top() != WEIT_WECH &&
-/*N*/   ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() :
-/*N*/ ( pFly->IsFlyAtCntFrm() &&
-/*N*/   ( pFrm->IsBodyFrm() ? pFly->GetAnchor()->IsInDocBody() 
:
-/*N*/ pFly->GetAnchor()->IsInFtn() ) ) 
) )
-/*N*/   {
-/*N*/   nTmp = pFly->Frm().Bottom();
-/*N*/   }
-/*N*/   }
-/*N*/   else
-/*N*/   nTmp = pObj->GetBoundRect().Bottom();
-/*N*/   nMax = Max( nTmp, nMax );
-/*N*/   }
-/*N*/   ++nMax; //Unterkante vs. Hoehe!
-/*N*/   rBot = Max( rBot, nMax );
-/*N*/ }
-
-
 /*N*/ void SwPageFrm::MakeAll()
 /*N*/ {
 /*N*/   PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx 
b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index cc539de..9e72015 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -66,45 +66,6 @@ bool bInSizeNotify = FALSE;
 
 /*N*/ TYPEINIT0(ViewShell);
 
-/**
-|*
-|*  ViewShell::InvalidateWindows()
-|*
-**/
-
-/*N*/ void ViewShell::InvalidateWindows( const SwRect &rRect )
-/*N*/ {
-/*N*/ ViewShell *pSh = this;
-/*N*/ do
-/*N*/ {
-/*N*/ if ( pSh->GetWin() )
-/*N*/ {
-/*N*/ if ( pSh->IsPreView() )
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ else if ( pSh->VisArea().IsOver( rRect ) )
-/*N*/ pSh->GetWin()->Invalidate( rRect.SVRect() );
-/*N*/ }
-/*N*/ pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/ } while ( pSh != this );
-/*N*/ }
-
-/**
-|*
-|*  ViewShell::SetFirstVisPageInvalid()
-|*
-**/
-
-/*N*/ void ViewShell::SetFirstVisPageInvalid()
-/*N*/ {
-/*N*/   ViewShell *pSh = this;
-/*N*/   do
-/*N*/   {   pSh->Imp()->SetFirstVisPageInvalid();
-/*N*/   pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/   } while ( pSh != this );
-/*N*/ }
-
 /*N

[Libreoffice-commits] .: Branch 'refs/notes/commits' - 84/faef68713b132b95e2c07e975af7d4e93c91ea

2011-09-19 Thread Michael Meeks

 84/faef68713b132b95e2c07e975af7d4e93c91ea |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0127c044929bca00c3880ca856ab755a7ac2dd2e
Author: Michael Meeks 
Date:   Mon Sep 19 16:20:23 2011 +0100

Notes added by 'git notes edit'

diff --git a/84/faef68713b132b95e2c07e975af7d4e93c91ea 
b/84/faef68713b132b95e2c07e975af7d4e93c91ea
index 2193fbe..7bd6a09 100644
--- a/84/faef68713b132b95e2c07e975af7d4e93c91ea
+++ b/84/faef68713b132b95e2c07e975af7d4e93c91ea
@@ -1 +1 @@
-split repo tag: component_LIBREOFFICE_CREATE
+split repo tag: components_LIBREOFFICE_CREATE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.mk desktop/Package_manifest.mk desktop/WinResTarget_officeloader.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget

2011-09-19 Thread Jan Holesovsky

 desktop/Executable_soffice.mk|2 +-
 desktop/Package_manifest.mk  |4 ++--
 desktop/WinResTarget_officeloader.mk |2 +-
 desktop/WinResTarget_sbase.mk|2 +-
 desktop/WinResTarget_scalc.mk|2 +-
 desktop/WinResTarget_sdraw.mk|2 +-
 desktop/WinResTarget_simpress.mk |2 +-
 desktop/WinResTarget_smath.mk|2 +-
 desktop/WinResTarget_soffice.mk  |2 +-
 desktop/WinResTarget_sweb.mk |6 +++---
 desktop/WinResTarget_swriter.mk  |2 +-
 solenv/gbuild/platform/winmingw.mk   |2 ++
 12 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 581c45ba8eae7da1d474317fec3e5af578497a1f
Author: Jan Holesovsky 
Date:   Mon Sep 19 16:53:52 2011 +0200

Make 'desktop' build again with MinGW.

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 02eba09..e82f190 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -32,6 +32,7 @@ $(eval $(call 
gb_Executable_add_precompiled_header,soffice,desktop/inc/pch/preco
 $(eval $(call gb_Executable_set_include,soffice,\
 $$(INCLUDE) \
 -I$(SRCDIR)/desktop/inc/pch \
+-I$(SRCDIR)/desktop/source/inc \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
@@ -59,7 +60,6 @@ endif
 
 $(eval $(call gb_Executable_add_noexception_objects,soffice,\
 desktop/win32/source/extendloaderenvironment \
-desktop/win32/source/soffice/soffice \
 ))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk
index 118edd8..a6a3a72 100644
--- a/desktop/Package_manifest.mk
+++ b/desktop/Package_manifest.mk
@@ -28,9 +28,9 @@ $(eval $(call 
gb_Package_Package,desktop_manifest,$(WORKDIR)/CustomTarget/deskto
 $(eval $(call 
gb_Package_add_customtarget,desktop_manifest,desktop/util,SRCDIR))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\
-bin/soffice.exe \
+$(OUTDIR)/bin/soffice.exe \
 ))
 
-$(eval $(call 
gb_Package_add_file,desktop_manifest,bin/soffice.exe.manifest,soffice.exe.manifest))
+$(eval $(call 
gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.exe.manifest,soffice.exe.manifest))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_officeloader.mk 
b/desktop/WinResTarget_officeloader.mk
index 4c08999..fc72254 100644
--- a/desktop/WinResTarget_officeloader.mk
+++ b/desktop/WinResTarget_officeloader.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,officeloader,\
 sysui/desktop/icons/ooo3_main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,officeloader,util/officeloader.rc))
+$(eval $(call gb_WinResTarget_add_file,officeloader,desktop/util/officeloader))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 5d6589b..b023e25 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,sbase,\
 sysui/desktop/icons/ooo3_base_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,sbase,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,sbase,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 7ed3cb7..4edd697 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,scalc,\
 sysui/desktop/icons/ooo3_calc_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,scalc,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,scalc,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 696a660..1398a1a 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,sdraw,\
 sysui/desktop/icons/ooo3_draw_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,sdraw,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,sdraw,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 5c2ab48..1325f77 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,simpress,\
 sysui/desktop/icons/ooo3_impress_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,simpress,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,simpress,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index 228f53e..95f7516 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@

[Libreoffice-commits] .: set_soenv.in

2011-09-19 Thread François Tigeot

 set_soenv.in |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f2f9e520ba51e6d586f4f9ad774d090b212da192
Author: Baptiste Daroussin 
Date:   Mon Sep 19 13:57:23 2011 +0200

Fix soenv for FreeBSD

diff --git a/set_soenv.in b/set_soenv.in
index 5ffd45f..947a0c8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -316,13 +316,13 @@ elsif ( $platform =~ m/freebsd/ )
   $OS = "FREEBSD";
   $PATH_SEPERATOR = $ps;
   $OSVERSION  = '@OSVERSION@';
+  $OUTPATH= 'unxfbsd';
+  $oldoutfile = 'FreeBSDEnv.Set.sh';
if ($platform =~ m/^(amd64|x86_64)/)
{  my ( $JAVA_OS );
   print "Setting FreeBSD AMD64 specific values... ";
-  $oldoutfile = "FreeBSDAMDEnv.Set.sh";
   $CPU= "X";
   $CPUNAME= "X86_64";
-  $OUTPATH= "unxfbsdx";
   $JAVA_OS= '@JAVA_HOME@';
   $JAVA_OS=~ s/.*\///;
   if ($JAVA_OS =~ m/^linux/)
@@ -338,7 +338,6 @@ elsif ( $platform =~ m/freebsd/ )
}
elsif ($platform =~ m/^i386/)
{  print "Setting FreeBSD x86 specific values... ";
-  $oldoutfile = "FreeBSDX86Env.Set.sh";
   $CPU= "I";
   $CPUNAME= "INTEL";
   $OUTPATH= "unxfbsdi";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/qa

2011-09-19 Thread François Tigeot

 sal/qa/osl/module/osl_Module.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a79afa38b27dcd9c861b415db4fba491f4f3417d
Author: Baptiste Daroussin 
Date:   Mon Sep 19 13:55:04 2011 +0200

FreeBSD has the same cppunit failure as OSX does

diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index a7339b3..5e0c47f 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -294,7 +294,7 @@ namespace osl_Module
 // load lib which is under a CJK directory
 void load_002( )
 {
-#if defined( UNX ) && !defined( MACOSX )
+#if defined( UNX ) && !defined( MACOSX ) && !defined( FREEBSD )
 // TODO: Find out why this fails on Mac OS X
 //Can not get a CJK directory already exist, so here create one. 
Perhaps reason is encoding problem.
 ::rtl::OUString aPidDirURL = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/")) + 
::rtl::OUString::valueOf( ( long )getpid( ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-09-19 Thread François Tigeot

 solenv/inc/unxfbsd.mk  |  174 ++---
 solenv/inc/unxfbsdi.mk |   43 
 solenv/inc/unxfbsdx.mk |   47 -
 3 files changed, 8 insertions(+), 256 deletions(-)

New commits:
commit ea5abc67d25bcbf0f746ae000e00289678cc02fc
Author: Baptiste Daroussin 
Date:   Mon Sep 19 13:47:21 2011 +0200

unify the unxfbsd.mk into a single file and simplify it

diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index f751384..0400059 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -27,178 +27,20 @@
 
 # Makefile for FreeBSD.
 
-ASM=
-AFLAGS=
-
-SOLAR_JAVA*=
-JAVAFLAGSDEBUG=-g
-
-# Include arch specific makefile.
+# arch specific defines
 .IF "$(CPUNAME)" == "INTEL"
-.INCLUDE : unxfbsdi.mk
-.ENDIF
-.IF "$(CPUNAME)" == "X86_64"
-.INCLUDE : unxfbsdx.mk
+CDEFS+=-DX86
 .ENDIF
 
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR 
-D_USE_NAMESPACE=1
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+CDEFS+=-DX86_64
+BUILD64=1
 .ENDIF
 
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF  # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols
-CFLAGSENABLESYMBOLS=-g
+.INCLUDE : unxgcc.mk
 
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
 # Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in multi threaded environment 
with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment 
with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment 
with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment 
with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
--Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk): Currently this is not tested on FreeBSD
-#MODULES_WITH_WARNINGS :=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
+CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
 
 # default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-ST

[Libreoffice-commits] .: solenv/gbuild

2011-09-19 Thread Caolán McNamara

 solenv/gbuild/platform/windows.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1bf1fed1f41704bc105b0310d2da6ac31d7180d4
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 13:41:00 2011 +0100

add comdlg32

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 0e44d5c..5c1b358 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -424,6 +424,7 @@ gb_Library_win32_OLDNAMES := oldnames
 
 gb_Library_PLAINLIBS_NONE += \
advapi32 \
+   comdlg32 \
crypt32 \
d3d9 \
d3dx \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - ucb/source

2011-09-19 Thread Michael Meeks

 ucb/source/ucp/odma/odma_lib.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 299ada910665c38cc9ccd7a20fb54f8b15229f8c
Author: Tor Lillqvist 
Date:   Mon Sep 19 12:29:40 2011 +0100

Improve windows odma library location

Signed-off-by: Michael Meeks 

diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index 074c585..f998358 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -80,16 +80,25 @@ namespace odma
 if (bBeenHere)
 return bLoaded;
 
+bBeenHere = sal_True;
+
 ::rtl::OUString sPath;
 #ifdef WNT
-sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA32.DLL"));
+OSL_ASSERT( sizeof( wchar_t ) == sizeof( sal_Unicode ) );
+
+wchar_t system32[MAX_PATH];
+UINT n = GetSystemDirectoryW( system32, MAX_PATH );
+
+if (n == 0)
+return sal_False;
+
+sPath = ::rtl::OUString( reinterpret_cast< const sal_Unicode* >( 
system32 ), n ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\ODMA32.DLL"));
+
 #endif
 #ifdef UNX
 sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodma.so"));
 #endif
 
-bBeenHere = sal_True;
-
 pODMA = osl_loadModule( sPath.pData,SAL_LOADMODULE_NOW );
 if( !pODMA)
 return sal_False;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_quickstart.mk

2011-09-19 Thread Caolán McNamara

 desktop/Executable_quickstart.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 877d87d979e0556bd57de7569ab7b23b4b37adea
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 12:15:50 2011 +0100

get quickstart to link on windows

diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index aa5e608..aa6abd3 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -25,6 +25,8 @@
 
 $(eval $(call gb_Executable_Executable,quickstart))
 
+$(eval $(call gb_Executable_set_targettype_gui,quickstart,YES))
+
 $(eval $(call 
gb_Executable_add_precompiled_header,quickstart,desktop/inc/pch/precompiled_desktop.hxx))
 
 $(eval $(call gb_Executable_set_include,quickstart,\
@@ -32,18 +34,19 @@ $(eval $(call gb_Executable_set_include,quickstart,\
 -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_libs,quickstart,\
+$(eval $(call gb_Executable_add_linked_libs,quickstart,\
 comdlg32 \
 gdi32 \
 kernel32 \
 ole32 \
-oleauth32 \
+oleaut32 \
 shell32 \
+user32 \
 ))
 
 ifeq ($(COM),GCC)
 
-$(eval $(call gb_Executable_add_libs,quickstart,\
+$(eval $(call gb_Executable_add_linked_libs,quickstart,\
 uuid \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.mk

2011-09-19 Thread Jan Holesovsky

 desktop/Executable_soffice.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c2ecd9137d5c2e4d82f32cce582fad393eda9cf5
Author: Jan Holesovsky 
Date:   Mon Sep 19 13:17:01 2011 +0200

Fix endless loop during building soffice.exe deps on Windows.

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index af53510..02eba09 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -40,8 +40,8 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
 ))
 
 $(eval $(call gb_Executable_add_cobjects,soffice,\
-desktop/source/app/copyright_ascii_ooo.c \
-desktop/source/app/main.c \
+desktop/source/app/copyright_ascii_ooo \
+desktop/source/app/main \
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_loader2.mk solenv/gbuild

2011-09-19 Thread Caolán McNamara

 desktop/Executable_loader2.mk |7 ---
 solenv/gbuild/platform/windows.mk |4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 7dae2882a82711857ae059173c35f01c7302fe2c
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 11:59:42 2011 +0100

progress to link stage of loader2

diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index 6e34dc6..f399d38 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -38,16 +38,17 @@ $(eval $(call gb_Executable_add_defs,loader2,\
 ))
 endif
 
-$(eval $(call gb_Executable_add_libs,loader2,\
+$(eval $(call gb_Executable_add_linked_libs,loader2,\
 advapi32 \
 gdi32 \
 msi \
 shell32 \
+user32 \
 ))
 
 ifneq ($(COM),GCC)
-$(eval $(call gb_Executable_add_libs,loader2,\
-libcmt.lib \
+$(eval $(call gb_Executable_add_linked_libs,loader2,\
+libcmt \
 ))
 endif
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 203ed81..0e44d5c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -433,10 +433,12 @@ gb_Library_PLAINLIBS_NONE += \
gnu_getopt \
imm32\
kernel32 \
+   libcmt \
+   mpr \
+   msi \
msimg32 \
msvcrt \
msvcprt \
-   mpr \
$(gb_Library_win32_OLDNAMES) \
ole32 \
oleaut32 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source

2011-09-19 Thread Michael Meeks

 sd/source/ui/view/sdview4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20140491c901db50783e4f515fae38af7215af7f
Author: Ivan Timofeev 
Date:   Mon Sep 19 11:52:28 2011 +0100

fdo#38391: don't crash while dropping texture

Signed-off-by: Michael Meeks 

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index f63c3d1..834ff6d 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -117,7 +117,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, 
sal_Int8& rAction,
 if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
 {
 const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
-if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
+if( bIsGraphic || (pObj && pObj->IsEmptyPresObj() && !bOnMaster) )
 {
 if( IsUndoEnabled() )
 BegUndo(String(SdResId(STR_INSERTGRAPHIC)));   
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_guistdio.mk

2011-09-19 Thread Caolán McNamara

 desktop/Executable_guistdio.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c17f1196394a7fd56fe0d807146c110c5ae741a
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 11:23:03 2011 +0100

despite its name, it appears not to be a gui app

diff --git a/desktop/Executable_guistdio.mk b/desktop/Executable_guistdio.mk
index 796de55..6da11cf 100644
--- a/desktop/Executable_guistdio.mk
+++ b/desktop/Executable_guistdio.mk
@@ -25,7 +25,7 @@
 
 $(eval $(call gb_Executable_Executable,guistdio))
 
-$(eval $(call gb_Executable_set_targettype_gui,guistdio,YES))
+$(eval $(call gb_Executable_set_targettype_gui,guistdio,NO))
 
 $(eval $(call 
gb_Executable_add_precompiled_header,guistdio,desktop/inc/pch/precompiled_desktop.hxx))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_guiloader.mk desktop/Executable_guistdio.mk desktop/Executable_officeloader.mk desktop/Library_deploymentgui.mk desktop/Library_deployment.mk

2011-09-19 Thread Caolán McNamara

 desktop/Executable_guiloader.mk|9 +
 desktop/Executable_guistdio.mk |9 +
 desktop/Executable_officeloader.mk |1 +
 desktop/Library_deployment.mk  |1 +
 desktop/Library_deploymentgui.mk   |9 +
 5 files changed, 29 insertions(+)

New commits:
commit 04adca77b45cb8d8a3cafaa704d2296c29cfdb60
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 10:42:01 2011 +0100

inch closer to building under windows

diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk
index a645b68..d04ee32 100644
--- a/desktop/Executable_guiloader.mk
+++ b/desktop/Executable_guiloader.mk
@@ -38,6 +38,15 @@ $(eval $(call 
gb_Executable_add_linked_static_libs,guiloader,\
 ooopathutils \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_add_linked_libs,guiloader,\
+user32 \
+))
+
+endif
+
+
 $(eval $(call gb_Executable_add_noexception_objects,guiloader,\
 desktop/win32/source/extendloaderenvironment \
 desktop/win32/source/guiloader/genericloader \
diff --git a/desktop/Executable_guistdio.mk b/desktop/Executable_guistdio.mk
index e38efa2..796de55 100644
--- a/desktop/Executable_guistdio.mk
+++ b/desktop/Executable_guistdio.mk
@@ -38,6 +38,15 @@ $(eval $(call gb_Executable_add_defs,guistdio,\
 $(LFS_CFLAGS) \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_add_linked_libs,guistdio,\
+user32 \
+))
+
+endif
+
+
 $(eval $(call gb_Executable_add_exception_objects,guistdio,\
 desktop/win32/source/guistdio/guistdio \
 ))
diff --git a/desktop/Executable_officeloader.mk 
b/desktop/Executable_officeloader.mk
index d10d44f..fa2a7bb 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Executable_add_linked_libs,officeloader,\
 advapi32 \
 shell32 \
 shlwapi \
+user32 \
 ))
 endif
 
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index dd1c3f3..60cc182 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\
 ucbhelper \
 utl \
 xcr \
+$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,deployment,\
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 15de597..0b3c541 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -59,6 +59,15 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\
 vcl \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
+ole32 \
+))
+
+endif
+
+
 $(eval $(call 
gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
 
 $(eval $(call gb_Library_add_exception_objects,deploymentgui,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/source

2011-09-19 Thread Caolán McNamara

 tools/source/fsys/wntmsc.hxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2ed25e1f8c21233cc8f5ee41d449408a7a2f555c
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 10:39:07 2011 +0100

ByteString->rtl::OStringBuffer

diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index 43b700f..ee09a1e 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -42,6 +42,7 @@
 #include 
 
 #include 
+#include 
 
 //
 
@@ -75,9 +76,10 @@ typedef struct
 
 inline sal_Bool DRIVE_EXISTS(char c)
 {
-ByteString aDriveRoot( c );
-aDriveRoot += ":\\";
-return GetDriveType( aDriveRoot.GetBuffer() ) > 1;
+rtl::OStringBuffer aDriveRoot;
+aDriveRoot.append(c);
+aDriveRoot.append(":\\");
+return GetDriveType( aDriveRoot.getStr() ) > 1;
 }
 
 const char* TempDirImpl( char *pBuf );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/scripting_gbuild'

2011-09-19 Thread Matus Kukan

New branch 'feature/scripting_gbuild' available with the following commits:
commit 5304c3ad54af4395db14f3dc18d7ee0d11741639
Author: MatÃºÅ¡ Kukan 
Date:   Mon Sep 19 11:01:15 2011 +0200

convert scripting to gbuild - first step

There are java and extensions missing.

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw

2011-09-19 Thread Caolán McNamara

 binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx  |   10 ++--
 binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx |3 -
 binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx   |   11 +
 binfilter/bf_svx/source/unoedit/svx_unotext.cxx   |4 -
 binfilter/bf_sw/source/core/sw3io/crypter.hxx |6 +-
 binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx  |   22 +-
 binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx   |8 +--
 binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx |6 ++
 8 files changed, 37 insertions(+), 33 deletions(-)

New commits:
commit 23f135dfd2d6631322286697f052c38af319f815
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 19 09:58:42 2011 +0100

port over the non-binfilter fix here

diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx 
b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index a247f6f..6571ed7 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -980,7 +980,8 @@ void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, 
PointType Pos, USHORT
 {
 
SetTextContext(rOut,T,UpcasePossible(c),DrehWink,FitXMul,FitXDiv,FitYMul,FitYDiv);
 if ((T.Schnitt & TextKaptBit)!=0 && UpcasePossible(c)) c=Upcase(c);
-String s( (char)c, RTL_TEXTENCODING_IBM_437 );
+rtl::OUString s(reinterpret_cast(&c), 1,
+RTL_TEXTENCODING_IBM_437);
 rOut.DrawText( Point( Pos.x, Pos.y ), s );
 }
 
commit 71369004e4ebe19532c33b98a694d023d5fa4ef4
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 18 23:25:51 2011 +0100

mirror non-binfilter change in

diff --git a/binfilter/bf_svx/source/unoedit/svx_unotext.cxx 
b/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
index 461856c..6b5048a 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
@@ -1624,7 +1624,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( 
const uno::Reference< text
 {
 case text::ControlCharacter::PARAGRAPH_BREAK:
 {
-const String aText( (char)13, 1 );  // '\r' geht auf'm Mac nicht
+const String aText( (sal_Unicode)13 );  // '\r' geht auf'm Mac 
nicht
 insertString( xRange, aText, bAbsorb );
 
 return;
@@ -1675,7 +1675,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( 
const uno::Reference< text
 aRange.nEndPos  = aRange.nStartPos;
 
 pRange->SetSelection( aRange );
-const String aText( (char)13, 1 );  // '\r' geht auf'm Mac 
nicht
+const String aText( (sal_Unicode)13 );  // '\r' geht auf'm Mac 
nicht
 pRange->setString( aText );
 
 aRange.nStartPos = 0;
commit bbd3255c11414295f61461d85f4c154dd985d240
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 18 13:40:27 2011 +0100

ditch ByteString::*Buffer*

diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx 
b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 7875b2f..2e767c9 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -32,7 +32,7 @@
 #include 
 #include 
 #include 
-#include "rtl/tencinfo.h"
+#include 
 
 #include "fcontnr.hxx"
 #include "openflag.hxx"
@@ -185,11 +185,13 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
 /*N*/ }
 /*N*/ else
 /*N*/ {
-/*N*/ ByteString aTemp;
 /*N*/ if ( nLen>1 )
 /*N*/ {
-/*N*/ rStream.Read( aTemp.AllocBuffer( (xub_StrLen)( nLen - 1 
) ), nLen );
-/*N*/ aString = String( aTemp, nEncoding );
+/*N*/ rtl::OString aTemp = read_uInt8s_AsOString(rStream, 
nLen-1);
+/*N*/ sal_uInt8 nTerminator = 0;
+/*N*/ rStream >> nTerminator;
+/*N*/ DBG_ASSERT( nTerminator == 0, "expected string to be 
NULL terminated" );
+/*N*/ aString = rtl::OStringToOUString(aTemp, nEncoding);
 /*N*/ }
 /*N*/ else
 /*N*/ aString = String();
diff --git a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx 
b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
index 46a07eb..dc53d76 100644
--- a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
@@ -262,15 +262,12 @@ BOOL GIFReader::ReadExtension()
 // Appl.-Extension hat Laenge 11
 if ( cSize == 0x0b )
 {
-ByteString  aAppId;
-ByteString  aAppCode;
-
-rIStm.Read( aAppId.AllocBuffer( 8 ), 8 );
-rIStm.Read( aAppCode.AllocBuffer( 3 ), 3 );
+rtl::OString aAppId = read_uInt8s_AsOString(rIStm, 8);
+

[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_sw binfilter/inc

2011-09-19 Thread Stephan Bergmann

 binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx |2 +-
 binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx   |3 +--
 binfilter/bf_sw/source/core/fields/sw_dbfld.cxx  |7 ---
 binfilter/inc/bf_sw/doc.hxx  |5 +
 4 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 49737cfe9cb2b04aad2d041ba31241f2f117f910
Author: Stephan Bergmann 
Date:   Mon Sep 19 10:15:02 2011 +0200

Some more warning cleanup.

diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx 
b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index a20c8c7..0ca24d8 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1280,7 +1280,7 @@ struct ImplRenderPaintProc
 {}
 };
 
-void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& 
/*rSelection*/,
+void SAL_CALL SdXImpressDocument::render( sal_Int32, const uno::Any& 
/*rSelection*/,
   const uno::Sequence< 
beans::PropertyValue >& rxOptions )
 throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx 
b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index e4eb8ac..bd20077 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -1088,8 +1088,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 // es noch nicht, dann erzeuge es
 
 /*N*/ typedef SwFmt* (SwDoc::*FnMakeFmt)( const String &, SwFmt * );
-/*M*/ SwFmt* SwDoc::GetFmtFromPool( USHORT nId, String* pDesc,
-/*M*/   SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit 
ePresMetric )
+/*M*/ SwFmt* SwDoc::GetFmtFromPool( USHORT nId, String* pDesc )
 /*M*/ {
 /*M*/   SwFmt *pNewFmt, *pDeriveFmt;
 /*M*/
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx 
b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index 70c2c7b..df1af4e 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -653,11 +653,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
 SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
 const SwDBData& aTmpData = GetDBData();
 
-if( bCondValid
+bCondValid
 && pMgr
 && pMgr->IsInMerge()
-&& pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, 
sal_True)
-);  // IsDataSourceOpen() may have a side effect
+&& pMgr->IsDataSourceOpen(
+aTmpData.sDataSource, aTmpData.sCommand, sal_True);
+// IsDataSourceOpen() may have a side effect
 }
 
 /*
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 2f7647d..31fa778 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -954,10 +954,7 @@ public:
 SfxMapUnit ePresMetric = SFX_MAPUNIT_TWIP,
 BOOL bRegardLanguage = TRUE );
 // return das geforderte automatische  Format - Basis-Klasse !
-SwFmt* GetFmtFromPool( sal_uInt16 nId, String* pDescription = 0,
-SfxItemPresentation ePres = SFX_ITEM_PRESENTATION_COMPLETE,
-SfxMapUnit eCoreMetric = SFX_MAPUNIT_TWIP,
-SfxMapUnit ePresMetric = SFX_MAPUNIT_TWIP );
+SwFmt* GetFmtFromPool( sal_uInt16 nId, String* pDescription = 0 );
 // returne das geforderte automatische Format
 SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId, String* pDescription = 0 )
 { return (SwFrmFmt*)GetFmtFromPool( nId, pDescription ); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - Makefile.in RepositoryModule_ooo.mk unixODBC/Makefile unixODBC/Module_unixODBC.mk unixODBC/Package_inc.mk unixODBC/prj

2011-09-19 Thread Peter Foley

 Makefile.in |   10 ++
 RepositoryModule_ooo.mk |1 +
 unixODBC/Makefile   |   38 ++
 unixODBC/Module_unixODBC.mk |   34 ++
 unixODBC/Package_inc.mk |   35 +++
 unixODBC/prj/build.lst  |3 +--
 unixODBC/prj/d.lst  |3 ---
 unixODBC/prj/makefile.mk|   40 
 8 files changed, 155 insertions(+), 9 deletions(-)

New commits:
commit 144d22dd8f10cb58e503cca16efdfa009e58d402
Author: Peter Foley 
Date:   Sun Sep 18 20:11:02 2011 -0400

convert unixODBC to gbuild

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 58e31c5..e0935ea 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 tools \
 ucbhelper \
 udkapi \
+unixODBC \
 unotools \
 unoxml \
 vbahelper \
diff --git a/unixODBC/Makefile b/unixODBC/Makefile
new file mode 100644
index 000..5bedaf0
--- /dev/null
+++ b/unixODBC/Makefile
@@ -0,0 +1,38 @@
+#*
+#
+# 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.
+#
+#*
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unixODBC/Module_unixODBC.mk b/unixODBC/Module_unixODBC.mk
new file mode 100644
index 000..084094c
--- /dev/null
+++ b/unixODBC/Module_unixODBC.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+#  Peter Foley 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Module_Module,unixODBC))
+
+$(eval $(call gb_Module_add_targets,unixODBC,\
+   Package_inc \
+))
diff --git a/unixODBC/Package_inc.mk b/unixODBC/Package_inc.mk
new file mode 100644
index 000..1d6e956
--- /dev/null
+++ b/unixODBC/Package_inc.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+#  Peter Foley 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Ma

[Libreoffice-commits] .: 2 commits - bean/com bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk bean/Library_officebean.mk bean/Makefile bean/Module_bean.mk bean/native bean/prj bean/qa bean/util

2011-09-19 Thread Peter Foley

 Module_tail_build.mk |2 
 Repository.mk|2 
 RepositoryModule_ooo.mk  |2 
 bean/Jar_officebean.mk   |   69 +++
 bean/JunitTest_bean_complex.mk   |   48 +++
 bean/Library_officebean.mk   |   52 
 bean/Makefile|   38 
 bean/Module_bean.mk  |   46 ++
 bean/com/sun/star/beans/makefile.mk  |   64 --
 bean/com/sun/star/comp/beans/makefile.mk |   75 -
 bean/native/unix/makefile.mk |   40 -
 bean/native/win32/makefile.mk|   38 
 bean/prj/build.lst   |   10 --
 bean/prj/d.lst   |5 -
 bean/prj/makefile.mk |   40 +
 bean/qa/complex/bean/makefile.mk |  134 ---
 bean/util/makefile.mk|   56 
 eventattacher/Library_evtatt.mk  |   46 ++
 eventattacher/Makefile   |   38 
 eventattacher/Module_eventattacher.mk|   34 +++
 eventattacher/prj/build.lst  |6 -
 eventattacher/prj/d.lst  |4 
 eventattacher/prj/makefile.mk|   40 +
 eventattacher/source/makefile.mk |   71 
 postprocess/packcomponents/makefile.mk   |2 
 postprocess/prj/build.lst|2 
 scp2/source/ooo/file_library_ooo.scp |   22 -
 tail_build/prj/build.lst |2 
 28 files changed, 465 insertions(+), 523 deletions(-)

New commits:
commit 4aba8d5cec9544080c79802bb6c120a2a1dd1fe8
Author: Peter Foley 
Date:   Sun Sep 18 16:36:58 2011 -0400

convert eventattacher to gbuild and add to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 9e35fc8..c08919b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 cui \
 dbaccess \
 desktop \
+eventattacher \
 fileaccess \
 forms \
 formula \
diff --git a/Repository.mk b/Repository.mk
index afdd5ca..950a239 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
canvastools \
communi \
date \
+   evtatt \
forui \
odbc \
odbcbase \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 8e1b817..58e31c5 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 drawinglayer \
 dtrans \
 editeng \
+eventattacher \
 fileaccess \
 forms \
 formula \
diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk
new file mode 100644
index 000..7c3f9ef
--- /dev/null
+++ b/eventattacher/Library_evtatt.mk
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+#  Peter Foley 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Library_Library,evtatt))
+
+$(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt))
+
+$(eval $(call gb_Library_add_linked_libs,evtatt,\
+   cppuhelper \
+   cppu \
+   sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,evtatt,\
+   eventattacher/source/eventattacher \
+))
+
+$(eval $(call gb_Library_add_api,evtatt,\
+   udkapi \
+))
diff --git a/eventattacher/Makefile b/eventattacher/Makefile
new file mode 100644
index 000..5bedaf0
--- /dev/null
+++ b/eventattacher/Makefile
@@ -0,0 +1,38 @@
+#*
+#
+# 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

[Libreoffice-commits] .: dmake/startup

2011-09-19 Thread Peter Foley

 dmake/startup/unix/Makefile.am |2 +-
 dmake/startup/unix/Makefile.in |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 61d6a6b0efa09cd19da46bfc328d8b658c2ba845
Author: Peter Foley 
Date:   Sun Sep 18 18:37:09 2011 -0400

cleanup startup/unix/os2/Makefile on distclean

diff --git a/dmake/startup/unix/Makefile.am b/dmake/startup/unix/Makefile.am
index d7861ff..8c1526a 100755
--- a/dmake/startup/unix/Makefile.am
+++ b/dmake/startup/unix/Makefile.am
@@ -3,6 +3,6 @@ startupdir = $(datadir)/startup/unix
 
 startup_DATA = macros.mk recipes.mk
 
-DIST_SUBDIRS = cygwin linux macosx solaris sysvr4
+DIST_SUBDIRS = cygwin linux macosx solaris sysvr4 os2
 SUBDIRS = @OS_VERSION@
 
diff --git a/dmake/startup/unix/Makefile.in b/dmake/startup/unix/Makefile.in
index 7abbdf7..28dbdbe 100644
--- a/dmake/startup/unix/Makefile.in
+++ b/dmake/startup/unix/Makefile.in
@@ -164,7 +164,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 startupdir = $(datadir)/startup/unix
 startup_DATA = macros.mk recipes.mk
-DIST_SUBDIRS = cygwin linux macosx solaris sysvr4
+DIST_SUBDIRS = cygwin linux macosx solaris sysvr4 os2
 SUBDIRS = @OS_VERSION@
 all: all-recursive
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - RepositoryModule_ooo.mk sane/Makefile sane/Module_sane.mk sane/Package_inc.mk sane/prj twain/Makefile twain/Module_twain.mk twain/Package_inc.mk twain/prj twain/ut

2011-09-19 Thread Peter Foley

 RepositoryModule_ooo.mk |2 ++
 sane/Makefile   |   38 ++
 sane/Module_sane.mk |   34 ++
 sane/Package_inc.mk |   32 
 sane/prj/build.lst  |3 +--
 sane/prj/d.lst  |3 ---
 sane/prj/makefile.mk|   40 
 twain/Makefile  |   38 ++
 twain/Module_twain.mk   |   36 
 twain/Package_inc.mk|   32 
 twain/prj/build.lst |3 +--
 twain/prj/d.lst |3 ---
 twain/prj/makefile.mk   |   40 
 twain/util/makefile.mk  |   39 ---
 14 files changed, 294 insertions(+), 49 deletions(-)

New commits:
commit 165b95bc248a7b39d57d99622689cdaad790eff5
Author: Peter Foley 
Date:   Sun Sep 18 11:26:26 2011 -0400

convert twain to gbuild

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c28040c..6cd1505 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 svtools \
 svx \
 sw \
+twain \
 toolkit \
 tools \
 ucbhelper \
diff --git a/twain/Makefile b/twain/Makefile
new file mode 100644
index 000..5bedaf0
--- /dev/null
+++ b/twain/Makefile
@@ -0,0 +1,38 @@
+#*
+#
+# 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.
+#
+#*
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/twain/Module_twain.mk b/twain/Module_twain.mk
new file mode 100644
index 000..f66b41b
--- /dev/null
+++ b/twain/Module_twain.mk
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+#  Peter Foley 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Module_Module,twain))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,twain,\
+   Package_inc \
+))
+endif
diff --git a/twain/Package_inc.mk b/twain/Package_inc.mk
new file mode 100644
index 000..d2c14ed
--- /dev/null
+++ b/twain/Package_inc.mk
@@ -0,0 +1,32 @@
+#
+# 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 ex

[Libreoffice-commits] .: bin/lo-pack-sources configure.in .gitignore

2011-09-19 Thread Peter Foley

 .gitignore  |1 -
 bin/lo-pack-sources |1 -
 configure.in|1 -
 3 files changed, 3 deletions(-)

New commits:
commit 8f07feaa6e5fc7a1e5e779b44b16d9a22029c840
Author: Peter Foley 
Date:   Sun Sep 18 11:30:33 2011 -0400

Remove config.parms

The functionality provided by config.parms (saving the arguments given to
configure) has been superseded by autogen.lastrun.

diff --git a/.gitignore b/.gitignore
index b7877e3..3a4e8a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,6 @@
 /ChangeLog
 /config.guess
 /config.log
-/config.parms
 /config.status
 /configure
 /desktop/scripts/soffice.sh
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index f2c0818..cb4372f 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -141,7 +141,6 @@ sub generate_lo_piece_blacklist($)
 print BLACKLIST "autogen.lastrun\n";
 print BLACKLIST "clone/*\n";
 print BLACKLIST "config.log\n";
-print BLACKLIST "config.parms\n";
 print BLACKLIST "git-hooks\n";
 print BLACKLIST "Env.Host.sh\n";
 print BLACKLIST "src/tmp*\n";
diff --git a/configure.in b/configure.in
index 7db548b..fb9b028 100755
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,6 @@ dnl in order to create a configure script.
 
 AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/])
 AC_PREREQ(2.50)
-echo "$@" >config.parms
 
 dnl ===
 dnl Optional Features (--enable/disable-)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_oosplash.mk

2011-09-19 Thread Peter Foley

 desktop/Executable_oosplash.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 38fd95ced1c68a4f4d8dbcee86bb808f8e918171
Author: Peter Foley 
Date:   Sun Sep 18 11:27:45 2011 -0400

fix link failure on linux if not using libXinerama

diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 3cf7bae..63623cf 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -53,12 +53,17 @@ $(eval $(call gb_Executable_add_defs,oosplash,\
 ))
 
 $(eval $(call gb_Executable_add_libs,oosplash,\
--lX11 \
 -lXinerama \
 ))
 
 endif
 
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Executable_add_libs,oosplash,\
+-lX11 \
+))
+endif
+
 ifeq ($(ENABLE_QUICKSTART_LIBPNG),TRUE)
 
 $(eval $(call gb_Executable_add_defs,oosplash,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-09-19 Thread Peter Foley

 configure.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a9486e8f381112cb4f74eb4c55aad11fdf8cfaf
Author: Peter Foley 
Date:   Sat Sep 17 21:43:53 2011 -0400

fix cross-compilation failure after gbuildization of desktop

diff --git a/configure.in b/configure.in
index 43c34a5..edc956a 100755
--- a/configure.in
+++ b/configure.in
@@ -2101,6 +2101,7 @@ if test "$cross_compiling" = "yes"; then
 solenv/inc/minor.mk \
 solenv/inc/postset.mk \
 solenv/inc/productversion.mk \
+   desktop/scripts/soffice.sh.in \
 | (cd CONF-FOR-BUILD && tar xf -)
 (
 unset COM GUI GUIBASE OS CPU CPUNAME
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-09-19 Thread Peter Foley

 solenv/gbuild/Jar.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e928fd948005664dbb32bc945808273e56b2ee6
Author: Peter Foley 
Date:   Sat Sep 17 18:54:32 2011 -0400

don't try to cat a non existent Jar manifest

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 652331a..b30bd3a 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -50,7 +50,7 @@ define gb_Jar__command
echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && 
\
echo "Class-Path: $(JARCLASSPATH)" >> $(call 
gb_Jar_get_manifest_target,$(1)) && \
echo "Solar-Version: $(RSCREVISION)" >> $(call 
gb_Jar_get_manifest_target,$(1)) && \
-   cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) && \
+   cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call 
gb_Jar_get_manifest_target,$(1)) && \
mkdir -p $(dir $(2)) && \
cd $(call gb_JavaClassSet_get_classdir,$(call 
gb_Jar_get_classsetname,$(1))) && \
$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - set_soenv.in

2011-09-19 Thread Tor Lillqvist

 set_soenv.in |  142 ++-
 1 file changed, 36 insertions(+), 106 deletions(-)

New commits:
commit 02c29d0bb25044b73dd073555ae2d908eb12e7c6
Author: Tor Lillqvist 
Date:   Mon Sep 19 10:54:04 2011 +0300

Drop unused WinFormat function

diff --git a/set_soenv.in b/set_soenv.in
index 64f25d3..5ffd45f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2329,69 +2329,6 @@ sub CygFormat
return $variable;
 }
 #--
-# Function name: WinFormat
-# Description:   Format variables to Windows Format.
-# Arguments: 1. Variable (string)
-# Return value:  Reformatted String
-#--
-sub WinFormat
-{  my ( $variable, $d1 );
-   $variable = $_[ 0 ];
-   $variable =~ s/^\s+//g ; #remove leading spaces
-   $variable =~ s/\s+$//g ; #remove trailing spaces
-   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;   # expand the variables
-   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;   # expand the variables twice!
-   $variable =~ s/:+/:/g ; # remove multiple ;
-
-   # Some variables are already in DOS path format, return early.
-   if ( $variable =~ /\\/ ) {
-   return $variable;
-   }
-   if ( $variable eq ";" ) {
-   # Ignore single ';'
-   return $variable;
-   }
-   if ( $variable =~ /;/ and $variable =~ /\// ) {
-   # Mixed mode path-style entry, separated with ;, like CLASSPATH
-   return $variable;
-   }
-
-   # Search for posix path entry and replace with cygpath -w entry
-   # ( -d if filename contains space )
-
-   # Normal paths
-
-   # One special case is if "perl " is prepended.
-   $variable =~ /^(perl\s+)?(.*)$/;
-   my $perlpre = $1;
-   if ( !defined($perlpre) ) {
-   $perlpre = "";
-   }
-   $variable = $2;
-
-   if ( $variable =~ /^\/[\w\.~ ]+/ ) {
-   if ( $variable =~ / / ) {
-   # Use DOS 8.3 style to avoid quoting
-   chomp( $variable = qx{cygpath -d "$variable"} );
-   } else {
-   # Use "normal" filenames
-   chomp( $variable = qx{cygpath -w "$variable"} );
-   }
-   } else {
-   # relative or absolute DOS paths here
-   $variable =~ s#/#\\#g;
-   }
-
-   $variable = $perlpre.$variable;
-   if ( ($perlpre ne "") && ($^O eq "cygwin")) {
-   # Cygwin's perl needs quoted backslashes
-   $variable =~ s#\\##g;
-   }
-
-   return $variable;
-}
-
-#--
 # Function name: WinPath
 # Description:   Reformat a $sep seperated path using DOS paths.
 # Arguments: 1. Variable (string)
commit d6c245d87c14e8b08208e6afa12b27e8c74d381d
Author: Tor Lillqvist 
Date:   Mon Sep 19 10:48:29 2011 +0300

Drop ActiveState Perl support

Why make life harder on purpose? On Cygwin, we support the Cygwin
Perl, period.

diff --git a/set_soenv.in b/set_soenv.in
index 375940e..64f25d3 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1143,33 +1143,29 @@ elsif ($platform =~ m/cygwin/)
}
 
# Add the rest of the original path if it is still missing.
-   if (($^O eq "cygwin")) { # Not for ActiveState perl
-   my $expandedPATH = $PATH;
-   $expandedPATH =~ s/(\$\w+)/$1/eeg;
-
-   # fix situations where PATH may look like /bin:"C:\blah\bleh":/ugh
-   my $fixedPATH = $oldPATH;
-   if ( $oldPATH =~ /"/ ) {
-  $fixedPATH = "";
-  foreach my $pathentry ( split( '"',$oldPATH ) ) {
-  if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) {
-  $fixedPATH .= $pathentry;
-  } else {
-  chomp( $pathentry = qx{cygpath -d "$pathentry"} ) ;
-  chomp( $pathentry = qx{cygpath -u "$pathentry"} ) ;
-  $fixedPATH .= $pathentry;
-  }
-  }
+   my $expandedPATH = $PATH;
+   $expandedPATH =~ s/(\$\w+)/$1/eeg;
+
+   # fix situations where PATH may look like /bin:"C:\blah\bleh":/ugh
+   my $fixedPATH = $oldPATH;
+   if ( $oldPATH =~ /"/ ) {
+   $fixedPATH = "";
+   foreach my $pathentry ( split( '"',$oldPATH ) ) {
+   if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) {
+   $fixedPATH .= $pathentry;
+   } else {
+   chomp( $pathentry = qx{cygpath -d "$pathentry"} ) ;
+   chomp( $pathentry = qx{cygpath -u "$pathentry"} ) ;
+   $fixedPATH .= $pathentry;
}
+   }
+   }
 
-   foreach my $pathentry (split($ps,$fixedPATH)) {
-   if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) {
-   $PATH .= $ps.$pathentry;
-   $expandedPATH .= $ps.$pathentry;
-   }
+   foreach my $pathentry (split($ps,$fixedPATH)) {
+   if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) {
+   $PATH .= $ps.$pathentry;
+   $expandedPATH .= $ps.$pathentry;
}
-   } else {
-   $PATH  .= $ps.$oldPATH;
}
 
# The path now is in cygwin posix format
@@ -2180,6 +2176,9 @@

52 matches

Mail list logo