[Libreoffice-commits] .: extensions/source

2011-11-08 Thread Norbert Thiebaud
 extensions/source/plugin/aqua/sysplug.cxx|   24 +--
 extensions/source/plugin/inc/plugin/aqua/sysplug.hxx |6 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c2960a35258b145edb9f73671cc5e7c4056199ba
Author: Norbert Thiebaud 
Date:   Tue Nov 8 23:54:57 2011 -0600

int16/32 ->int16/32_t fall-out of new npapi.h

diff --git a/extensions/source/plugin/aqua/sysplug.cxx 
b/extensions/source/plugin/aqua/sysplug.cxx
index 01e10dd..415ca93 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -368,8 +368,8 @@ long MacPluginComm::doIt()
 ? (*m_aNPPfuncs.newp)(
 (NPMIMEType)m_aArgs[0],
 (NPP)m_aArgs[1],
-(uint16)(sal_IntPtr)m_aArgs[2],
-(int16)(sal_IntPtr)m_aArgs[3],
+(uint16_t)(sal_IntPtr)m_aArgs[2],
+(int16_t)(sal_IntPtr)m_aArgs[3],
 (char**)m_aArgs[4],
 (char**)m_aArgs[5],
 (NPSavedData*)m_aArgs[6] )
@@ -392,7 +392,7 @@ long MacPluginComm::doIt()
 (NPMIMEType)m_aArgs[1],
 (NPStream*)m_aArgs[2],
 (NPBool)(sal_IntPtr)m_aArgs[3],
-(uint16*)m_aArgs[4] )
+(uint16_t*)m_aArgs[4] )
 : NPERR_GENERIC_ERROR);
 break;
 case eNPP_Print:
@@ -442,13 +442,13 @@ long MacPluginComm::doIt()
 m_aArgs[3] );
 break;
 case eNPP_Write:
-TRACEN( "eNPP_Write n=", (int32)m_aArgs[3] );
+TRACEN( "eNPP_Write n=", (int32_t)m_aArgs[3] );
 nRet = (m_aNPPfuncs.write
 ? (*m_aNPPfuncs.write)(
 (NPP)m_aArgs[0],
 (NPStream*)m_aArgs[1],
-(int32)m_aArgs[2],
-(int32)m_aArgs[3],
+(int32_t)m_aArgs[2],
+(int32_t)m_aArgs[3],
 m_aArgs[4] )
 : 0);
 break;
@@ -540,7 +540,7 @@ NPError MacPluginComm::NPP_DestroyStream( NPP instance, 
NPStream* stream, NPErro
 }
 
 
//--
-NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16 
mode, int16 argc,
+NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t 
mode, int16_t argc,
   char* argn[], char* argv[], NPSavedData 
*saved )
 {
 XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance );
@@ -553,7 +553,7 @@ NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP 
instance, uint16 mode
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "NPP_New( %s. %p, %d, %d",
  pluginType, instance, (int)mode, (int)argc );
-for( int16 i = 0; i < argc; i++ )
+for( int16_t i = 0; i < argc; i++ )
 fprintf( stderr, "\n%s = %s", argn[i], argv[i] );
 fprintf( stderr, ", %p )\n", saved );
 #endif
@@ -571,7 +571,7 @@ NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP 
instance, uint16 mode
 
 
//--
 NPError MacPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* 
stream,
-NPBool seekable, uint16* stype )
+NPBool seekable, uint16_t* stype )
 {
 DBG_ASSERT( m_aNPPfuncs.newstream, "### NPP_NewStream(): null pointer in 
NPP functions table!" );
 m_eCall = eNPP_NewStream;
@@ -637,7 +637,7 @@ void MacPluginComm::NPP_URLNotify( NPP instance, const 
char* url, NPReason reaso
 }
 
 
//--
-int32 MacPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, 
int32 len, void* buffer )
+int32_t MacPluginComm::NPP_Write( NPP instance, NPStream* stream, int32_t 
offset, int32_t len, void* buffer )
 {
 DBG_ASSERT( m_aNPPfuncs.write, "### NPP_Write(): null pointer in NPP 
functions table!" );
 m_eCall = eNPP_Write;
@@ -650,7 +650,7 @@ int32 MacPluginComm::NPP_Write( NPP instance, NPStream* 
stream, int32 offset, in
 }
 
 
//--
-int32 MacPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
+int32_t MacPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
 {
 DBG_ASSERT( m_aNPPfuncs.writeready, "### NPP_WriteReady(): null pointer in 
NPP functions table!" );
 m_eCall = eNPP_WriteReady;
@@ -805,7 +805,7 @@ void MacPluginComm::drawView( XPlugin_Impl* i_pImpl )
 NSWindow* pWin = [rPlugData.m_pPlugView window];
 FakeEventRecord aRec;
 aRec.what   =  updateEvt;
-aRec.message= (UInt32)[pWin windowRef];
+aRec.message= (ui

[Libreoffice-commits] .: 8 commits - solenv/gbuild

2011-11-08 Thread Norbert Thiebaud
 solenv/gbuild/AllLangResTarget.mk   |5 
 solenv/gbuild/Configuration.mk  |3 
 solenv/gbuild/SdiTarget.mk  |1 
 solenv/gbuild/UnoApiTarget.mk   |   11 ++
 solenv/gbuild/platform/android.mk   |   21 
 solenv/gbuild/platform/com_GCC_class.mk |   72 ++
 solenv/gbuild/platform/com_GCC_defs.mk  |  130 +
 solenv/gbuild/platform/ios.mk   |  145 ++--
 solenv/gbuild/platform/macosx.mk|  163 +++-
 solenv/gbuild/platform/solaris.mk   |   24 
 solenv/gbuild/platform/unxgcc.mk|  155 +-
 solenv/gbuild/platform/windows.mk   |   17 ---
 solenv/gbuild/platform/winmingw.mk  |  152 ++---
 13 files changed, 276 insertions(+), 623 deletions(-)

New commits:
commit 9a71582047d7762255b280d5730aebbaabf9d115
Author: Norbert Thiebaud 
Date:   Tue Nov 8 20:04:14 2011 -0600

clean-up after conflicting branch rebase

diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 9eb0db7..195e068 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -31,7 +31,6 @@
 # (This can be workarounded by using gb_Package, but really should not.)
 
 # SdiTarget class
-gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
 gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
 gb_SdiTarget_SVIDLCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
commit 1d60e2032af3b9d4c39f595737e4111da27c1aaa
Author: Norbert Thiebaud 
Date:   Tue Nov 8 14:37:24 2011 -0600

factorize RSCTARGET,RSCOMMANd out of platform, and __command_dep in com_GCC

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index ba714df..78bfbf8 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -72,10 +72,11 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY)
 # SrsPartTarget class
 
 # defined by platform
-#  gb_SrsPartTarget_RSCTARGET
-#  gb_SrsPartTarget_RSCCOMMAND
 #  gb_SrsPartTarget__command_dep
 
+gb_SrsPartTarget_RSCTARGET := 
$(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build)
+gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
+
 define gb_SrsPartTarget__command
 $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 2a52626..61afbc1 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -59,3 +59,14 @@ $(call gb_Helper_abbreviate_dirs,\
$(INCLUDE_STL) $(INCLUDE))
 endef
 
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && \
+   $(gb_GCCP) \
+   -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+   $(INCLUDE) \
+   $(DEFS) \
+   -c -x c++-header $(2) \
+   -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 073633c..8f013fb 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -305,23 +305,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && \
-   $(gb_GCCP) \
-   -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-   $(INCLUDE) \
-   $(DEFS) \
-   -c -x c++-header $(2) \
-   -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
-
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 90a0432..49ac78b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -398,23 +398,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib 
SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && \
-   $(gb_GCCP) \
-   -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-   $(INCLUDE) \
-   $(DEFS) \
-   -c -x c++-header $(

[Libreoffice-commits] .: sc/source

2011-11-08 Thread Kohei Yoshida
 sc/source/ui/view/tabview2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 696fb8582fe54d6cb5ec54f81680ddc281500b88
Author: Kohei Yoshida 
Date:   Tue Nov 8 20:46:16 2011 -0500

Fixed the wrong keyboard selection behavior in reference mode.

This one is pretty bad, especially for those who like to select
ranges using keyboard.

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 622a6e1..1dcb4e1 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -628,6 +628,8 @@ void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW 
nMovY, ScFollowMode
 {
 nNewX = aViewData.GetRefEndX();
 nNewY = aViewData.GetRefEndY();
+nCurX = aViewData.GetRefStartX();
+nCurY = aViewData.GetRefStartY();
 }
 else if (IsBlockMode())
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Norbert Thiebaud
New branch 'feature/factorize_gcc' available with the following commits:
commit 0cdf8c9de65507b032e4cc037102602f37c59872
Author: Norbert Thiebaud 
Date:   Tue Nov 8 14:37:24 2011 -0600

factorize RSCTARGET,RSCOMMANd out of platform, and __command_dep in com_GCC

commit 4faa69c71ab60a2f039c34c2d09aa4b6378ea748
Author: Norbert Thiebaud 
Date:   Tue Nov 8 14:35:03 2011 -0600

factorize gb_SrsParMergeTarget_TRANSECPRECOMMAND our of platform/*

commit cf7718ef07b6935d84cf3021fd4ccaacc45a4427
Author: Norbert Thiebaud 
Date:   Tue Nov 8 14:32:26 2011 -0600

factorize gb_SdiTarget_SVIDLPRECOMMAND out of platform/*

commit ef1afbee3653b079d4fa3aa6afd09c19ae724097
Author: Norbert Thiebaud 
Date:   Tue Nov 8 14:29:28 2011 -0600

factorize gb_XSLTPROCPRECOMMAND out of platform/*

commit 27d0284278b42345925dcd59378e12ab33811221
Author: Norbert Thiebaud 
Date:   Tue Nov 8 14:26:30 2011 -0600

gb_CFGEXPRECOMMAND is not necessary and can be factorized out of platform/*

commit 794d517100bea3feb2e7fda87a9d08c146470ec8
Author: Norbert Thiebaud 
Date:   Mon Nov 7 22:23:54 2011 -0600

UnoApiTarget_* really do not need to be per platform

setting and using gb_Helper_set_ld_path and gb_Executable_EXT_for_build
is enough to factorize these out of platform/*

commit 9969bef6a15089b24a7f84c8021fb0b7bba10bcf
Author: Norbert Thiebaud 
Date:   Sat Nov 5 06:55:15 2011 -0500

begin factorization of common GCC stuff

a lot of configuration/definition is shared between platforms that build
using gcc.
This start to regroup things that are common into 2 files
com_GCC_defs.mk and com_GCC_class.mk
this can be expanded to be, more generically com_$(COM)_defs/class

The reson for 2 files is that some step need to modfify common definitions
based on the platform and some common definitions need platform defined
value.
with these 2 files we can do a
platform - compiler - platform - compiler - platfrom
sandwich that should cover every scenario.

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


[Libreoffice-commits] .: Branch 'feature/factorize_gcc' - 0 commits -

2011-11-08 Thread Norbert Thiebaud
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Kohei Yoshida
 sc/qa/unit/ucalc.cxx |  249 +--
 1 file changed, 205 insertions(+), 44 deletions(-)

New commits:
commit 5d1a99169253b084d676234fa153f2acecc5d638
Author: Kohei Yoshida 
Date:   Tue Nov 8 17:16:21 2011 -0500

Test case for VLOOKUP (in-exact lookup on sorted range).

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index cfa367c..8f4478c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -74,7 +74,7 @@
 #include 
 #include 
 
-#define CALC_DEBUG_OUTPUT 1
+#define CALC_DEBUG_OUTPUT 0
 
 #include "helper/debughelper.hxx"
 
@@ -213,7 +213,7 @@ void printRange(ScDocument* pDoc, const ScRange& rRange, 
const char* pCaption)
 {
 rtl::OUString aVal;
 pDoc->GetString(nCol, nRow, rRange.aStart.Tab(), aVal);
-printer.set(nRow, nCol, aVal);
+printer.set(nRow-nRow1, nCol-nCol1, aVal);
 }
 }
 printer.print(pCaption);
@@ -397,7 +397,7 @@ void Test::testCellFunctions()
 for (SCROW i = 0; i < nRows; ++i)
 m_pDoc->SetString(0, i, 0, 
rtl::OUString::createFromAscii(aData[i]));
 
-printRange(m_pDoc, ScRange(0, 0, 0, 0, 8, 0), "data range");
+printRange(m_pDoc, ScRange(0, 0, 0, 0, 8, 0), "data range for 
COUNTIF");
 
 // formulas and results
 struct {
@@ -431,12 +431,98 @@ void Test::testCellFunctions()
 bool bGood = result == aChecks[i].fResult;
 if (!bGood)
 {
-cerr << "row " << (nRow+1) << ": formula" << 
aChecks[i].pFormula << "  expected=" << aChecks[i].fResult << "  actual=" << 
result << endl;
+cerr << "row " << (nRow+1) << ": formula" << 
aChecks[i].pFormula
+<< "  expected=" << aChecks[i].fResult << "  actual=" << 
result << endl;
 CPPUNIT_ASSERT_MESSAGE("Unexpected result for COUNTIF", false);
 }
 }
 }
 
+{
+// VLOOKUP
+
+// Clear A1:F40.
+clearRange(m_pDoc, ScRange(0, 0, 0, 5, 39, 0));
+
+// Raw data
+const char* aData[][2] = {
+{ "Key", "Val" },
+{  "10",   "3" },
+{  "20",   "4" },
+{  "30",   "5" },
+{  "40",   "6" },
+{  "50",   "7" },
+{  "60",   "8" },
+{  "70",   "9" },
+{   "A",  "10" },
+{   "B",  "11" },
+{   "C",  "12" },
+{   "D",  "13" },
+{   "E",  "14" },
+{   "F",  "15" },
+{ 0, 0 } // terminator
+};
+
+// Insert raw data into A1:B14.
+for (SCROW i = 0; aData[i][0]; ++i)
+{
+m_pDoc->SetString(0, i, 0, 
rtl::OUString::createFromAscii(aData[i][0]));
+m_pDoc->SetString(1, i, 0, 
rtl::OUString::createFromAscii(aData[i][1]));
+}
+
+printRange(m_pDoc, ScRange(0, 0, 0, 1, 13, 0), "raw data for VLOOKUP");
+
+// Formula data
+struct {
+const char* pLookup; const char* pFormula; double fResult;
+} aChecks[] = {
+{ "Lookup",  "Formula", 0 },
+{ "12",  "=VLOOKUP(D2;A2:B14;2;1)",   3 },
+{ "29",  "=VLOOKUP(D3;A2:B14;2;1)",   4 },
+{ "31",  "=VLOOKUP(D4;A2:B14;2;1)",   5 },
+{ "45",  "=VLOOKUP(D5;A2:B14;2;1)",   6 },
+{ "56",  "=VLOOKUP(D6;A2:B14;2;1)",   7 },
+{ "65",  "=VLOOKUP(D7;A2:B14;2;1)",   8 },
+{ "78",  "=VLOOKUP(D8;A2:B14;2;1)",   9 },
+{ "Andy","=VLOOKUP(D9;A2:B14;2;1)",  10 },
+{ "Bruce",   "=VLOOKUP(D10;A2:B14;2;1)", 11 },
+{ "Charlie", "=VLOOKUP(D11;A2:B14;2;1)", 12 },
+{ "David",   "=VLOOKUP(D12;A2:B14;2;1)", 13 },
+{ "Edward",  "=VLOOKUP(D13;A2:B14;2;1)", 14 },
+{ "Frank",   "=VLOOKUP(D14;A2:B14;2;1)", 15 },
+{ "Henry",   "=VLOOKUP(D15;A2:B14;2;1)", 15 },
+{ "100", "=VLOOKUP(D16;A2:B14;2;1)",  9 },
+{ "1000","=VLOOKUP(D17;A2:B14;2;1)",  9 },
+{ "Zena","=VLOOKUP(D18;A2:B14;2;1)", 15 }
+};
+
+// Insert formula data into D1:E18.
+for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+m_pDoc->SetString(3, i, 0, 
rtl::OUString::createFromAscii(aChecks[i].pLookup));
+m_pDoc->SetString(4, i, 0, 
rtl::OUString::createFromAscii(aChecks[i].pFormula));
+}
+m_pDoc->CalcAll();
+printRange(m_pDoc, ScRange(3, 0, 0, 4, 17, 0), "formula data for 
VLOOKUP");
+
+// Verify results.
+for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+if (i == 0)
+// Skip the header row.
+continue;
+
+m_pDoc->GetValue(4, i, 0, result);
+bool bGood = result == aChecks[i].fResult;
+if (!bGood)
+{
+cerr << "row " << (i+1) <

[Libreoffice-commits] .: 3 commits - instsetoo_native/util l10ntools/inc l10ntools/source setup_native/source

2011-11-08 Thread Andras Timar
 dev/null |binary
 instsetoo_native/util/openoffice.lst |   22 
 l10ntools/inc/srciter.hxx|3 
 l10ntools/source/localize.cxx|  139 +++
 l10ntools/source/srciter.cxx |   10 -
 setup_native/source/packinfo/libreoffice.pcp |binary
 6 files changed, 25 insertions(+), 149 deletions(-)

New commits:
commit a527939c80d2ad22c07776b574ec0a2775fbd5f5
Author: Andras Timar 
Date:   Tue Nov 8 22:36:07 2011 +0100

remove unused variables

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 6f2b77f..1371634 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -63,8 +63,6 @@ LibreOffice
ABOUTBOXPRODUCTVERSION 3.5.0
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
-   UPDATEURL 
http://update.libreoffice.org/ProductUpdateService/check.Update
-ODFNOTIFYURL 
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -96,8 +94,6 @@ LibreOffice
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
 STARTCENTER_LAYOUT_STYLE 0
-REGISTRATION_PRODUCT LibreOffice
-REGISTRATION_CID 926117
 DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active  1
@@ -127,8 +123,6 @@ LibreOffice_wJRE
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
BASEPRODUCTVERSION 3.5
-   UPDATEURL 
http://update.libreoffice.org/ProductUpdateService/check.Update
-ODFNOTIFYURL 
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -162,8 +156,6 @@ LibreOffice_wJRE
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
 STARTCENTER_LAYOUT_STYLE 0
-REGISTRATION_PRODUCT LibreOffice
-REGISTRATION_CID 926117
 DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active  1
@@ -198,8 +190,6 @@ LibreOffice_Dev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN 
urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-   UPDATEURL 
http://update.libreoffice.org/ProductUpdateService/check.Update
-ODFNOTIFYURL 
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
FILEFORMATNAME OpenOffice.org
@@ -231,8 +221,6 @@ LibreOffice_Dev
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
 STARTCENTER_LAYOUT_STYLE 0
-REGISTRATION_PRODUCT LibreOffice
-REGISTRATION_CID 926117
 DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active  1
@@ -402,8 +390,6 @@ OxygenOffice
ABOUTBOXPRODUCTVERSION 3.5.0
BASEPRODUCTVERSION 3.5
 PCPFILENAME openoffice.pcp
-   UPDATEURL 
http://update.libreoffice.org/ProductUpdateService/check.Update
-ODFNOTIFYURL 
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -440,8 +426,6 @@ OxygenOffice
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
 STARTCENTER_LAYOUT_STYLE 0
-REGISTRATION_PRODUCT OxygenOffice
-REGISTRATION_CID 926117
 DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active  1
@@ -471,8 +455,6 @@ OxygenOffice_wJRE
USERDIRPRODUCTVERS

[Libreoffice-commits] calc/function

2011-11-08 Thread Kohei Yoshida
 calc/function/vlookup.ods |binary
 1 file changed

New commits:
commit 3c4ed4107541613dfe34ccd34635dd9314bf8516
Author: Kohei Yoshida 
Date:   Tue Nov 8 16:35:03 2011 -0500

Corrected expected results.

diff --git a/calc/function/vlookup.ods b/calc/function/vlookup.ods
index b114915..07cc93b 100644
Binary files a/calc/function/vlookup.ods and b/calc/function/vlookup.ods differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] calc/function

2011-11-08 Thread Kohei Yoshida
 calc/function/vlookup.ods |binary
 1 file changed

New commits:
commit b203a49c93c95516d522200e6cc48b687da0310c
Author: Kohei Yoshida 
Date:   Tue Nov 8 16:31:56 2011 -0500

New test document for VLOOKUP function.

Results on in-exact lookups are based on as specified in ODFF.

diff --git a/calc/function/vlookup.ods b/calc/function/vlookup.ods
new file mode 100644
index 000..b114915
Binary files /dev/null and b/calc/function/vlookup.ods differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sd/Library_sd.mk

2011-11-08 Thread Michael Stahl
 sd/Library_sd.mk |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 00b2e13d2c7378577e77e1a1107601651735486e
Author: Michael Stahl 
Date:   Tue Nov 8 20:53:05 2011 +0100

sd: how the hell did that ever work:

The sd library uses SDI headers, but the corresponding targets
were not declared anywhere.

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 51db250..9d53091 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -30,6 +30,22 @@ $(eval $(call gb_Library_Library,sd))
 
 $(eval $(call 
gb_Library_add_precompiled_header,sd,$(SRCDIR)/sd/inc/pch/precompiled_sd))
 
+$(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots))
+
+$(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\
+-I$(realpath $(SRCDIR)/sd/inc) \
+-I$(realpath $(SRCDIR)/sd/sdi) \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdgslots,sd/sdi/sdgslots))
+
+$(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\
+-I$(realpath $(SRCDIR)/sd/inc) \
+-I$(realpath $(SRCDIR)/sd/sdi) \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_add_sdi_headers,sd,\
 sd/sdi/sdgslots \
 sd/sdi/sdslots \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: desktop/unx

2011-11-08 Thread Stephan Bergmann
 desktop/unx/source/start.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit de90369c315afc62c4409a5df1a581fa466cb849
Author: Stephan Bergmann 
Date:   Tue Nov 8 20:49:07 2011 +0100

Properly check sscanf return value.

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 9d95547..b30efdc 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -559,6 +559,7 @@ read_percent( ChildInfo *info, int *pPercent )
 
 char *pBegin;
 char *pIter;
+char c;
 
 /* from the last call */
 int nNotProcessed = nRead - ( pNext - pBuffer );
@@ -598,7 +599,7 @@ read_percent( ChildInfo *info, int *pPercent )
 return ProgressExit;
 else if ( !strncasecmp( pBegin, "restart", 7 ) )
 return ProgressRestart;
-else if ( sscanf( pBegin, "%d%%", pPercent ) )
+else if ( sscanf( pBegin, "%d%c", pPercent, &c ) == 2 && c == '%' )
 return ProgressContinue;
 
 /* unexpected - let's exit the splash to be safe */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: extensions/qa

2011-11-08 Thread Julien Nabet
 extensions/qa/update/test_update.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a57304a53832adf0c8a32b0c53d9be5b55507ab1
Author: Julien Nabet 
Date:   Tue Nov 8 19:50:06 2011 +0100

Fix WaE variable ‘eUIState’ set but not used

diff --git a/extensions/qa/update/test_update.cxx 
b/extensions/qa/update/test_update.cxx
index cf44093..d699da9 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -64,7 +64,6 @@ protected:
 // test the checkForUpdates() method
 void testCheckForUpdates()
 {
-UpdateState eUIState = UPDATESTATE_NO_UPDATE_AVAIL;
 
 UpdateInfo aInfo;
 rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
@@ -73,7 +72,6 @@ protected:
 if ( checkForUpdates( aInfo, m_xContext, 
aController->getInteractionHandler(), m_xProvider ) )
 {
 aController->setUpdateInfo( aInfo );
-eUIState = aController->getUIState( aInfo );
 }
 else
 CPPUNIT_FAIL("Calling checkForUpdates() failed.");
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/source

2011-11-08 Thread Christian Lohmaier
 oox/source/helper/binaryoutputstream.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit f0dff0d9d152d3b96403a6f5df25e307392cbe06
Author: Christian Lohmaier 
Date:   Tue Nov 8 19:32:48 2011 +0100

use non-const buffer to enable byte-order swapping on BigEndian system

diff --git a/oox/source/helper/binaryoutputstream.cxx 
b/oox/source/helper/binaryoutputstream.cxx
index c96eeb9..97269f2 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -129,7 +129,14 @@ BinaryOutputStream::writeUnicodeArray( const 
::rtl::OUString& rString, bool bAll
 OUString sBuf( rString );
 if( !bAllowNulChars )
 sBuf.replace( '\0', '?' );
+#ifdef OSL_BIGENDIAN
+// need a non-const buffer for swapping byte order
+sal_Unicode notConst[sBuf.getLength()];
+memcpy( notConst, sBuf.getStr(), sizeof(sal_Unicode)*sBuf.getLength() );
+writeArray( notConst, sBuf.getLength() );
+#else
 writeArray( sBuf.getStr(), sBuf.getLength() );
+#endif
 }
 
 void
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: jurt/com ridljar/com

2011-11-08 Thread Ivan Timofeev
 jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java |9 
++---
 jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java|4 ++--
 ridljar/com/sun/star/uno/UnoRuntime.java|7 ---
 3 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit cb9dad87e7ee82d7ad1f93e1ab46e2f1ef509ce8
Author: Ivan Timofeev 
Date:   Tue Nov 8 21:52:32 2011 +0400

suppress warnings about inexact argument type

diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java 
b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
index c29be0c..d0ae6c3 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
@@ -175,13 +175,16 @@ final class ProxyFactory {
 try {
 METHOD_EQUALS = Object.class.getMethod(
 "equals", new Class[] { Object.class });
-METHOD_HASH_CODE = Object.class.getMethod("hashCode", null);
-METHOD_TO_STRING = Object.class.getMethod("toString", null);
+METHOD_HASH_CODE = Object.class.getMethod(
+"hashCode", (Class[]) null);
+METHOD_TO_STRING = Object.class.getMethod(
+"toString", (Class[]) null);
 METHOD_QUERY_INTERFACE = IQueryInterface.class.getMethod(
 "queryInterface", new Class[] { Type.class });
 METHOD_IS_SAME = IQueryInterface.class.getMethod(
 "isSame", new Class[] { Object.class });
-METHOD_GET_OID = IQueryInterface.class.getMethod("getOid", null);
+METHOD_GET_OID = IQueryInterface.class.getMethod(
+"getOid", (Class[]) null);
 } catch (NoSuchMethodException e) {
 throw new ExceptionInInitializerError(e);
 }
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java 
b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
index 2a43041..38cafed 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
@@ -318,8 +318,8 @@ final class Marshal {
 if (value == null) {
 try {
 n = ((Enum)
- (type.getZClass().getMethod("getDefault", null).
-  invoke(null, null))).
+ (type.getZClass().getMethod("getDefault", (Class[]) null).
+  invoke(null, (Object[]) null))).
 getValue();
 } catch (IllegalAccessException e) {
 throw new RuntimeException(e.toString());
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java 
b/ridljar/com/sun/star/uno/UnoRuntime.java
index 188ea54..a23740c 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -342,7 +342,8 @@ public class UnoRuntime {
 return Array.newInstance(type.getZClass().getComponentType(), 0);
 case TypeClass.STRUCT_value:
 try {
-return type.getZClass().getConstructor(null).newInstance(null);
+return type.getZClass().getConstructor((Class[]) null).
+newInstance((Object[]) null);
 } catch (java.lang.RuntimeException e) {
 throw e;
 } catch (java.lang.Exception e) {
@@ -350,8 +351,8 @@ public class UnoRuntime {
 }
 case TypeClass.ENUM_value:
 try {
-return type.getZClass().getMethod("getDefault", null).invoke(
-null, null);
+return type.getZClass().getMethod("getDefault", (Class[]) 
null).
+invoke(null, (Object[]) null);
 } catch (java.lang.RuntimeException e) {
 throw e;
 } catch (java.lang.Exception e) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Michael Stahl
 idl/inc/command.hxx  |2 ++
 idl/inc/database.hxx |8 
 idl/source/objects/module.cxx|1 +
 idl/source/prj/command.cxx   |5 +
 idl/source/prj/database.cxx  |   27 +++
 idl/source/prj/svidl.cxx |   24 
 solenv/gbuild/SdiTarget.mk   |   16 +++-
 solenv/gbuild/TargetLocations.mk |1 +
 8 files changed, 83 insertions(+), 1 deletion(-)

New commits:
commit 016cee9ad960fce42124a600c16a3b0c073df0c2
Author: Michael Stahl 
Date:   Tue Nov 8 19:08:52 2011 +0100

SdiTarget: temporarily disable full deps on WNT

diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 48ff698..8ef4fe2 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -73,8 +73,10 @@ define gb_SdiTarget_SdiTarget
 $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir 
$(SRCDIR)/$(1)) ,$$(SOLARINC))
 $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
 ifeq ($(gb_FULLDEPS),$(true))
+ifneq ($(OS),WNT)
 -include $(call gb_SdiTarget_get_dep_target,$(1))
 endif
+endif
 endef
 
 define gb_SdiTarget_set_include
commit 6e6a3d659630b5330372b68ff1d2e865a89a62ab
Author: Michael Stahl 
Date:   Tue Nov 8 18:57:13 2011 +0100

SdiTarget: use svidl -fM for full dependencies

diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index d1fa175..48ff698 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -39,7 +39,7 @@ gb_SdiTarget_SVIDLCOMMAND := \
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | 
$(gb_SdiTarget_SVIDLTARGET)
$(call gb_Output_announce,$*,$(true),SDI,1)
$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $@))
+   mkdir -p $(dir $@) $(dir $(call 
gb_SdiTarget_get_dep_target,$*)))
$(call gb_Helper_abbreviate_dirs_native,\
cd $(dir $<) && \
$(gb_SdiTarget_SVIDLCOMMAND) -quiet \
@@ -50,19 +50,31 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | 
$(gb_SdiTarget_SVIDLTARGET
-fz$@.sid \
-fx$(EXPORTS) \
-fm$@ \
+   -fM$(call gb_SdiTarget_get_dep_target,$*) \
$(realpath $<))
 
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SdiTarget_get_dep_target,%) : $(call gb_SdiTarget_get_target,%)
+   $(if $(wildcard $@),touch $@,\
+ $(call gb_Object__command_dep,$@,$(call gb_SdiTarget_get_target,$*)))
+
+endif
+
 .PHONY : $(call gb_SdiTarget_get_clean_target,%)
 $(call gb_SdiTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),SDI,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(foreach ext,.hxx .ilb .lst .sid,\
$(call gb_SdiTarget_get_target,$*)$(ext)) \
+   $(call gb_SdiTarget_get_dep_target,$*) \
$(call gb_SdiTarget_get_target,$*))
 
 define gb_SdiTarget_SdiTarget
 $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir 
$(SRCDIR)/$(1)) ,$$(SOLARINC))
 $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
+ifeq ($(gb_FULLDEPS),$(true))
+-include $(call gb_SdiTarget_get_dep_target,$(1))
+endif
 endef
 
 define gb_SdiTarget_set_include
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index fe907b1..2fcac95 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -205,6 +205,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
GenCObject \
GenCxxObject \
LinkTarget \
+   SdiTarget \
SrsPartTarget \
SrsTarget \
UnoApiTarget \
commit 6adb9ad1579df1bde71be3091ccca0c71605ddb7
Author: Michael Stahl 
Date:   Tue Nov 8 18:51:13 2011 +0100

svidl: new parameter -fM: write GNU make dependencies

diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index f8ea98a..dad01dc 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -30,6 +30,7 @@
 #define _COMMAND_HXX
 
 #include 
+#include 
 #include 
 
 #ifndef STRING_LIST
@@ -61,6 +62,7 @@ public:
 String  aCSVFile;
 String  aExportFile;
 String  aDocuFile;
+::rtl::OUString m_DepFile;
 sal_uInt32  nVerbosity;
 sal_uInt32  nFlags;
 
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 80685e3..445e54b 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -34,6 +34,11 @@
 #include 
 #include 
 
+#ifdef IDL_COMPILER
+#include 
+#include 
+#endif
+
 class SvCommand;
 
 #ifdef IDL_COMPILER
@@ -82,6 +87,7 @@ class SvIdlDataBase
 
 protected:
 #ifdef IDL_COMPILER
+::std::set< ::rtl::OUString > m_DepFiles;
 SvMetaObjectMemberStack aContextStack;
 String  aPath;
 SvIdlError  aError;
@@ -153,6 +159,8 @@ public:
 SvMetaType * pType = NULL );
 SvMetaA

[Libreoffice-commits] .: desktop/unx

2011-11-08 Thread Michael Meeks
 desktop/unx/source/args.c  |   33 +++--
 desktop/unx/source/args.h  |1 +
 desktop/unx/source/start.c |9 ++---
 3 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit 62ebb119cfb42adc5e007fb77f68d56b40de2a85
Author: Michael Meeks 
Date:   Tue Nov 8 17:52:37 2011 +

don't demonize if we are passed an --accept line for UNO remote control

diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 367bac2..c889e6c 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -48,29 +48,33 @@ static struct {
 unsigned int  bInhibitSplash : 1;
 unsigned int  bInhibitPagein : 1;
 unsigned int  bInhibitJavaLdx : 1;
+unsigned int  bInhibitDemon : 1;
 const char   *pPageinType;
 } pArgDescr[] = {
 /* have a trailing argument */
-{ "pt", 1, 0, 0, 0, NULL },
-{ "display",1, 0, 0, 0, NULL },
+{ "pt", 1, 0, 0, 0, 0, NULL },
+{ "display",1, 0, 0, 0, 0, NULL },
 
 /* no splash */
-{ "nologo", 0, 1, 0, 0, NULL },
-{ "headless",   0, 1, 0, 0, NULL },
-{ "invisible",  0, 1, 0, 0, NULL },
-{ "minimized",  0, 1, 0, 0, NULL },
+{ "nologo", 0, 1, 0, 0, 0, NULL },
+{ "headless",   0, 1, 0, 0, 0, NULL },
+{ "invisible",  0, 1, 0, 0, 0, NULL },
+{ "minimized",  0, 1, 0, 0, 0, NULL },
 
 /* pagein bits */
-{ "writer", 0, 0, 0, 0, "pagein-writer"  },
-{ "calc",   0, 0, 0, 0, "pagein-calc"},
-{ "draw",   0, 0, 0, 0, "pagein-draw"},
-{ "impress",0, 0, 0, 0, "pagein-impress" },
+{ "writer", 0, 0, 0, 0, 0, "pagein-writer"  },
+{ "calc",   0, 0, 0, 0, 0, "pagein-calc"},
+{ "draw",   0, 0, 0, 0, 0, "pagein-draw"},
+{ "impress",0, 0, 0, 0, 0, "pagein-impress" },
 
 /* nothing much */
-{ "version",0, 1, 1, 1, NULL },
-{ "help",   0, 1, 1, 1, NULL },
-{ "h",  0, 1, 1, 1, NULL },
-{ "?",  0, 1, 1, 1, NULL },
+{ "version",0, 1, 1, 1, 0, NULL },
+{ "help",   0, 1, 1, 1, 0, NULL },
+{ "h",  0, 1, 1, 1, 0, NULL },
+{ "?",  0, 1, 1, 1, 0, NULL },
+
+/* UNO remote controlled process */
+{ "accept", 0, 0, 0, 0, 1, NULL },
 };
 
 Args *args_parse (void)
@@ -131,6 +135,7 @@ Args *args_parse (void)
 args->bInhibitSplash  |= pArgDescr[j].bInhibitSplash;
 args->bInhibitPagein  |= pArgDescr[j].bInhibitPagein;
 args->bInhibitJavaLdx |= pArgDescr[j].bInhibitJavaLdx;
+args->bInhibitDemon   |= pArgDescr[j].bInhibitDemon;
 if (pArgDescr[j].pPageinType)
 args->pPageinType = pArgDescr[j].pPageinType;
 }
diff --git a/desktop/unx/source/args.h b/desktop/unx/source/args.h
index 4a0cb55..0f1f114 100644
--- a/desktop/unx/source/args.h
+++ b/desktop/unx/source/args.h
@@ -38,6 +38,7 @@ typedef struct {
   sal_Bool bInhibitSplash;  // should we show a splash screen
   sal_Bool bInhibitPagein;  // should we run pagein ?
   sal_Bool bInhibitJavaLdx; // should we run javaldx ?
+  sal_Bool bInhibitDemon;   // we want to match the lifecycle of 
soffice.bin
 
   sal_uInt32   nArgsEnv;// number of -env: style args
   sal_uInt32   nArgsTotal;  // number of -env: as well as -writer style 
args
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index d627131..9d95547 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -882,9 +882,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 splash = NULL;
 bShortWait = sal_False;
 
-/* Since a client can't distinguish between a first-start 
and
-   a factory re-use, we return control to them here. */
-daemon( 1 /* don't chdir */, 1 /* don't re-direct output 
*/ );
+if (!args->bInhibitDemon)
+{
+/* Since a client can't distinguish between a 
first-start and
+   a factory re-use, we return control to them here. */
+daemon( 1 /* don't chdir */, 1 /* don't re-direct 
output */ );
+}
 }
 
 #if OSL_DEBUG_LEVEL > 1
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'refs/tags/windows_build_successful_2011_11_08'

2011-11-08 Thread Fridrich Strba
Tag 'windows_build_successful_2011_11_08' created by LibreOffice Build 
 at 2011-11-08 17:10 -0800

Fridrich managed to build windows build today

Changes since MELD_LIBREOFFICE_REPOS-27:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'refs/tags/windows_build_successful_2011_11_08'

2011-11-08 Thread Fridrich Strba
Tag 'windows_build_successful_2011_11_08' created by LibreOffice Build 
 at 2011-11-08 17:10 -0800

Fridrich managed to build windows build today

Changes since MELD_LIBREOFFICE_REPOS-4072:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen

2011-11-08 Thread Michael Meeks
 dev/null |binary
 ooo_custom_images/industrial/svx/res/cropmarkers.png |binary
 ooo_custom_images/industrial/svx/res/markers.png |binary
 3 files changed

New commits:
commit d3d8998a2ccc9d4105ebb7f137aed06bdde7abfc
Author: Michael Meeks 
Date:   Tue Nov 8 16:38:57 2011 +

cleanup obsolete and duplicate crop / handle images

diff --git a/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers.png 
b/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers.png
deleted file mode 100644
index 21c3d32..000
Binary files a/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers.png 
and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/svx/source/svdraw/markers.png 
b/ooo_custom_images/hicontrast/svx/source/svdraw/markers.png
deleted file mode 100644
index 4def978..000
Binary files a/ooo_custom_images/hicontrast/svx/source/svdraw/markers.png and 
/dev/null differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png 
b/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png
deleted file mode 100644
index 24aaca1..000
Binary files a/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png and 
/dev/null differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/cropmarkersACC.png 
b/ooo_custom_images/human/svx/source/svdraw/cropmarkersACC.png
deleted file mode 100644
index 6377043..000
Binary files a/ooo_custom_images/human/svx/source/svdraw/cropmarkersACC.png and 
/dev/null differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/markers.png 
b/ooo_custom_images/human/svx/source/svdraw/markers.png
deleted file mode 100644
index 6c77f7c..000
Binary files a/ooo_custom_images/human/svx/source/svdraw/markers.png and 
/dev/null differ
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png 
b/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png
deleted file mode 100644
index 24aaca1..000
Binary files a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png and 
/dev/null differ
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/markers.png 
b/ooo_custom_images/oxygen/svx/source/svdraw/markers.png
deleted file mode 100644
index 6c77f7c..000
Binary files a/ooo_custom_images/oxygen/svx/source/svdraw/markers.png and 
/dev/null differ
commit 749fbc7ab07af4ec05fbaf0f8b5f7a77c1aa4aff
Author: Astron 
Date:   Tue Nov 8 16:37:03 2011 +

Attractive new, alpha marker images for drawing handles & anchors

diff --git a/ooo_custom_images/industrial/svx/res/cropmarkers.png 
b/ooo_custom_images/industrial/svx/res/cropmarkers.png
new file mode 100644
index 000..0ded4fe
Binary files /dev/null and 
b/ooo_custom_images/industrial/svx/res/cropmarkers.png differ
diff --git a/ooo_custom_images/industrial/svx/res/markers.png 
b/ooo_custom_images/industrial/svx/res/markers.png
new file mode 100644
index 000..6240dc3
Binary files /dev/null and b/ooo_custom_images/industrial/svx/res/markers.png 
differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 3 commits - sw/source writerfilter/debug_setup.mk writerfilter/inc writerfilter/source

2011-11-08 Thread Cédric Bosdonnat
 sw/source/core/access/accmap.cxx |1 
 sw/source/core/tox/toxhlp.cxx|1 
 sw/source/core/unocore/unotext.cxx   |8 +
 sw/source/ui/config/optpage.cxx  |2 
 writerfilter/debug_setup.mk  |2 
 writerfilter/inc/resourcemodel/TableManager.hxx  |   64 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   15 +--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|2 
 9 files changed, 55 insertions(+), 44 deletions(-)

New commits:
commit 0e26bd20978cbdd7c59368044c2a21b98ffba164
Author: Cédric Bosdonnat 
Date:   Tue Nov 8 14:39:31 2011 +0100

writerfilter import, fixed the shapes import

In some cases like an OLE object inside a textbox, the imported document
was empty. This was due to unremoved text context in dmapper.

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b65cb21..0f90573 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -188,7 +188,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bIsColumnBreakDeferred( false ),
 m_bIsPageBreakDeferred( false ),
 m_bIsInShape( false ),
-m_bShapeContextAdded( false ),
+m_bRemovedLastAnchored( false ),
 m_pLastSectionContext( ),
 m_nCurrentTabStopIndex( 0 ),
 m_sCurrentParaStyleId(),
@@ -928,6 +928,8 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 // this is normal: the shape is already attached
 }
 m_aAnchoredStack.pop( );
+m_aTextAppendStack.pop( );
+m_bRemovedLastAnchored = true;
 }
 
 // Get the end of paragraph character inserted
@@ -1065,10 +1067,10 @@ void DomainMapper_Impl::appendOLE( const 
::rtl::OUString& rStreamName, OLEHandle
 // gives a better ( visually ) result
 
xOLEProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_ANCHOR_TYPE ),  uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) 
);
 // remove ( if valid ) associated shape ( used for graphic replacement 
)
-if ( m_bShapeContextAdded )
+if ( m_aAnchoredStack.size() > 0 )
 {
 if ( lcl_removeShape(  m_xTextDocument, pOLEHandler->getShape(), 
m_aAnchoredStack, m_aTextAppendStack ) )
-m_bShapeContextAdded = false; // ensure PopShapeContext 
processing doesn't pop the append stack
+m_bRemovedLastAnchored = true; // ensure PopShapeContext 
processing doesn't pop the append stack
 }
 
 //
@@ -1080,7 +1082,6 @@ void DomainMapper_Impl::appendOLE( const ::rtl::OUString& 
rStreamName, OLEHandle
 (void)rEx;
 OSL_FAIL( "Exception in creation of OLE object" );
 }
-
 }
 
 
@@ -1373,7 +1374,7 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
 {
 // Add the shape to the text append stack
 m_aTextAppendStack.push( uno::Reference< text::XTextAppend >( xShape, 
uno::UNO_QUERY_THROW ) );
-m_bShapeContextAdded = true;
+m_bRemovedLastAnchored = false;
 
 // Add the shape to the anchored objects stack
 uno::Reference< text::XTextContent > xTxtContent( xShape, 
uno::UNO_QUERY_THROW );
@@ -1418,11 +1419,11 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
 
 void DomainMapper_Impl::PopShapeContext()
 {
-if ( m_bShapeContextAdded )
+if ( !m_bRemovedLastAnchored && m_aAnchoredStack.size() > 0 )
 {
 RemoveLastParagraph();
 m_aTextAppendStack.pop();
-m_bShapeContextAdded = false;
+m_aAnchoredStack.pop();
 }
 m_bIsInShape = false;
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index b9e9af1..e3b3fa1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -295,7 +295,7 @@ private:
 bool   
 m_bIsColumnBreakDeferred;
 bool   
 m_bIsPageBreakDeferred;
 bool   
 m_bIsInShape;
-bool   
 m_bShapeContextAdded;
+bool   
 m_bRemovedLastAnchored;
 
 LineNumberSettings 
 m_aLineNumberSettings;
 
commit b

[Libreoffice-commits] .: desktop/unx

2011-11-08 Thread Michael Meeks
 desktop/unx/source/start.c |4 
 1 file changed, 4 insertions(+)

New commits:
commit aacf55dbe004ae3cad720002d40dc0e408107fd3
Author: Michael Meeks 
Date:   Tue Nov 8 11:32:20 2011 +

oosplash - daemonize to help mutt users recover their sanity

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index cd95d45..d627131 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -881,6 +881,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 splash_destroy(splash);
 splash = NULL;
 bShortWait = sal_False;
+
+/* Since a client can't distinguish between a first-start 
and
+   a factory re-use, we return control to them here. */
+daemon( 1 /* don't chdir */, 1 /* don't re-direct output 
*/ );
 }
 
 #if OSL_DEBUG_LEVEL > 1
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: extensions/source

2011-11-08 Thread Michael Meeks
 extensions/source/plugin/inc/plugin/aqua/sysplug.hxx |   12 ++--
 extensions/source/plugin/inc/plugin/unx/sysplug.hxx  |6 +++---
 extensions/source/plugin/unx/nppapi.cxx  |6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 68beee834404886a0efb749e8c041c329850e5e9
Author: Michael Meeks 
Date:   Tue Nov 8 15:52:56 2011 +

fix build against new npapi.h (yet more), blind fixes for aqua too

diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx 
b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index 53f137e..12428c0 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -115,22 +115,22 @@ public:
 virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, 
NPError reason );
 virtual void *  NPP_GetJavaClass();
 virtual NPError NPP_Initialize();
-virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 
mode, int16 argc,
+virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t 
mode, int16_t argc,
  char* argn[], char* argv[], NPSavedData 
*saved );
 virtual NPError NPP_NewStream( NPP instance, NPMIMEType type, 
NPStream* stream,
-   NPBool seekable, uint16* stype );
+   NPBool seekable, uint16_t* stype );
 virtual voidNPP_Print( NPP instance, NPPrint* platformPrint );
 virtual NPError NPP_SetWindow( NPP instance, NPWindow* window );
 virtual voidNPP_Shutdown();
 virtual voidNPP_StreamAsFile( NPP instance, NPStream* stream, 
const char* fname );
 virtual voidNPP_URLNotify( NPP instance, const char* url,
NPReason reason, void* notifyData );
-virtual int32   NPP_Write( NPP instance, NPStream* stream, int32 
offset,
-   int32 len, void* buffer );
-virtual int32   NPP_WriteReady( NPP instance, NPStream* stream );
+virtual int32_t   NPP_Write( NPP instance, NPStream* stream, int32 
offset,
+   int32_t len, void* buffer );
+virtual int32_t   NPP_WriteReady( NPP instance, NPStream* stream );
 virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void 
*ret_value );
 virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void 
*ret_value );
-virtual int16   NPP_HandleEvent( NPP instance, void* event );
+virtual int16_t   NPP_HandleEvent( NPP instance, void* event );
 
 virtual NPError NPP_SetWindow( XPlugin_Impl* );
 virtual NPError NPP_Destroy( XPlugin_Impl*, NPSavedData** save );
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx 
b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index a10c688..0dc6a6e 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -70,9 +70,9 @@ public:
const char* fname );
 virtual void NPP_URLNotify( NPP instance, const char* url, NPReason reason,
 void* notifyData );
-virtual int32 NPP_Write( NPP instance, NPStream* stream, int32 offset,
- int32 len, void* buffer );
-virtual int32 NPP_WriteReady( NPP instance, NPStream* stream );
+virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset,
+   int32_t len, void* buffer );
+virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream );
 virtual char* NPP_GetMIMEDescription();
 virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* 
value );
 virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
diff --git a/extensions/source/plugin/unx/nppapi.cxx 
b/extensions/source/plugin/unx/nppapi.cxx
index 34ce8f8..87baa29 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -554,7 +554,7 @@ void UnxPluginComm::NPP_URLNotify( NPP instance, const 
char* url, NPReason reaso
   NULL );
 }
 
-int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, 
int32 len, void* buffer )
+int32_t UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32_t 
offset, int32_t len, void* buffer )
 {
 GET_INSTANCE_RET( -1 );
 sal_uInt32 nFileID = GetStreamID( stream );
@@ -577,7 +577,7 @@ int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* 
stream, int32 offset, in
 return aRet;
 }
 
-int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
+int32_t UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
 {
 GET_INSTANCE_RET( -1 );
 sal_uInt32 nFileID = GetStreamID( stream );
@@ -593,7 +593,7 @@ int32 UnxPluginComm::NPP_WriteReady( NPP instance, 
NPStream* stream )

[Libreoffice-commits] .: sc/source

2011-11-08 Thread Kohei Yoshida
 sc/source/ui/dbgui/pfiltdlg.cxx |   22 +++---
 sc/source/ui/inc/pfiltdlg.hxx   |   16 
 2 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 5d1052ce6047ecc8c366f860a27dd4c4f9c6f212
Author: Kohei Yoshida 
Date:   Tue Nov 8 10:12:33 2011 -0500

String to rtl::OUString.

diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 687da91..6c091b6 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -91,12 +91,12 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* 
pParent,
 aBtnCancel  ( this, ScResId( BTN_CANCEL ) ),
 aBtnHelp( this, ScResId( BTN_HELP ) ),
 aBtnMore( this, ScResId( BTN_MORE ) ),
-aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
-aStrNone( ScResId( SCSTR_NONE ) ),
-aStrEmpty   ( ScResId( SCSTR_EMPTY ) ),
-aStrNotEmpty( ScResId( SCSTR_NOTEMPTY ) ),
-aStrRow ( ScResId( SCSTR_ROW ) ),
-aStrColumn  ( ScResId( SCSTR_COLUMN ) ),
+aStrUndefined   ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
+aStrNone( ResId::toString(ScResId(SCSTR_NONE)) ),
+aStrEmpty   ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
+aStrNotEmpty( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
+aStrRow ( ResId::toString(ScResId(SCSTR_ROW)) ),
+aStrColumn  ( ResId::toString(ScResId(SCSTR_COLUMN)) ),
 //
 nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
 theQueryData( ((const ScQueryItem&)
@@ -416,19 +416,19 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
 ScQueryEntry& rEntry = theParam.GetEntry(i);
 ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
 
-String aStrVal( aValueEdArr[i]->GetText() );
+rtl::OUString aStrVal = aValueEdArr[i]->GetText();
 
 /*
  * Dialog liefert die ausgezeichneten Feldwerte "leer"/"nicht leer"
  * als Konstanten in nVal in Verbindung mit dem Schalter
  * bQueryByString auf FALSE.
  */
-if ( aStrVal == aStrEmpty )
+if ( aStrVal.equals(aStrEmpty) )
 {
 OSL_ASSERT(eOp == SC_EQUAL);
 rEntry.SetQueryByEmpty();
 }
-else if ( aStrVal == aStrNotEmpty )
+else if ( aStrVal.equals(aStrNotEmpty) )
 {
 OSL_ASSERT(eOp == SC_EQUAL);
 rEntry.SetQueryByNonEmpty();
@@ -594,7 +594,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd )
 {
 if ( pEd )
 {
-String aStrVal  = pEd->GetText();
+rtl::OUString aStrVal = pEd->GetText();
 ListBox* pLb= &aLbCond1;
 
  if ( pEd == &aEdVal2 ) pLb = &aLbCond2;
@@ -603,7 +603,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd )
 // wenn einer der Sonderwerte leer/nicht-leer
 // gewaehlt wird, so macht nur der =-Operator Sinn:
 
-if ( aStrEmpty == aStrVal || aStrNotEmpty == aStrVal )
+if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) )
 {
 pLb->SelectEntry( '=' );
 pLb->Disable();
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 0c35cc9..7953cab 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -89,14 +89,14 @@ private:
 CancelButtonaBtnCancel;
 HelpButton  aBtnHelp;
 MoreButton  aBtnMore;
-const StringaStrUndefined;
-const StringaStrNone;
-const StringaStrEmpty;
-const StringaStrNotEmpty;
-const StringaStrRow;
-const StringaStrColumn;
-
-const sal_uInt16nWhichQuery;
+const rtl::OUString aStrUndefined;
+const rtl::OUString aStrNone;
+const rtl::OUString aStrEmpty;
+const rtl::OUString aStrNotEmpty;
+const rtl::OUString aStrRow;
+const rtl::OUString aStrColumn;
+
+const sal_uInt16nWhichQuery;
 const ScQueryParam  theQueryData;
 ScQueryItem*pOutItem;
 ScViewData* pViewData;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Takeshi Abe
 svtools/source/brwbox/datwin.hxx |1 
 svtools/source/contnr/treelist.cxx   |3 
 svtools/source/graphic/grfmgr.cxx|3 
 svtools/source/inc/svimpicn.hxx  |  317 ---
 svtools/source/uno/toolboxcontroller.cxx |1 
 svtools/source/uno/unoiface.cxx  |1 
 6 files changed, 326 deletions(-)

New commits:
commit 93732fe182ddda10a982962a60d88c5cefc149d3
Author: Takeshi Abe 
Date:   Wed Nov 9 00:12:13 2011 +0900

removed unused macros/constants

diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 1aeb06b..e910f44 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -39,7 +39,6 @@
 //===
 
 #define MIN_COLUMNWIDTH  2
-#define DRAG_CRITICAL4
 
 typedef ::std::vector< Rectangle* > RectangleList;
 
diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 0b00dc3..8a0b93c 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -28,9 +28,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-
-#define _TREELIST_CXX
-
 #include 
 
 
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 613fd3d..9e55109 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -50,9 +50,6 @@
 #include 
 #include 
 
-#define WATERMARK_LUM_OFFSET50
-#define WATERMARK_CON_OFFSET-70
-
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::XInterface;
 using com::sun::star::uno::UNO_QUERY;
diff --git a/svtools/source/uno/toolboxcontroller.cxx 
b/svtools/source/uno/toolboxcontroller.cxx
index 110a9d3..a1bb23c 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -43,7 +43,6 @@
 //shizhobo
 #include 
 const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE  = 1;
-const int TOOLBARCONTROLLER_PROPCOUNT   = 1;
 const rtl::OUString TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIABLE( 
RTL_CONSTASCII_USTRINGPARAM( "SupportsVisiable" ));
 //end
 
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 4bc5cae..c0d737b 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#define _SVT_UNOIFACE_CXX
 #include 
 #include 
 #include 
commit 35118036bd63a823fefd88c471a319e564d138d3
Author: Takeshi Abe 
Date:   Tue Nov 8 23:53:09 2011 +0900

removed isolated file

This follows ca402fa0dae85f7f289398af34aa43cf06d14e87.

diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
deleted file mode 100644
index 1ac3a14..000
--- a/svtools/source/inc/svimpicn.hxx
+++ /dev/null
@@ -1,317 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _SVIMPICN_HXX
-#define _SVIMPICN_HXX
-
-#include 
-
-#include 
-#include 
-
-class SvLBoxEntry;
-class SvLBoxTreeList;
-class SvImpIconView;
-class ImpIcnCursor;
-class SvPtrarr;
-
-#define PAINTFLAG_HOR_CENTERED  0x0001
-#define PAINTFLAG_VER_CENTERED  0x0002
-
-#define SELRECT_BORDER_OFFS -7
-// Flags
-#define F_VER_SBARSIZE_WITH_HBAR0x0001
-#define F_HOR_SBARSIZE_WITH_VBAR0x0002
-#define F_IGNORE_NEXT_MOUSEMOVE 0x0004  // OS/2 only
-#define F_ENTRY_REMOVED 0x0008
-// ist gesetzt, wenn nach Clear oder Ctor mind. einmal gepaintet wurde
-#define F_PAINTED   0x0010
-#define F_ADD_MODE  0x0020
-#define F_MOVING

[Libreoffice-commits] .: oox/source

2011-11-08 Thread Radek Doulík
 oox/source/drawingml/textbodypropertiescontext.cxx |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 07a61ac39681a398fadff7597367c804b8321aa2
Author: Radek Doulik 
Date:   Tue Nov 8 16:12:29 2011 +0100

fix texbox vertical alignment, it was regression introduced by f1a2b0cb

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index ed95ee7..083cccf 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -145,17 +145,15 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler& rParent,
 default:
 case XML_t :eVA = drawing::TextVerticalAdjust_TOP; break;
 }
-if( !xAttributes->hasAttribute( XML_vert ) )
-mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA;
-else
+if( xAttributes->hasAttribute( XML_vert ) &&
+( ( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert && eVA == 
drawing::TextVerticalAdjust_TOP ) ||
+  ( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert270 && eVA == 
drawing::TextVerticalAdjust_BOTTOM ) ) )
 {
-if( ( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert && eVA == 
drawing::TextVerticalAdjust_TOP ) ||
-( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert270 && eVA 
== drawing::TextVerticalAdjust_BOTTOM ) )
-{
-mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
-TextHorizontalAdjust_RIGHT;
-}
+mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
+TextHorizontalAdjust_RIGHT;
 }
+else
+mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA;
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Caolán McNamara
 sw/source/filter/html/css1atr.cxx |   11 ---
 sw/source/filter/html/htmlatr.cxx |   10 +-
 sw/source/filter/html/htmlfly.cxx |2 +-
 sw/source/filter/html/htmlftn.cxx |2 +-
 sw/source/filter/html/htmlnum.cxx |4 ++--
 sw/source/filter/html/wrthtml.cxx |   18 ++
 sw/source/filter/html/wrthtml.hxx |8 
 sw/source/ui/chrdlg/pardlg.cxx|8 
 sw/source/ui/fmtui/tmpdlg.cxx |8 
 sw/source/ui/misc/redlndlg.cxx|   21 ++---
 sw/source/ui/uiview/view2.cxx |   18 +-
 xmloff/source/style/styleexp.cxx  |   16 +++-
 12 files changed, 57 insertions(+), 69 deletions(-)

New commits:
commit e494bd26e5415dd0926bcef7c51ab99a4322730f
Author: Daisuke Nishino 
Date:   Tue Nov 8 03:05:41 2011 +0900

Removed some SvStringsSortDtor

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 157a106..69efd26 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1763,15 +1763,12 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const 
SwFmt& rFmt,
   bCheckForPseudo ) )
 {
 if( bCharFmt )
-rHTMLWrt.aScriptTextStyles.Insert( new String( rFmt.GetName() ) );
+rHTMLWrt.aScriptTextStyles.insert( rFmt.GetName() );
 else
 {
 if( nPoolFmtId==RES_POOLCOLL_TEXT )
-rHTMLWrt.aScriptParaStyles.Insert
-(new String( pDoc->GetTxtCollFromPool
- ( RES_POOLCOLL_STANDARD, false )->GetName()
- ) );
-rHTMLWrt.aScriptParaStyles.Insert( new String( rFmt.GetName() ) );
+rHTMLWrt.aScriptParaStyles.insert( pDoc->GetTxtCollFromPool( 
RES_POOLCOLL_STANDARD, false )->GetName() );
+rHTMLWrt.aScriptParaStyles.insert( rFmt.GetName() );
 }
 bHasScriptDependencies = sal_True;
 }
@@ -1950,7 +1947,7 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const 
SwEndNoteInfo& rInfo,
 aSelector.AppendAscii( bEndNote ? 
OOO_STRING_SVTOOLS_HTML_sdendnote_sym
 : 
OOO_STRING_SVTOOLS_HTML_sdfootnote_sym );
 if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, sal_True, 
sal_False ))
-rHTMLWrt.aScriptTextStyles.Insert( new String( 
pSymCharFmt->GetName() ) );
+rHTMLWrt.aScriptTextStyles.insert( pSymCharFmt->GetName() );
 }
 }
 
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 7b796a5..c7d2847 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -651,7 +651,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
   !rHWrt.IsHTMLMode(HTMLMODE_DROPCAPS) );
 rHWrt.aTxtCollInfos.C40_PTR_INSERT( SwHTMLFmtInfo, pFmtInfo );
 String aName( rFmt.GetName() );
-if( rHWrt.aScriptParaStyles.Seek_Entry( &aName ) )
+if( 0 != rHWrt.aScriptParaStyles.count( aName ) )
 ((SwHTMLFmtInfo *)pFmtInfo)->bScriptDependent = sal_True;
 }
 
@@ -1251,7 +1251,7 @@ class HTMLEndPosLst
 SwDoc *pDoc;// das aktuelle Dokument
 SwDoc* pTemplate;   // die HTML-Vorlage (oder 0)
 const Color* pDfltColor;// die Default-Vordergrund-Farbe
-SvStringsSortDtor& rScriptTxtStyles;//
+std::set& rScriptTxtStyles;//
 
 sal_uLong nHTMLMode;
 sal_Bool bOutStyles : 1;// werden Styles exportiert
@@ -1302,7 +1302,7 @@ public:
 
 HTMLEndPosLst( SwDoc *pDoc, SwDoc* pTemplate, const Color* pDfltColor,
sal_Bool bOutStyles, sal_uLong nHTMLMode,
-   const String& rText, SvStringsSortDtor& rStyles );
+   const String& rText, std::set& rStyles );
 ~HTMLEndPosLst();
 
 // Ein Attribut einfuegen
@@ -1763,7 +1763,7 @@ const SwHTMLFmtInfo *HTMLEndPosLst::GetFmtInfo( const 
SwFmt& rFmt,
   bOutStyles );
 rFmtInfos.C40_PTR_INSERT( SwHTMLFmtInfo, pFmtInfo );
 String aName( rFmt.GetName() );
-if( rScriptTxtStyles.Seek_Entry( &aName ) )
+if( 0 != rScriptTxtStyles.count( aName ) )
 ((SwHTMLFmtInfo *)pFmtInfo)->bScriptDependent = sal_True;
 }
 
@@ -1773,7 +1773,7 @@ const SwHTMLFmtInfo *HTMLEndPosLst::GetFmtInfo( const 
SwFmt& rFmt,
 HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
   const Color* pDfltCol, sal_Bool bStyles,
   sal_uLong nMode, const String& rText,
-  SvStringsSortDtor& rStyles ):
+  std::set& rStyles ):
 pDoc( pD ),
 pTemplate( pTempl ),
 pDfltColor( pDfltCol ),
diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index 1f59846..b07e98f 100644
--- a/sw/source/filter/html/htmlf

[Libreoffice-commits] .: oox/source

2011-11-08 Thread Radek Doulík
 oox/source/drawingml/textparagraphproperties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a8bdbeb1a819c0296940b4dd882890be16ec4cba
Author: Radek Doulik 
Date:   Tue Nov 8 15:40:31 2011 +0100

fixed regression, set the left paragraph margin

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index f7168c1..b6c9178 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -456,7 +456,7 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 }
 }
 if ( noParaLeftMargin )
-aPropSet.setProperty( PROP_ParaLeftMargin, sal_Int32(0) 
/**noParaLeftMargin*/ );
+aPropSet.setProperty( PROP_ParaLeftMargin, sal_Int32( 
*noParaLeftMargin ) );
 if ( noFirstLineIndentation )
 aPropSet.setProperty( PROP_ParaFirstLineIndent, 
*noFirstLineIndentation );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: writerfilter/source

2011-11-08 Thread Lubos Lunak
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 247ac3b1095b49f29c44b066fad6264112df1fe2
Author: Luboš Luňák 
Date:   Wed Oct 19 15:31:36 2011 +0200

fix incorrect OSL_FAIL message because of copy&paste

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d2eaeec..b65cb21 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1343,7 +1343,7 @@ void DomainMapper_Impl::PushAnnotation()
 }
 catch( uno::Exception& )
 {
-OSL_FAIL( "exception in PushFootOrEndnote" );
+OSL_FAIL( "exception in PushAnnotation" );
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sw/source

2011-11-08 Thread Lubos Lunak
 sw/source/filter/ww8/docxattributeoutput.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 26e1bc1dd13bf33d60b9f70262627094498fca09
Author: Luboš Luňák 
Date:   Mon Nov 7 19:49:05 2011 +0100

simplify code

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index abe68e8..0181c61 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2313,10 +2313,7 @@ void DocxAttributeOutput::WritePostponedMath()
 if( m_postponedMath == NULL )
 return;
 uno::Reference < embed::XEmbeddedObject > 
xObj(const_cast(m_postponedMath)->GetOLEObj().GetOleRef());
-sal_Int64 nAspect = m_postponedMath->GetAspect();
-svt::EmbeddedObjectRef aObjRef( xObj, nAspect );
-
-uno::Reference< uno::XInterface > xInterface( aObjRef->getComponent(), 
uno::UNO_QUERY );
+uno::Reference< uno::XInterface > xInterface( xObj->getComponent(), 
uno::UNO_QUERY );
 if( OoxmlFormulaExportBase* formulaexport = dynamic_cast< 
OoxmlFormulaExportBase* >( xInterface.get()))
 formulaexport->writeFormulaOoxml( m_pSerializer, 
GetExport().GetFilter().getVersion());
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Caolán McNamara
 slideshow/source/engine/OGLTrans/mac/makefile.mk |8 
 slideshow/source/engine/OGLTrans/unx/makefile.mk |8 
 slideshow/source/engine/OGLTrans/win/makefile.mk |4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 4a1f6199251d3f09951a3c3573d60ba822fe1332
Author: Stephan Bergmann 
Date:   Mon Nov 7 21:23:24 2011 +0100

Fix build of ogltrans.component

...now that postprocess/packcomponents wants to use it.

Signed-off-by: Caolán McNamara 

diff --git a/slideshow/source/engine/OGLTrans/mac/makefile.mk 
b/slideshow/source/engine/OGLTrans/mac/makefile.mk
index aaaedb9..8f08080 100644
--- a/slideshow/source/engine/OGLTrans/mac/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/mac/makefile.mk
@@ -85,3 +85,11 @@ DEF1EXPORTFILE=../exports.dxp
 # ==
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ogltrans.component
+
+$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+../ogltrans.component
+$(XSLTPROC) --nonet --stringparam uri \
+'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+$(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
diff --git a/slideshow/source/engine/OGLTrans/unx/makefile.mk 
b/slideshow/source/engine/OGLTrans/unx/makefile.mk
index 31066e3..2b31ac7 100644
--- a/slideshow/source/engine/OGLTrans/unx/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/unx/makefile.mk
@@ -71,3 +71,11 @@ DEF1EXPORTFILE=../exports.dxp
 # ==
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ogltrans.component
+
+$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+../ogltrans.component
+$(XSLTPROC) --nonet --stringparam uri \
+'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+$(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
diff --git a/slideshow/source/engine/OGLTrans/win/makefile.mk 
b/slideshow/source/engine/OGLTrans/win/makefile.mk
index 7da3787..7f0ac88 100644
--- a/slideshow/source/engine/OGLTrans/win/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/win/makefile.mk
@@ -74,7 +74,7 @@ DEF1EXPORTFILE=../exports.dxp
 ALLTAR : $(MISC)/ogltrans.component
 
 $(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-ogltrans.component
+../ogltrans.component
 $(XSLTPROC) --nonet --stringparam uri \
 '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt ogltrans.component
+$(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: writerfilter/source

2011-11-08 Thread Miklos Vajna
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit a23ee867ea419665769342f485f0144f188952de
Author: Miklos Vajna 
Date:   Tue Nov 8 15:01:45 2011 +0100

RTFDocumentImpl: rename m_bIsInShape to m_bIsInFrame

The "in shape" term was confusing since it was false for non-text-frame
shapes all the time.

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 39bbde2..50664df 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -298,7 +298,7 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_nCurrentStyleIndex(0),
 m_bEq(false),
 m_bWasInFrame(false),
-m_bIsInShape(false)
+m_bIsInFrame(false)
 {
 OSL_ASSERT(xInputStream.is());
 m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, 
sal_True));
@@ -748,7 +748,7 @@ void RTFDocumentImpl::checkChangedFrame()
 // Check if this is a frame.
 if (inFrame() && !m_bWasInFrame)
 {
-if (m_bIsInShape)
+if (m_bIsInFrame)
 return;
 OSL_TRACE("%s starting frame", OSL_THIS_FUNC);
 uno::Reference xTextFrame;
@@ -776,11 +776,11 @@ void RTFDocumentImpl::checkChangedFrame()
 
 Mapper().startShape(xShape);
 Mapper().startParagraphGroup();
-m_bIsInShape = true;
+m_bIsInFrame = true;
 }
 else if (!inFrame() && m_bWasInFrame)
 {
-if (!m_bIsInShape)
+if (!m_bIsInFrame)
 return;
 OSL_TRACE("%s ending frame", OSL_THIS_FUNC);
 finishSubstream();
@@ -789,7 +789,7 @@ void RTFDocumentImpl::checkChangedFrame()
 Mapper().endParagraphGroup();
 Mapper().startParagraphGroup();
 m_bWasInFrame = false; // this is needed by invalid nested flies where 
the result is separate frames
-m_bIsInShape = false;
+m_bIsInFrame = false;
 }
 }
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 7b8a7e0..35098b2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -342,6 +342,7 @@ namespace writerfilter {
 void checkNeedPap();
 void sectBreak(bool bFinal);
 void replayBuffer(RTFBuffer_t& rBuffer);
+/// If we got tokens indicating we're in a frame.
 bool inFrame();
 void checkChangedFrame();
 
@@ -426,8 +427,8 @@ namespace writerfilter {
 bool m_bEq;
 /// If we were in a frame.
 bool m_bWasInFrame;
-/// If a shape is already started (nesting them is not OK).
-bool m_bIsInShape;
+/// If a frame start token is already sent to dmapper (nesting 
them is not OK).
+bool m_bIsInFrame;
 
 };
 } // namespace rtftok
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sw/source

2011-11-08 Thread Noel Power
 sw/source/filter/ww8/ww8graf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 991aa4fff785612bad7281f4948f5771bf8d215a
Author: Noel Power 
Date:   Tue Nov 8 13:47:59 2011 +

NO_STYLE default for borderlines mso import, fixes image size issue 
bnc#718971

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index b81c5f2..c049b7b 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1507,7 +1507,7 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 if( !rLineThick )
 return nOutsideThick;
 
-::editeng::SvxBorderStyle nIdx = ::editeng::SOLID;
+::editeng::SvxBorderStyle nIdx = ::editeng::NO_STYLE;
 
 sal_Int32 nLineThick=rLineThick;
 nOutsideThick = SwMSDffManager::GetEscherLineMatch(eLineStyle,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: desktop/unx

2011-11-08 Thread Christian Lohmaier
 desktop/unx/source/start.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 17f977c104374eedd5638aadc3175dda88ad6360
Author: Christian Lohmaier 
Date:   Tue Nov 8 14:40:07 2011 +0100

remove leftover comment regarding removed Mac OSX conditional

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 29cda81..cd95d45 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -645,7 +645,6 @@ static char *build_pagein_path (Args *args, const char 
*pagein_name)
 void
 exec_pagein (Args *args)
 {
-// no pagein for the while on OSX
 char *argv[3];
 
 /* don't use -L - since that does a chdir that breaks relative paths */
@@ -698,7 +697,7 @@ static void
 exec_javaldx (Args *args)
 {
 #ifndef SOLAR_JAVA
-   return;
+return;
 #endif
 char newpath[4096];
 sal_uInt32 nArgs;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 5 commits - basctl/source

2011-11-08 Thread Caolán McNamara
 basctl/source/accessibility/accessibledialogwindow.cxx |5 ---
 basctl/source/basicide/basdoc.cxx  |   17 +++--
 basctl/source/basicide/basdoc.hxx  |4 +--
 basctl/source/basicide/iderdll2.hxx|1 
 basctl/source/dlged/managelang.cxx |   22 ++---
 basctl/source/inc/localizationmgr.hxx  |3 --
 6 files changed, 16 insertions(+), 36 deletions(-)

New commits:
commit 9fbc73f45f7e001357d1143d5fa06ff35248ad5e
Author: August Sodora 
Date:   Sun Nov 6 21:38:44 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 70677e4..8b4228f 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
+
 #include 
 #include 
 #include 
@@ -46,10 +47,6 @@
 #include 
 #include 
 
-#include 
-#include 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
commit c1e6cf2df86248c5dbeee5109f6c2efabcc26aca
Author: August Sodora 
Date:   Sun Nov 6 22:13:59 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index caec079..f95bbb5 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -29,31 +29,25 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
 
-#include "managelang.hxx"
-#include "iderid.hxx"
-#include "localizationmgr.hxx"
-#include "iderdll.hxx"
 #include "basidesh.hxx"
 #include "basobj.hxx"
+#include "dlgresid.hrc"
+#include "iderdll.hxx"
+#include "iderid.hxx"
+#include "localizationmgr.hxx"
+#include "managelang.hxx"
 
 #include "managelang.hrc"
-#include "dlgresid.hrc"
 #include "helpid.hrc"
 
 #include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
-#include 
-
-#include 
-
-#include 
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
commit c448b832660201b00412fb9d9f5a7727d98c74c9
Author: August Sodora 
Date:   Sun Nov 6 21:43:22 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/basdoc.hxx 
b/basctl/source/basicide/basdoc.hxx
index 848a7f9..b666cab 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -29,9 +29,9 @@
 #ifndef _BASDOC_HXX
 #define _BASDOC_HXX
 
-#include 
 #include 
-#include 
+
+#include 
 
 class SfxPrinter;
 
commit 0d71a9c7d02973f20701bd7e4eca3231ace2b655
Author: August Sodora 
Date:   Sun Nov 6 21:42:12 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/basdoc.cxx 
b/basctl/source/basicide/basdoc.cxx
index 033e258..80536e9 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -28,24 +28,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
-
-
 #include 
-#include 
 
-#include 
-#include 
-#include 
-
-#include 
+#include "unomodel.hxx"
 
 #include 
-
-#define BasicDocShell
+#define BasicDocShell // This CANNOT come before basdoc apparently
 #include 
-
-#include "basicmod.hxx"
-#include "unomodel.hxx"
+#include 
+#include 
 
 TYPEINIT1(BasicDocShell, SfxObjectShell);
 DBG_NAME(BasicDocShell);
commit 3d7bc23e23f42b1940fe8c0d27c97af836b15842
Author: August Sodora 
Date:   Sun Nov 6 21:34:35 2011 -0500

Remove last include of tools/string.hxx in basctl

diff --git a/basctl/source/basicide/iderdll2.hxx 
b/basctl/source/basicide/iderdll2.hxx
index 00456cb..facacc4 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -33,7 +33,6 @@ class StarBASIC;
 class SvxSearchItem;
 class Accelerator;
 
-#include 
 #include 
 #include 
 
diff --git a/basctl/source/inc/localizationmgr.hxx 
b/basctl/source/inc/localizationmgr.hxx
index 382cab7..6942b8e 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -32,7 +32,6 @@
 #include "scriptdocument.hxx"
 
 #include 
-#include 
 
 class BasicIDEShell;
 class DlgEditor;
@@ -45,7 +44,7 @@ class LocalizationMgr
 BasicIDEShell*  m_pIDEShell;
 
 ScriptDocument  m_aDocument;
-String  m_aLibName;
+::rtl::OUString m_aLibName;
 
 ::com::sun::star::lang::Locale  
m_aLocaleBeforeBasicStart;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@l

[Libreoffice-commits] .: extensions/source

2011-11-08 Thread Fridrich Strba
 extensions/source/nsplugin/source/npshell.cxx   |   28 +---
 extensions/source/plugin/base/xplugin.cxx   |2 -
 extensions/source/plugin/inc/plugin/plcom.hxx   |6 ++--
 extensions/source/plugin/inc/plugin/win/sysplug.hxx |   10 +++
 extensions/source/plugin/win/sysplug.cxx|   20 +++---
 5 files changed, 32 insertions(+), 34 deletions(-)

New commits:
commit 60de6b0fd293d26f6594bdc0023fe9c708639b93
Author: Fridrich Strba 
Date:   Tue Nov 8 06:23:07 2011 -0700

Fix Windows build of extensions

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index 731d5ab..7d74dcc 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -73,23 +73,21 @@
 
 //http://qa.openoffice.org/issues/show_bug.cgi?id=82545
 //https://bugzilla.mozilla.org/show_bug.cgi?id=241262
-#ifdef UNIX
-#  ifndef _UINT32
-#if defined(__alpha) || defined(__LP64__) || defined(AIX)
-   typedef unsigned int uint32;
-#else  /* __alpha */
-   typedef unsigned long uint32;
-#endif
-#define _UINT32
+#ifndef _UINT32
+#  if defined(__alpha) || defined(__LP64__) || defined(AIX) || defined(WNT)
+ typedef unsigned int uint32;
+#  else  /* __alpha */
+ typedef unsigned long uint32;
 #  endif
-#  ifndef _INT32
-#if defined(__alpha) || defined(__LP64__) || defined(AIX)
-   typedef int int32;
-#else  /* __alpha */
-   typedef long int32;
-#endif
-#define _INT32
+#  define _UINT32
+#endif
+#ifndef _INT32
+#  if defined(__alpha) || defined(__LP64__) || defined(AIX) || defined(WNT)
+ typedef int int32;
+#  else  /* __alpha */
+ typedef long int32;
 #  endif
+#  define _INT32
 #endif
 
 #include "npapi.h"
diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index 5573176..18e1641 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -1085,7 +1085,7 @@ void PluginInputStream::writeBytes( const 
Sequence& Buffer ) throw()
 m_aFileStream.Seek( m_nWritePos );
 nBytes = m_aFileStream.Read( pBuffer, nBytes );
 
-int32 nBytesRead = 0;
+int32_t nBytesRead = 0;
 try
 {
 nBytesRead = m_pPlugin->getPluginComm()->NPP_Write(
diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx 
b/extensions/source/plugin/inc/plugin/plcom.hxx
index 7436a15..35bd9ad 100644
--- a/extensions/source/plugin/inc/plugin/plcom.hxx
+++ b/extensions/source/plugin/inc/plugin/plcom.hxx
@@ -72,9 +72,9 @@ public:
const char* fname ) = 0;
 virtual void NPP_URLNotify( NPP instance, const char* url,
 NPReason reason, void* notifyData ) = 0;
-virtual int32 NPP_Write( NPP instance, NPStream* stream, int32 offset,
- int32 len, void* buffer ) = 0;
-virtual int32 NPP_WriteReady( NPP instance, NPStream* stream ) = 0;
+virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset,
+   int32_t len, void* buffer ) = 0;
+virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) = 0;
 virtual NPError NPP_GetValue( NPP instance, NPPVariable  variable, void* 
value ) = 0;
 virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
  void *value) = 0;
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx 
b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 40ef2e4..0ac09f5 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -87,10 +87,10 @@ public:
 virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, 
NPError reason );
 virtual void *  NPP_GetJavaClass();
 virtual NPError NPP_Initialize();
-virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 
mode, int16 argc,
+virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t 
mode, int16_t argc,
  char* argn[], char* argv[], NPSavedData 
*saved );
 virtual NPError NPP_NewStream( NPP instance, NPMIMEType type, 
NPStream* stream,
-   NPBool seekable, uint16* stype );
+   NPBool seekable, uint16_t* stype );
 virtual voidNPP_Print( NPP instance, NPPrint* platformPrint );
 
 using PluginComm::NPP_SetWindow;
@@ -99,9 +99,9 @@ public:
 virtual voidNPP_StreamAsFile( NPP instance, NPStream* stream, 
const char* fname );
 virtual voidNPP_URLNotify( NPP instance, const char* url,
NPReason reason, void* notifyData );
-virtual int32   NPP_Write( NPP instance, NPStream* stream, int32 
offset,
-  

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

2011-11-08 Thread Bjoern Michaelsen
 desktop/Executable_soffice.bin.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f222b01170f57ca65ef28239dcf20c1f5a533f6c
Author: Bjoern Michaelsen 
Date:   Tue Nov 8 14:19:36 2011 +0100

there is no rule for the manifest, so we need to depend on the lib only
 - or maybe better: have an rule for manifest files on windows, instead of 
creating them as a sideeffect

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index b32a444..776b84f 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -85,8 +85,8 @@ $(call gb_Module_get_target,desktop) : 
$(OUTDIR)/bin/soffice.bin.manifest
 
 $(OUTDIR)/bin/soffice.bin.manifest : $(call 
gb_Executable_get_target,$(sofficebin))
 $(call gb_Executable_get_clean_target,$(sofficebin)) : 
$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call 
gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
-   $(call gb_Deliver_deliver,$<,$@)
+$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktargetname,$(sofficebin)))
+   $(call gb_Deliver_deliver,$<.manifest,$@)
 
 .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
 $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sc/qa

2011-11-08 Thread Caolán McNamara
 sc/qa/unit/macros-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e6c7a339c4ef9cc5bf8b5b36f5046b27e784c8d2
Author: Caolán McNamara 
Date:   Tue Nov 8 13:14:15 2011 +

exclude windows for now as well

diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx
index 22faa26..658a603 100644
--- a/sc/qa/unit/macros-test.cxx
+++ b/sc/qa/unit/macros-test.cxx
@@ -126,7 +126,7 @@ public:
 void testStarBasic();
 void testVba();
 CPPUNIT_TEST_SUITE(ScMacrosTest);
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(WNT)
 //enable this test if you want to play with star basic macros in unit tests
 //works but does nothing useful yet
 CPPUNIT_TEST(testStarBasic);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: scripting/source

2011-11-08 Thread Michael Stahl
 scripting/source/pyprov/description-en-US.txt |2 +-
 scripting/source/pyprov/description.xml   |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5541912fed47994a428cafcb2675a5211ff47993
Author: Michael Stahl 
Date:   Tue Nov 8 14:13:36 2011 +0100

ScriptProviderForPython: better description

diff --git a/scripting/source/pyprov/description-en-US.txt 
b/scripting/source/pyprov/description-en-US.txt
index b5d6321..7e60ea0 100644
--- a/scripting/source/pyprov/description-en-US.txt
+++ b/scripting/source/pyprov/description-en-US.txt
@@ -1 +1 @@
-A Script Provider for Python.
+Add support for Python via the Scripting Framework to enable Python scripts in 
the user and share directories of a LibreOffice installation, and also in 
loaded documents.
diff --git a/scripting/source/pyprov/description.xml 
b/scripting/source/pyprov/description.xml
index 2862d9a..a42c764 100644
--- a/scripting/source/pyprov/description.xml
+++ b/scripting/source/pyprov/description.xml
@@ -20,4 +20,8 @@
 Script provider for Python
   
 
+  
+
+  
+
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 3 commits - configure.in README.cross solenv/gbuild solenv/inc

2011-11-08 Thread Tor Lillqvist
 README.cross  |4 ++--
 configure.in  |9 +
 solenv/gbuild/platform/android.mk |7 ++-
 solenv/inc/unxandr.mk |   15 +--
 4 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit bc3fa000a43e490266c27209d9ba62eb35241824
Author: Tor Lillqvist 
Date:   Tue Nov 8 15:02:17 2011 +0200

Add -Wl,--fix-cortex-a8 to the Android CC and CXX

diff --git a/README.cross b/README.cross
index 7e8c184..cd15bca 100644
--- a/README.cross
+++ b/README.cross
@@ -318,8 +318,8 @@ Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
 SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CC=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot 
/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CXX=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot 
/home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I 
/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include 
-I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a 
-fexceptions -frtti
+CC=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
+CXX=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I 
/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include 
-I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a 
-fexceptions -frtti
 
AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
 
NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
 
OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
commit 793d4d05b580cbac56fb1537580eb2474cb8c0c5
Author: Tor Lillqvist 
Date:   Tue Nov 8 14:19:20 2011 +0200

Make sure we have env vars for the cross-build tools for Android

diff --git a/configure.in b/configure.in
index a6b135a..a6192a8 100644
--- a/configure.in
+++ b/configure.in
@@ -244,6 +244,15 @@ linux-androideabi*)
 test_randr=no
 test_unix_quickstarter=no
 _os=Android
+
+# Make sure env vars pointing to where to find the cross-build
+# toolchain are set. There aren't really any sensible
+# guesstimates.
+for var in CC CXX AR NM OBJDUMP RANLIB STRIP; do
+if test -z `eval echo '$'$var`; then
+AC_MSG_ERROR([You need to set the $var environment variable in a 
cross-compilation for Android. See README.cross for an example.])
+fi
+done
 ;;
 
 *)
commit 3265a628adc82d2b44df833f59ad700a8dfa4292
Author: Tor Lillqvist 
Date:   Tue Nov 8 13:27:38 2011 +0200

Revert "Just put the Android ARM compiler options in the mk files"

Nah. Sure, doing it like that is sane if you consider only our own
code. But it won't help in making sure these options are used when
compiling the 3rd-party external libraries. For that having the
options already in the CC and CXX environment variables works nicely,
I think. People just need to look at the samples in README.cross.

Perhaps we could add the options to CC and CXX in configure.in,
though? Is that elegant or not, don't know...

This reverts commit 3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb.

diff --git a/README.cross b/README.cross
index 6327ea8..7e8c184 100644
--- a/README.cross
+++ b/README.cross
@@ -318,8 +318,8 @@ Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
 SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CC=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CXX=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++
 --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I 
/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include 
-I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/home/tml/androi

[Libreoffice-commits] .: 2 commits - desktop/unx extensions/source

2011-11-08 Thread Michael Meeks
 desktop/unx/source/file_image_unx.c   |   12 
 desktop/unx/source/start.c|6 --
 extensions/source/nsplugin/source/npshell.cxx |8 
 extensions/source/plugin/base/nfuncs.cxx  |   10 +-
 extensions/source/plugin/unx/npnapi.cxx   |   10 +-
 5 files changed, 14 insertions(+), 32 deletions(-)

New commits:
commit d448b59e4b808b2074cd733bb15ed55f851da5ed
Author: Michael Meeks 
Date:   Tue Nov 8 12:33:13 2011 +

fix build against new npapi.h (some more)

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index 7fb1d52..731d5ab 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -666,20 +666,20 @@ NPP_NewStream(NPP instance,
 }
 
 
-int32 STREAMBUFSIZE = 0X0FFF;
+int32_t STREAMBUFSIZE = 0X0FFF;
 /* If we are reading from a file in NPAsFile
  * mode so we can take any size stream in our
  * write call (since we ignore it) */
 
-int32
+int32_t
 NPP_WriteReady(NPP /*instance*/, NPStream* /*stream*/)
 {
 return STREAMBUFSIZE;
 }
 
 
-int32
-NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32 /*offset*/, int32 len, 
void* /*buffer*/)
+int32_t
+NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, int32_t 
len, void* /*buffer*/)
 {
 return len; /* The number of bytes accepted */
 }
diff --git a/extensions/source/plugin/base/nfuncs.cxx 
b/extensions/source/plugin/base/nfuncs.cxx
index 113aee5..2f72d93 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -213,7 +213,7 @@ IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl 
)
 
 extern "C" {
 
-void* SAL_CALL NP_LOADDS  NPN_MemAlloc( uint32 nBytes )
+void* SAL_CALL NP_LOADDS  NPN_MemAlloc( uint32_t nBytes )
 {
 TRACE( "NPN_MemAlloc" );
 void* pMem = malloc( nBytes );
@@ -226,7 +226,7 @@ extern "C" {
 free( pMem );
 }
 
-uint32 SAL_CALL NP_LOADDS  NPN_MemFlush( uint32 /*nSize*/ )
+uint32_t SAL_CALL NP_LOADDS  NPN_MemFlush( uint32_t /*nSize*/ )
 {
 TRACE( "NPN_MemFlush" );
 return 0;
@@ -334,7 +334,7 @@ extern "C" {
 return NPERR_NO_ERROR;
 }
 
-NPError SAL_CALL NP_LOADDS  NPN_PostURLNotify( NPP instance, const char* 
url, const char* target, uint32 len, const char* buf, NPBool file, void* 
notifyData )
+NPError SAL_CALL NP_LOADDS  NPN_PostURLNotify( NPP instance, const char* 
url, const char* target, uint32_t len, const char* buf, NPBool file, void* 
notifyData )
 {
 TRACE( "NPN_PostURLNotify" );
 XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance 
);
@@ -376,7 +376,7 @@ extern "C" {
 return NPERR_NO_ERROR;
 }
 
-NPError SAL_CALL NP_LOADDS  NPN_PostURL( NPP instance, const char* url, 
const char* window, uint32 len, const char* buf, NPBool file )
+NPError SAL_CALL NP_LOADDS  NPN_PostURL( NPP instance, const char* url, 
const char* window, uint32_t len, const char* buf, NPBool file )
 {
 TRACE( "NPN_PostURL" );
 XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance 
);
@@ -526,7 +526,7 @@ void SAL_CALL NP_LOADDS  NPN_Version( int* major, int* 
minor, int* net_major, in
 *net_minor = 5;
 }
 
-int32 SAL_CALL NP_LOADDS  NPN_Write( NPP instance, NPStream* stream, int32 len,
+int32_t SAL_CALL NP_LOADDS  NPN_Write( NPP instance, NPStream* stream, int32_t 
len,
  void* buffer )
 {
 TRACE( "NPN_Write" );
diff --git a/extensions/source/plugin/unx/npnapi.cxx 
b/extensions/source/plugin/unx/npnapi.cxx
index 837a1f2..ceb79cc 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -56,7 +56,7 @@ void* CreateNewShell( void**, XLIB_Window );
 // begin Netscape plugin api calls
 extern "C" {
 
-static void* l_NPN_MemAlloc( uint32 nBytes )
+static void* l_NPN_MemAlloc( uint32_t nBytes )
 {
 void* pMem = new char[nBytes];
 return pMem;
@@ -67,7 +67,7 @@ static void l_NPN_MemFree( void* pMem )
 delete [] (char*)pMem;
 }
 
-static uint32 l_NPN_MemFlush( uint32 /*nSize*/ )
+static uint32_t l_NPN_MemFlush( uint32_t /*nSize*/ )
 {
 return 0;
 }
@@ -209,7 +209,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType 
type, const char* targe
 return aRet;
 }
 
-static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* 
target, uint32 len, const char* buf, NPBool file, void* notifyData )
+static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* 
target, uint32_t len, const char* buf, NPBool file, void* notifyData )
 {
 sal_uInt32 nInstance = pConnector->GetNPPID( instance );
 if( nInstance == PluginConnector::UnknownNPPID )
@@ -234,7 +234,7 @@ static NPError l_NPN_PostURLNotify( NPP instance, const 
char* url, const char* t
 return aRet;
 }
 
-static NPError l_NPN_Pos

[Libreoffice-commits] .: sc/RdbTarget_sc_filters_test.mk

2011-11-08 Thread Caolán McNamara
 sc/RdbTarget_sc_filters_test.mk |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit a97b76604fbfa54f73427ca1aed0ec3b3cb256e1
Author: Caolán McNamara 
Date:   Tue Nov 8 12:14:57 2011 +

xsec_xmlsec component filename is different under windows

diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
index cd25567..319cea3 100644
--- a/sc/RdbTarget_sc_filters_test.mk
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -52,11 +52,23 @@ $(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
 unotools/util/utl \
 unoxml/source/rdf/unordf \
 unoxml/source/service/unoxml \
-xmlsecurity/util/xsec_xmlsec \
 xmlsecurity/util/xsec_fw \
 xmlsecurity/util/xmlsecurity \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
+xmlsecurity/util/xsec_xmlsec.windows \
+))
+
+else
+$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
+xmlsecurity/util/xsec_xmlsec \
+))
+
+endif
+
+
 $(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
 configmgr \
 ucb1 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - setup_native/scripts solenv/bin

2011-11-08 Thread Michael Stahl
 setup_native/scripts/fake-db.spec   |3 +++
 solenv/bin/modules/installer/epmfile.pm |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a21546ea4d86eab38c5abf1b27dff20929a2ce12
Author: Michael Stahl 
Date:   Tue Nov 8 12:55:37 2011 +0100

installer: fix RPM requires:

The findrequires scripts are apparently ignored by current RPM.
Apparently an additional variable needs to be defined so they are used.

http://www.redhat.com/archives/rpm-list/2005-August/msg00034.html

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 682967e..049ae8a 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1424,7 +1424,7 @@ sub set_autoprovreq_in_specfile
 
 if ( $findrequires )
 {
-$autoreqprovline = "AutoProv\: no\n%define __find_requires 
$bindir/$findrequires\n";
+$autoreqprovline = "AutoProv\: no\n%define 
_use_internal_dependency_generator 0\n%define __find_requires 
$bindir/$findrequires\n";
 }
 else
 {
commit 7a080d0f46c9c53480a5c6876bb110ae8a657879
Author: Michael Stahl 
Date:   Tue Nov 8 12:54:46 2011 +0100

setup_native: add 64 bit provides to fake-db.rpm

diff --git a/setup_native/scripts/fake-db.spec 
b/setup_native/scripts/fake-db.spec
index e627504..f2d2b52 100644
--- a/setup_native/scripts/fake-db.spec
+++ b/setup_native/scripts/fake-db.spec
@@ -9,8 +9,11 @@ AutoReqProv: no
 %define _tmppath /tmp
 #BuildRoot: %{_tmppath}/%{name}-root
 Provides: libgnomevfs-2.so.0
+Provides: libgnomevfs-2.so.0()(64bit)
 Provides: libgconf-2.so.4
+Provides: libgconf-2.so.4()(64bit)
 Provides: libfreetype.so.6
+Provides: libfreetype.so.6()(64bit)
 Provides: /bin/sh
 Provides: /bin/basename
 Provides: /bin/cat
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2011-11-08 Thread Michael Meeks
 automation/source/server/server.cxx |2 -
 sw/inc/cmdid.h  |   14 
 sw/inc/swcommands.h |   12 +++
 sw/sdi/_basesh.sdi  |   10 +++---
 sw/sdi/basesh.sdi   |2 -
 sw/sdi/swriter.sdi  |   12 +++
 sw/source/ui/app/mn.src |   24 +++---
 sw/source/ui/app/swmodule.cxx   |2 -
 sw/source/ui/ribbar/tbxanchr.cxx|4 +-
 sw/source/ui/ribbar/tbxanchr.src|   10 +++---
 sw/source/ui/shells/basesh.cxx  |   60 ++--
 11 files changed, 76 insertions(+), 76 deletions(-)

New commits:
commit 7d63b777eb7b9b02ba3810c572be6382b7636d61
Author: Korrawit Pruegsanusak 
Date:   Tue Nov 8 15:02:34 2011 +0700

Change ANKER to ANCHOR (fdo#42455)

diff --git a/automation/source/server/server.cxx 
b/automation/source/server/server.cxx
index 83a31be..5f4968a 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -504,7 +504,7 @@ void ExtraIdle::Timeout()
 }
 case 7:
 {
-new StatementSlot( 20384 ); // FN_TOOL_ANKER_CHAR aus SW?
+new StatementSlot( 20384 ); // FN_TOOL_ANCHOR_CHAR from SW?
 return;
 }
 }
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 94d9692..33c287b 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -352,16 +352,16 @@ included in c-context files, so c++ style stuff will 
cause problems.
 #define FN_TOOL_GROUP   (FN_INSERT + 47)/* Group objects */
 #define FN_TOOL_UNGROUP (FN_INSERT + 48)/* Remove Grouping */
 
-#define FN_TOOL_ANKER   (FN_INSERT + 49)/* Draw Anchor for object 
*/
-#define FN_TOOL_ANKER_PAGE  (FN_INSERT + 50)/* anchor Draw object to 
page */
-#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51)/* anchor Draw object to 
paragraph */
+#define FN_TOOL_ANCHOR  (FN_INSERT + 49)/* Draw Anchor for object 
*/
+#define FN_TOOL_ANCHOR_PAGE (FN_INSERT + 50)/* anchor Draw object to 
page */
+#define FN_TOOL_ANCHOR_PARAGRAPH (FN_INSERT + 51)   /* anchor Draw object to 
paragraph */
 #define FN_TOOL_HIERARCHIE  (FN_INSERT + 52)/* change hierarchy */
 
 #define FN_MAILMERGE_WIZARD (FN_INSERT + 64)/* mail merge wizard */
 #define FN_QRY_OPEN_TABLE   (FN_INSERT + 65)/* open database (Basic) */
-#define FN_TOOL_ANKER_FRAME (FN_INSERT + 66)/* anchor Draw-Object to 
frame*/
+#define FN_TOOL_ANCHOR_FRAME(FN_INSERT + 66)/* anchor Draw-Object to 
frame*/
 #define FN_QRY_MERGE(FN_INSERT + 67)/* insert record (serial 
letter) */
-#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68)/* 
back-to-mail-merge-wizard child window*/
+#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68)   /* 
back-to-mail-merge-wizard child window*/
 #define FN_INSERT_SMA   (FN_INSERT + 69)/* insert StarMath  */
 
 #define FN_QRY_GET_COLUMN_NAME  (FN_INSERT + 70)/* number of columns 
(Basic) */
@@ -376,7 +376,7 @@ included in c-context files, so c++ style stuff will cause 
problems.
 #define FN_QRY_DELETE_RECORD(FN_INSERT + 79)/* delete record */
 #define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80)  /* get physical (absolute) 
record number (Basic) */
 
-#define FN_TOOL_ANKER_CHAR   (FN_INSERT + 84)   /* anchor Draw object to 
charater */
+#define FN_TOOL_ANCHOR_CHAR (FN_INSERT + 84)/* anchor Draw object to 
charater */
 
 #define FN_QRY_INSERT   (FN_INSERT + 86)/* insert record selection 
in to text */
 #define FN_QRY_MERGE_FIELD  (FN_INSERT + 87)/* insert record selection 
into fields */
@@ -410,7 +410,7 @@ included in c-context files, so c++ style stuff will cause 
problems.
 #define FN_SBA_BRW_MERGE(FN_INSERT2 + 9)/* serial letter print */
 #define FN_JAVAEDIT (FN_INSERT2 + 10)   /* edit script field */
 #define FN_INSERT_HRULER(FN_INSERT2 + 11)   /* insert horizontal ruler 
*/
-#define FN_TOOL_ANKER_AT_CHAR   (FN_INSERT2 + 12)   /* anchor object to 
character*/
+#define FN_TOOL_ANCHOR_AT_CHAR  (FN_INSERT2 + 12)   /* anchor object to 
character*/
 
 #define FN_INSERT_PAGEHEADER(FN_INSERT2 + 13)   /* insert default header */
 #define FN_INSERT_PAGEFOOTER(FN_INSERT2 + 14)   /* insert default footer */
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 514c40c..411ec5c 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -311,11 +311,11 @@
 #define CMD_FN_ABSTRACT_STARIMPRESS 
".uno:SendAbstractToStarImpress"
 #define CMD_FN_OUTLINE_TO_CLIPBOARD 
".uno:SendOutlineToClipboard"
 #define CMD_FN_OUTLINE_TO_IMPRESS   
".uno:SendOutlineToStarImpress"
-#define CMD_FN_TOOL_ANKER_AT_CHAR   ".uno:SetAnchorAtChar"
-#define CMD_FN_TOOL_ANKER_CHAR  ".uno:SetAnchorToChar"
-#define CMD_FN_TOOL_ANKER_FRAME ".uno:SetAnchorToFrame"
-#define CMD_FN_TOO

[Libreoffice-commits] .: np_sdk/inc

2011-11-08 Thread Fridrich Strba
 np_sdk/inc/npapi.h |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 29f83de2465c6151036b65ea326432fd9b16572c
Author: Fridrich Å trba 
Date:   Tue Nov 8 11:33:31 2011 +0100

Unbreak windows build

diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h
index e6907be..d67dcd3 100644
--- a/np_sdk/inc/npapi.h
+++ b/np_sdk/inc/npapi.h
@@ -784,10 +784,7 @@ extern "C" {
 
 /* NPP_* functions are provided by the plugin and called by the navigator. */
 
-#if defined(XP_UNIX)
 char* NPP_GetMIMEDescription(void);
-#endif
-
 NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
   uint16_t mode, int16_t argc, char* argn[],
   char* argv[], NPSavedData* saved);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: cui/source dbaccess/source framework/source readlicense_oo/docs reportdesign/source sc/source sd/source svx/source sw/source

2011-11-08 Thread Andras Timar
 cui/source/dialogs/sdrcelldlg.src|6 --
 cui/source/options/optchart.src  |5 --
 dbaccess/source/ui/inc/toolbox_tmpl.hrc  |1 
 framework/source/classes/resource.src|7 ---
 reportdesign/source/ui/dlg/dlgpage.src   |   16 ---
 reportdesign/source/ui/inspection/inspection.src |2 
 reportdesign/source/ui/report/report.src |   13 -
 sc/source/ui/drawfunc/objdraw.src|   25 ---
 sc/source/ui/src/sortdlg.src |1 
 sd/source/core/glob.src  |1 
 svx/source/stbctrls/stbctrls.src |1 
 sw/source/ui/config/optdlg.src   |1 
 sw/source/ui/config/optload.src  |1 
 sw/source/ui/inc/toolbox.hrc |3 -
 sw/source/ui/lingu/olmenu.src|1 
 sw/source/ui/misc/titlepage.src  |   14 --
 sw/source/ui/shells/shells.src   |   50 ---
 17 files changed, 148 deletions(-)

New commits:
commit a2dacd920513485140254729f23ed932c52cdad4
Author: Andras Timar 
Date:   Tue Nov 8 11:28:33 2011 +0100

remove empty Text [ x-comment ] entries

diff --git a/cui/source/dialogs/sdrcelldlg.src 
b/cui/source/dialogs/sdrcelldlg.src
index 7f03cc9..ebb5126 100644
--- a/cui/source/dialogs/sdrcelldlg.src
+++ b/cui/source/dialogs/sdrcelldlg.src
@@ -50,7 +50,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_CHAR_NAME ;
 Text [ de ] = "Schrift" ;
 Text [ en-US ] = "Font" ;
-Text [ x-comment ] = " ";
 };
 PageItem
 {
@@ -58,7 +57,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_CHAR_EFFECTS ;
 Text [ de ] = "Schrifteffekt" ;
 Text [ en-US ] = "Font Effects" ;
-Text [ x-comment ] = " ";
 };
 PageItem
 {
@@ -66,7 +64,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_BORDER;
 Text [ de ] = "Umrandung" ;
 Text [ en-US ] = "Borders" ;
-Text [ x-comment ] = " ";
 };
 PageItem
 {
@@ -74,7 +71,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_AREA;
 Text [ de ] = "Hintergrund";
 Text [ en-US ] = "Background";
-Text [ x-comment ] = " ";
 };
 };
 };
@@ -103,7 +99,5 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 Text [ de ] = "Zurück" ;
 Text [ en-US ] = "Return" ;
 TabStop = TRUE ;
-Text [ x-comment ] = " ";
 };
-Text [ x-comment ] = " ";
 };
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 425fbcf..7c95d04 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -42,7 +42,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 6 , 3  ) ;
 Size= MAP_APPFONT ( 80 , 8 ) ;
 Text [ en-US ] = "Chart colors";
-Text [ x-comment ] = " ";
 };
 ListBox LB_CHART_COLOR_LIST
 {
@@ -58,7 +57,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 92 , 3  ) ;
 Size= MAP_APPFONT ( 106 , 8 ) ;
 Text [ en-US ]  = "Color table" ;
-Text [ x-comment ] = " ";
 };
 Control CT_COLOR_BOX
 {
@@ -72,14 +70,12 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 204 , 15 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = "~Add";
-Text [ x-comment ] = " ";
 };
 PushButton PB_REMOVE_CHART_COLOR
 {
 Pos = MAP_APPFONT ( 204 , 32 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = "~Remove";
-Text [ x-comment ] = " ";
 };
 PushButton PB_RESET_TO_DEFAULT
 {
@@ -87,7 +83,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 204 , 165 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = "~Default";
-Text [ x-comment ] = " ";
 };
 };
 
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc 
b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index dfd035d..524646b 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -33,7 +33,6 @@
 #define MID_SBA_QRY_REFRESH \
 Identifier = ID_BROWSER_REFRESH ; \
 Text [ en-US ] = "Refresh"; \
-Text [ x-comment ] = " ";   \
 
 
 #define MID_NEW_VIEW_DESIGN \
diff --git a/framework/source/classes/resource.src 
b/framework/source/classes/resource.src
index c1af6eb..2a9bf0d 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -320,41 +320,34 @@ String STR_UNTITLED_DOCUMENT
 String STR_LANGSTATUS_MULTIPLE_LANGUAGES
 {
 Text [ en-US ] = "Multiple Langu

[Libreoffice-commits] .: l10ntools/source

2011-11-08 Thread Andras Timar
 l10ntools/source/export.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 527f070dd5738f4647eb2b7f9e629b0107aad14d
Author: Andras Timar 
Date:   Tue Nov 8 11:10:05 2011 +0100

remove unused global variables

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 672a8cf..7a3355c 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -76,10 +76,6 @@ ByteString sFile;
 MergeDataFile *pMergeDataFile;
 FILE *pTempFile;
 
-
-ByteString sStrBuffer;
-bool bMarcro = false;
-
 extern "C" {
 // the whole interface to lexer is in this extern "C" section
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 3 commits - cui/source editeng/inc editeng/source extensions/source svtools/inc svtools/source svx/inc svx/source unusedcode.easy

2011-11-08 Thread Caolán McNamara
 cui/source/customize/cfg.cxx|   56 
 cui/source/inc/cfg.hxx  |2 
 editeng/inc/editeng/lcolitem.hxx|1 
 editeng/source/items/textitem.cxx   |7 --
 extensions/source/plugin/base/makefile.mk   |1 
 extensions/source/plugin/base/nfuncs.cxx|   38 ++---
 extensions/source/plugin/base/xplugin.cxx   |   12 ++--
 extensions/source/plugin/inc/plugin/plcom.hxx   |4 -
 extensions/source/plugin/inc/plugin/unx/sysplug.hxx |4 -
 extensions/source/plugin/unx/npnapi.cxx |6 +-
 extensions/source/plugin/unx/nppapi.cxx |6 +-
 svtools/inc/svtools/ivctrl.hxx  |2 
 svtools/source/contnr/ivctrl.cxx|8 --
 svx/inc/svx/dlgctl3d.hxx|1 
 svx/inc/svx/fntctrl.hxx |2 
 svx/source/dialog/dlgctl3d.cxx  |   11 ---
 svx/source/dialog/fntctrl.cxx   |   15 -
 unusedcode.easy |   13 
 18 files changed, 35 insertions(+), 154 deletions(-)

New commits:
commit cfe3d74c60169b1b0ca010b31b8e5d705c0f58a7
Author: Caolán McNamara 
Date:   Tue Nov 8 10:01:22 2011 +

fix build against new npapi.h

diff --git a/extensions/source/plugin/base/makefile.mk 
b/extensions/source/plugin/base/makefile.mk
index 3049d9e..a7e28f8 100644
--- a/extensions/source/plugin/base/makefile.mk
+++ b/extensions/source/plugin/base/makefile.mk
@@ -37,7 +37,6 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
 .IF "$(SOLAR_JAVA)" != ""
 INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
 INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-CDEFS+=-DOJI
 .ENDIF
 
 .IF "$(WITH_MOZILLA)" != "NO"
diff --git a/extensions/source/plugin/base/nfuncs.cxx 
b/extensions/source/plugin/base/nfuncs.cxx
index 571ead1..113aee5 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -96,6 +96,24 @@ using ::rtl::OUString;
 using ::rtl::OString;
 using ::rtl::OStringToOUString;
 
+// Move deprecated functions which no longer appear in npapi.h before
+// their use to avoid errors that they're undeclared at point of use
+extern "C"
+{
+const JRIEnvInterface** SAL_CALL NP_LOADDS  NPN_GetJavaEnv()
+{
+TRACE( "NPN_GetJavaEnv" );
+// no java in this program
+return NULL;
+}
+
+jref SAL_CALL NP_LOADDS  NPN_GetJavaPeer( NPP /*instance*/ )
+{
+TRACE( "NPN_GetJavaPeer" );
+return NULL;
+}
+}
+
 NPNetscapeFuncs aNPNFuncs =
 {
 sizeof( NPNetscapeFuncs ),
@@ -112,13 +130,8 @@ NPNetscapeFuncs aNPNFuncs =
 NPN_MemFree,
 NPN_MemFlush,
 NPN_ReloadPlugins,
-#ifdef OJI
 NPN_GetJavaEnv,
 NPN_GetJavaPeer,
-#else
-0,
-0,
-#endif
 NPN_GetURLNotify,
 NPN_PostURLNotify,
 NPN_GetValue,
@@ -238,21 +251,6 @@ extern "C" {
 return NPERR_NO_ERROR;
 }
 
-#ifdef OJI
-const JRIEnvInterface** SAL_CALL NP_LOADDS  NPN_GetJavaEnv()
-{
-TRACE( "NPN_GetJavaEnv" );
-// no java in this program
-return NULL;
-}
-
-jref SAL_CALL NP_LOADDS  NPN_GetJavaPeer( NPP /*instance*/ )
-{
-TRACE( "NPN_GetJavaPeer" );
-return NULL;
-}
-#endif
-
 NPError SAL_CALL NP_LOADDS  NPN_GetURL( NPP instance, const char* url, 
const char* window )
 {
 TRACES( "NPN_GetURL", url );
diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index fd202ad..5573176 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -562,7 +562,7 @@ void XPlugin_Impl::loadPlugin()
   m_aEncoding).getStr(),
  getNPPInstance(),
  m_aPluginMode == PluginMode::FULL ? NP_FULL : NP_EMBED,
- ::sal::static_int_cast< int16, int >( m_nArgs ),
+ ::sal::static_int_cast< int16_t, int >( m_nArgs ),
  (char**)(m_nArgs ? m_pArgn : NULL),
  (char**)(m_nArgs ? m_pArgv : NULL),
  NULL );
@@ -595,8 +595,8 @@ void XPlugin_Impl::loadPlugin()
 
 m_aNPWindow.clipRect.top= 0;
 m_aNPWindow.clipRect.left   = 0;
-m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16, 
sal_Int32 >( aPosSize.Height );
-m_aNPWindow.clipRect.right  = ::sal::static_int_cast< uint16, 
sal_Int32 >( aPosSize.Width );
+m_aNPWindow.clipRect.bottom = ::sal::static_int_cast< uint16_t, 
sal_Int32 >( aPosSize.Height );
+m_aNPWindow.clipRect.right  = ::sal::static_int_cast< uint16_t, 
sal_Int32 >( aPosSize.Width );
 m_aNPWindow.type = NPWindowTypeWindow;
 
 m_aNPWindow.x   = 0;
@@ -742,7 +742,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& 
mimetype,
  if( iter != m_aPEventListeners.e

[Libreoffice-commits] .: l10ntools/source

2011-11-08 Thread Andras Timar
 l10ntools/source/cfgmerge.cxx  |4 
 l10ntools/source/helpmerge.cxx |4 
 l10ntools/source/merge.cxx |4 
 3 files changed, 12 deletions(-)

New commits:
commit 881a93d3ab969454d52de1af95004ff3fbd5918f
Author: Andras Timar 
Date:   Tue Nov 8 10:47:07 2011 +0100

MERGE_SOURCE_LANGUAGES is never defined, removing ifdefs

diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 1fc568e..437e309 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -763,10 +763,6 @@ void CfgMerge::WorkOnText(
 if ( Export::isAllowed( nLangIndex ) &&
 ( sContent != "-" ) && ( sContent.Len()))
 {
-#ifdef MERGE_SOURCE_LANGUAGES
-if( nLangIndex.EqualsIgnoreCaseAscii("de") || 
nLangIndex.EqualsIgnoreCaseAscii("en-US") )
-rText = sContent;
-#endif
 Export::QuotHTML( rText );
 }
 }
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 9e744b2..214105c 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -550,11 +550,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const 
ByteString& sCur , Re
 
 pEntrys = NULL;
 
-#ifdef MERGE_SOURCE_LANGUAGES
-if( true ){  // Merge en-US!
-#else
 if( !sCur.EqualsIgnoreCaseAscii("en-US") ){
-#endif
 pXMLElement = (*aLangHM)[ "en-US" ];
 if( pXMLElement == NULL )
 {
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index d98f9ea..a42f058 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -222,11 +222,7 @@ MergeDataFile::MergeDataFile(
 const ByteString sTITLE = sLine.GetToken( 0, '\t', rIdx );  // 
13
 
 
-#ifdef MERGE_SOURCE_LANGUAGES
-if( true )
-#else
 if( !nLANG.EqualsIgnoreCaseAscii("en-US") )
-#endif
 {
 aLanguageSet.insert(nLANG);
 InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, 
sQHTEXT, sTITLE, filename, bCaseSensitive );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: configure.in

2011-11-08 Thread Tor Lillqvist
 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9b0d9a2ace6d51363f2360621aae44f1b353e4df
Author: Tor Lillqvist 
Date:   Tue Nov 8 11:13:52 2011 +0200

Fix syntax errors

1) It is not safe to use the [ command in configure.in; m4 will eat
the [ and ] and they will expand to nothing. (Just look in the
configure script produced prior to this commit.) Use the test command
instead, as elsewhere in the file.

2) Quote the variable being tested for emptiness with test
-z. Otherwise, if it *is* empty, the -z will apply to (and eat) the
following word, "then", which is not what is intended, and which also
causes a syntax error.

diff --git a/configure.in b/configure.in
index ea8eb4c..a6b135a 100644
--- a/configure.in
+++ b/configure.in
@@ -2009,7 +2009,7 @@ if test "$_os" = "Darwin" ; then
 MAC_OS_X_VERSION_MIN_REQUIRED="1050"
 AC_MSG_WARN([Building with a minimum version requirement > 10.4 break 
10.4 compatibility. do not use for deliverable build])
 echo "Building with a minimum version requirement > 10.4 break 10.4 
compatibility. do not use for deliverable build" >>warn
-if [ -z $save_CC ] ; then
+if test -z "$save_CC" ; then
 CC="gcc-4.2 -m32"
 CXX="g++-4.2 -m32"
 fi
@@ -2018,7 +2018,7 @@ if test "$_os" = "Darwin" ; then
 MAC_OS_X_VERSION_MIN_REQUIRED="1060"
 AC_MSG_WARN([Building with a minimum version requirement > 10.4 break 
10.4 compatibility. do not use for deliverable build])
 echo "Building with a minimum version requirement > 10.4 break 10.4 
compatibility. do not use for deliverable build" >>warn
-if [ -z "$save_CC" ] ; then
+if test -z "$save_CC" ; then
 CC="gcc-4.2 -m32"
 CXX="g++-4.2 -m32"
 fi
@@ -2027,7 +2027,7 @@ if test "$_os" = "Darwin" ; then
 MAC_OS_X_VERSION_MIN_REQUIRED="1070"
 AC_MSG_WARN([Building with a minimum version requirement > 10.4 break 
10.4 compatibility. do not use for deliverable build])
 echo "Building with a minimum version requirement > 10.4 break 10.4 
compatibility. do not use for deliverable build" >>warn
-if [ -z "$save_CC" ] ; then
+if test -z "$save_CC" ; then
 CC="gcc-4.2 -m32"
 CXX="g++-4.2 -m32"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: README.cross solenv/gbuild solenv/inc

2011-11-08 Thread Tor Lillqvist
 README.cross  |4 ++--
 solenv/gbuild/platform/android.mk |7 +--
 solenv/inc/unxandr.mk |   15 ++-
 3 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb
Author: Tor Lillqvist 
Date:   Tue Nov 8 10:04:58 2011 +0200

Just put the Android ARM compiler options in the mk files

diff --git a/README.cross b/README.cross
index 7e8c184..6327ea8 100644
--- a/README.cross
+++ b/README.cross
@@ -318,8 +318,8 @@ Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
 SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CC=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot 
/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CXX=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot 
/home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I 
/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include 
-I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a 
-fexceptions -frtti
+CC=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
+CXX=ccache 
/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++
 --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I 
/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include 
-I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a 
-fexceptions -frtti
 
AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
 
NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
 
OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
diff --git a/solenv/gbuild/platform/android.mk 
b/solenv/gbuild/platform/android.mk
index 03f85ec..ba51109 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -31,11 +31,14 @@
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DARM32
 gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fno-omit-frame-pointer
-gb_CFLAGS += -fno-omit-frame-pointer
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+# See /docs/STANDALONE-TOOLCHAIN.html
+gb_LinkTarget_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-fno-omit-frame-pointer
+gb_LinkTarget_CXXFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-fno-omit-frame-pointer
+gb_LinkTarget_LDFLAGS += -Wl,--fix-cortex-a8
+
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 56ed49d..fdf9b6d 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -29,10 +29,18 @@
 
 CDEFAULTOPT=-Os
 .INCLUDE : unxgcc.mk
+
+# Amend some macros set by unxgcc.mk
+
 CDEFS+=-DARM32
-CFLAGS+=-fno-omit-frame-pointer
+CFLAGS+=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-fno-omit-frame-pointer
+
+LINKFLAGS+=-Wl,--fix-cortex-a8
 
-# Override some macros set by unxgcc.mk
+STDLIBGUIMT+=-llog -landroid
+STDLIBCUIMT+=-llog -landroid
+
+# Completely override some others
 
 # We don't build any "tool" style programs for non-desktop OSes like
 # Android. Just unit tests and GUI programs. (Well, that is in
@@ -45,6 +53,3 @@ CFLAGS+=-fno-omit-frame-pointer
 LINKFLAGSAPPGUI=-shared
 LINKFLAGSAPPCUI=-shared
 
-STDLIBGUIMT+=-llog -landroid
-STDLIBCUIMT+=-llog -landroid
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits