[Libreoffice-commits] .: 6 commits - sfx2/inc sfx2/source svtools/inc svtools/source sw/source

[August Sodora]

 sfx2/inc/arrdecl.hxx  |8 -
 sfx2/inc/sfx2/docfac.hxx  |1 
 sfx2/source/control/dispatch.cxx  |   19 
 svtools/inc/svtools/svparser.hxx  |6 ++-
 svtools/source/config/fontsubstconfig.cxx |   47 ++
 svtools/source/svrtf/svparser.cxx |9 +
 sw/source/core/doc/doctxm.cxx |   18 ---
 7 files changed, 43 insertions(+), 65 deletions(-)

New commits:
commit 411d8c2dd1cb3a9a6dbd78f34852e46c6e80f904
Author: August Sodora 
Date:   Sat Jan 21 01:53:20 2012 -0500

SV_DECL_PTRARR_DEL->boost::ptr_vector

diff --git a/svtools/source/config/fontsubstconfig.cxx 
b/svtools/source/config/fontsubstconfig.cxx
index 7f9af4e..57ef122 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -26,17 +26,17 @@
  *
  /
 
-
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-
 #include 
 #include 
 
+#include 
+
 using namespace utl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -54,11 +54,8 @@ const sal_Char cSubstituteFont[]= "SubstituteFont";
 const sal_Char cOnScreenOnly[]  = "OnScreenOnly";
 const sal_Char cAlways[]= "Always";
 
-//-
-typedef SubstitutionStruct* SubstitutionStructPtr;
-SV_DECL_PTRARR_DEL(SubstitutionStructArr, SubstitutionStructPtr, 2, 2)
-SV_IMPL_PTRARR(SubstitutionStructArr, SubstitutionStructPtr);
-//-
+typedef boost::ptr_vector SubstitutionStructArr;
+
 struct SvtFontSubstConfig_Impl
 {
 SubstitutionStructArr   aSubstArr;
@@ -101,12 +98,12 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
 nName = 0;
 for(nNode = 0; nNode < aNodeNames.getLength(); nNode++)
 {
-SubstitutionStructPtr pInsert = new SubstitutionStruct;
+SubstitutionStruct* pInsert = new SubstitutionStruct;
 pNodeValues[nName++] >>= pInsert->sFont;
 pNodeValues[nName++] >>= pInsert->sReplaceBy;
 pInsert->bReplaceAlways = *(sal_Bool*)pNodeValues[nName++].getValue();
 pInsert->bReplaceOnScreenOnly = 
*(sal_Bool*)pNodeValues[nName++].getValue();
-pImpl->aSubstArr.Insert(pInsert, pImpl->aSubstArr.Count());
+pImpl->aSubstArr.push_back(pInsert);
 }
 }
 
@@ -128,11 +125,11 @@ void SvtFontSubstConfig::Commit()
 PutProperties(aNames, aValues);
 
 OUString sNode(C2U(cFontPairs));
-if(!pImpl->aSubstArr.Count())
+if(pImpl->aSubstArr.empty())
 ClearNodeSet(sNode);
 else
 {
-Sequence aSetValues(4 * pImpl->aSubstArr.Count());
+Sequence aSetValues(4 * pImpl->aSubstArr.size());
 PropertyValue* pSetValues = aSetValues.getArray();
 sal_Int32 nSetValue = 0;
 
@@ -142,22 +139,22 @@ void SvtFontSubstConfig::Commit()
 const OUString sOnScreenOnly(C2U(cOnScreenOnly));
 
 const uno::Type& rBoolType = ::getBooleanCppuType();
-for(sal_uInt16 i = 0; i < pImpl->aSubstArr.Count(); i++)
+for(size_t i = 0; i < pImpl->aSubstArr.size(); i++)
 {
 OUString sPrefix(sNode);
 sPrefix += C2U("/_");
 sPrefix += OUString::valueOf((sal_Int32)i);
 sPrefix += C2U("/");
 
-SubstitutionStructPtr pSubst = pImpl->aSubstArr[i];
+SubstitutionStruct& pSubst = pImpl->aSubstArr[i];
 pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name 
+= sReplaceFont;
-pSetValues[nSetValue++].Value <<= pSubst->sFont;
+pSetValues[nSetValue++].Value <<= pSubst.sFont;
 pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name 
+= sSubstituteFont;
-pSetValues[nSetValue++].Value <<= pSubst->sReplaceBy;
+pSetValues[nSetValue++].Value <<= pSubst.sReplaceBy;
 pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name 
+= sAlways;
-pSetValues[nSetValue++].Value.setValue(&pSubst->bReplaceAlways, 
rBoolType);
+pSetValues[nSetValue++].Value.setValue(&pSubst.bReplaceAlways, 
rBoolType);
 pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name 
+= sOnScreenOnly;
-
pSetValues[nSetValue++].Value.setValue(&pSubst->bReplaceOnScreenOnly, 
rBoolType);
+
pSetValues[nSetValue++].Value.setValue(&pSubst.bReplaceOnScreenOnly, rBoolType);
 }
 ReplaceSetProperties(sNode, aSetValues);
 }
@@ -165,26 +162,26 @@ void SvtFontSubstConfig::Commit()
 
 sal_Int32 SvtFontSubstConfig::SubstitutionCount() const
 {
-return pImpl->aSubstArr.Count();
+return pImpl->aSubstArr.size();
 }
 
 void SvtFontSubstConfig::ClearSubstitutions()
 {
-pImpl->aSubstArr.DeleteAndDestroy(0, pImpl->aSubstArr.Count());
+pImpl->aSubstArr.clear();
 }
 
 c

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

[Kohei Yoshida]

 sc/inc/rangenam.hxx  |1 +
 sc/source/core/tool/rangenam.cxx |9 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit de8d1f922acca8e0df5ecb016d27126124e2c3d1
Author: Kohei Yoshida 
Date:   Sat Jan 21 01:08:32 2012 -0500

Oops I shouldn't have erased names directly.

We always need to remove the index map when removing a name.

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index ce0e208..53e9ec8 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -230,6 +230,7 @@ public:
 SC_DLLPUBLIC bool insert(ScRangeData* p);
 
 void erase(const ScRangeData& r);
+void erase(const rtl::OUString& rName);
 
 /**
  * Erase by iterator position.  Note that this method doesn't check for
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index da92c7c..3de3b22 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -894,7 +894,7 @@ bool ScRangeName::insert(ScRangeData* p)
 }
 
 rtl::OUString aName(p->GetUpperName());
-maData.erase(aName); // ptr_map won't insert it if a duplicate name exists.
+erase(aName); // ptr_map won't insert it if a duplicate name exists.
 pair r = maData.insert(aName, p);
 if (r.second)
 {
@@ -909,7 +909,12 @@ bool ScRangeName::insert(ScRangeData* p)
 
 void ScRangeName::erase(const ScRangeData& r)
 {
-DataType::iterator itr = maData.find(r.GetUpperName());
+erase(r.GetUpperName());
+}
+
+void ScRangeName::erase(const rtl::OUString& rName)
+{
+DataType::iterator itr = maData.find(rName);
 if (itr != maData.end())
 erase(itr);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/rangenam.hxx  |1 +
 sc/source/core/tool/rangenam.cxx |9 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8a449369b50db65423d709000891fec25d9dba54
Author: Kohei Yoshida 
Date:   Sat Jan 21 01:08:32 2012 -0500

Oops I shouldn't have erased names directly.

We always need to remove the index map when removing a name.

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index ce0e208..53e9ec8 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -230,6 +230,7 @@ public:
 SC_DLLPUBLIC bool insert(ScRangeData* p);
 
 void erase(const ScRangeData& r);
+void erase(const rtl::OUString& rName);
 
 /**
  * Erase by iterator position.  Note that this method doesn't check for
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 214c17b..ed8b5d3 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -894,7 +894,7 @@ bool ScRangeName::insert(ScRangeData* p)
 }
 
 rtl::OUString aName(p->GetUpperName());
-maData.erase(aName); // ptr_map won't insert it if a duplicate name exists.
+erase(aName); // ptr_map won't insert it if a duplicate name exists.
 pair r = maData.insert(aName, p);
 if (r.second)
 {
@@ -909,7 +909,12 @@ bool ScRangeName::insert(ScRangeData* p)
 
 void ScRangeName::erase(const ScRangeData& r)
 {
-DataType::iterator itr = maData.find(r.GetUpperName());
+erase(r.GetUpperName());
+}
+
+void ScRangeName::erase(const rtl::OUString& rName)
+{
+DataType::iterator itr = maData.find(rName);
 if (itr != maData.end())
 erase(itr);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/rangenam.hxx  |2 +-
 sc/source/core/tool/rangenam.cxx |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 657b3c889ae107d9ccaaab569929a3a1abde3200
Author: Kohei Yoshida 
Date:   Sat Jan 21 00:08:29 2012 -0500

fdo#44831: Named range should overwrite existing name.

When inserting a new named range, it should overwrite any existing
name if one exists.  That was the old behavior in 3.3 prior to my
range name rework, and because of ptr_map not overwriting existing
key, that behavior had changed unintentionally.

Let's revert to the old behavior.

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 0e8de43..ce0e208 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -222,7 +222,7 @@ public:
 SC_DLLPUBLIC size_t size() const;
 bool empty() const;
 
-/** Insert object into set if not a duplicate.
+/** Insert object into set.
 @ATTENTION: The underlying ::boost::ptr_set_adapter::insert(p) takes
 ownership of p and if it can't insert it deletes the object! So, if
 this insert here returns false the object where p pointed to is gone!
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 0766f00..da92c7c 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -894,6 +894,7 @@ bool ScRangeName::insert(ScRangeData* p)
 }
 
 rtl::OUString aName(p->GetUpperName());
+maData.erase(aName); // ptr_map won't insert it if a duplicate name exists.
 pair r = maData.insert(aName, p);
 if (r.second)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/rangenam.hxx  |2 +-
 sc/source/core/tool/rangenam.cxx |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4a00c3d74cd2d0d9905224b8f781dcb8d2ff3f1e
Author: Kohei Yoshida 
Date:   Sat Jan 21 00:08:29 2012 -0500

fdo#44831: Named range should overwrite existing name.

When inserting a new named range, it should overwrite any existing
name if one exists.  That was the old behavior in 3.3 prior to my
range name rework, and because of ptr_map not overwriting existing
key, that behavior had changed unintentionally.

Let's revert to the old behavior.

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 0e8de43..ce0e208 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -222,7 +222,7 @@ public:
 SC_DLLPUBLIC size_t size() const;
 bool empty() const;
 
-/** Insert object into set if not a duplicate.
+/** Insert object into set.
 @ATTENTION: The underlying ::boost::ptr_set_adapter::insert(p) takes
 ownership of p and if it can't insert it deletes the object! So, if
 this insert here returns false the object where p pointed to is gone!
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 8ebcc76..214c17b 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -894,6 +894,7 @@ bool ScRangeName::insert(ScRangeData* p)
 }
 
 rtl::OUString aName(p->GetUpperName());
+maData.erase(aName); // ptr_map won't insert it if a duplicate name exists.
 pair r = maData.insert(aName, p);
 if (r.second)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py

[Kohei Yoshida]

 src/xlsrecord.py |   30 +-
 src/xlsstream.py |3 ++-
 2 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit ae360336389ce7cf15cc7501cf50454ae5929e2c
Author: Kohei Yoshida 
Date:   Fri Jan 20 23:19:32 2012 -0500

Parse shared formula records.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 11c2fce..9e31317 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -1,6 +1,6 @@
 
 #
-#  Copyright (c) 2010 Kohei Yoshida
+#  Copyright (c) 2010-2012 Kohei Yoshida
 #  
 #  Permission is hereby granted, free of charge, to any person
 #  obtaining a copy of this software and associated documentation
@@ -2631,6 +2631,34 @@ class FeatureHeader(BaseRecordHandler):
 
 return
 
+class ShrFmla(BaseRecordHandler):
+
+def __parseBytes (self):
+self.ref = RefU(self)
+self.readBytes(1) # 8-bits reserved
+self.cUse = self.readUnsignedInt(1)
+lenFormula = self.readUnsignedInt(2)
+self.tokens = self.readBytes(lenFormula)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLine("range: %s"%self.ref.toString())
+self.appendLine("cell count: %d"%self.cUse)
+self.appendLine("formula token length: %d"%len(self.tokens))
+if len(self.tokens):
+ftext = None
+try:
+parser = formula.FormulaParser(self.header, self.tokens)
+parser.parse()
+ftext = parser.getText()
+except formula.FormulaParserError as e:
+ftext = "(Error: %s)"%e.args[0]
+if ftext != None:
+self.appendLine("formula: %s"%ftext)
+
+
+
+
 # ---
 # SX - Pivot Table
 
diff --git a/src/xlsstream.py b/src/xlsstream.py
index bb9f6ae..57b5e13 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -1,6 +1,6 @@
 
 #
-#  Copyright (c) 2010 Kohei Yoshida
+#  Copyright (c) 2010-2012 Kohei Yoshida
 #  
 #  Permission is hereby granted, free of charge, to any person
 #  obtaining a copy of this software and associated documentation
@@ -220,6 +220,7 @@ recData = {
 0x027E: ["RK", "Cell with Encoded Integer or Floating-Point", 
xlsrecord.RK],
 0x0293: ["STYLE", "Style Information", xlsrecord.Style],
 0x041E: ["FORMAT", "Number Format", xlsrecord.Format],
+0x04BC: ["SHRFMLA", "Shared Formula", xlsrecord.ShrFmla],
 0x0802: ["QSISXTAG", "Pivot Table and Query Table Extensions", 
xlsrecord.PivotQueryTableEx],
 0x0809: ["BOF", "Beginning of File", xlsrecord.BOF],
 0x0810: ["SXVIEWEX9", "Pivot Table Extensions", xlsrecord.SXViewEx9],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 sc/source/filter/xml/XMLStylesExportHelper.cxx |   87 +
 1 file changed, 74 insertions(+), 13 deletions(-)

New commits:
commit 0a646ae118e0a376481fc3cbc945031702b26c1a
Author: Eike Rathke 
Date:   Sat Jan 21 01:15:02 2012 +0100

Resolves fdo#43725 crash on saving a file

+ Checks out-of-bounds accesses in
  ScFormatRangeStyles::GetStyleNameIndex() and
  ScRowFormatRanges::AddRange() and prevents crashes.
- The real cause seems to be some style row/repeat miscalculation
  elsewhere, further investigation would be necessary.

Signed-off-by: Norbert Thiebaud 

diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx 
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 5ae0485..38d1523 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -680,10 +680,35 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange& 
rFormatRange,
 const sal_Int32 nRow)
 {
 DBG_ASSERT(pRowDefaults, "no row defaults");
+if (!pRowDefaults)
+return;
 DBG_ASSERT(pColDefaults, "no column defaults");
+if (!pColDefaults)
+return;
+sal_Int32 nPrevIndex;
+bool bPrevAutoStyle;
+OSL_ENSURE( static_cast(nRow) < pRowDefaults->size(), "nRow out of 
bounds");
+if (!(static_cast(nRow) < pRowDefaults->size()))
+{
+/* This is only to prevent out-of-bounds accesses, once reached here
+ * there's something else going wrong, so FIXME there! */
+if (pRowDefaults->empty())
+{
+nPrevIndex = -1;
+bPrevAutoStyle = false;
+}
+else
+{
+nPrevIndex = (*pRowDefaults)[pRowDefaults->size()-1].nIndex;
+bPrevAutoStyle = 
(*pRowDefaults)[pRowDefaults->size()-1].bIsAutoStyle;
+}
+}
+else
+{
+nPrevIndex = (*pRowDefaults)[nRow].nIndex;
+bPrevAutoStyle = (*pRowDefaults)[nRow].bIsAutoStyle;
+}
 sal_uInt32 nEnd (rFormatRange.nRepeatRows + nRow - 1);
-sal_Int32 nPrevIndex((*pRowDefaults)[nRow].nIndex);
-sal_Bool bPrevAutoStyle((*pRowDefaults)[nRow].bIsAutoStyle);
 sal_uInt32 i(nRow + 1);
 sal_Bool bReady(false);
 while ((i < nEnd) && !bReady && (i < pRowDefaults->size()))
@@ -700,12 +725,34 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange& 
rFormatRange,
 rFormatRange.nRepeatRows = i - nRow + 1;
 if (nPrevIndex == -1)
 {
-nPrevIndex = (*pColDefaults)[rFormatRange.nStartColumn].nIndex;
-bPrevAutoStyle = 
(*pColDefaults)[rFormatRange.nStartColumn].bIsAutoStyle;
 sal_uInt32 nPrevStartCol(rFormatRange.nStartColumn);
-sal_uInt32 nRepeat((*pColDefaults)[rFormatRange.nStartColumn].nRepeat);
-nEnd = rFormatRange.nStartColumn + rFormatRange.nRepeatColumns;
-for(i = nPrevStartCol + nRepeat; i < nEnd; i += 
(*pColDefaults)[i].nRepeat)
+OSL_ENSURE( static_cast(nPrevStartCol) < pColDefaults->size(), 
"nPrevStartCol out of bounds");
+sal_uInt32 nRepeat;
+if (static_cast(nPrevStartCol) < pColDefaults->size())
+{
+nRepeat = (*pColDefaults)[nPrevStartCol].nRepeat;
+nPrevIndex = (*pColDefaults)[nPrevStartCol].nIndex;
+bPrevAutoStyle = (*pColDefaults)[nPrevStartCol].bIsAutoStyle;
+}
+else
+{
+/* Again, this is to prevent out-of-bounds accesses, so FIXME
+ * elsewhere! */
+if (pColDefaults->empty())
+{
+nRepeat = 1;
+nPrevIndex = -1;
+bPrevAutoStyle = false;
+}
+else
+{
+nRepeat = (*pColDefaults)[pColDefaults->size()-1].nRepeat;
+nPrevIndex = (*pColDefaults)[pColDefaults->size()-1].nIndex;
+bPrevAutoStyle = 
(*pColDefaults)[pColDefaults->size()-1].bIsAutoStyle;
+}
+}
+nEnd = nPrevStartCol + rFormatRange.nRepeatColumns;
+for(i = nPrevStartCol + nRepeat; i < nEnd && i < pColDefaults->size(); 
i += (*pColDefaults)[i].nRepeat)
 {
 DBG_ASSERT(sal_uInt32(nPrevStartCol + nRepeat) <= nEnd, "something 
wents wrong");
 if ((nPrevIndex != (*pColDefaults)[i].nIndex) ||
@@ -924,6 +971,8 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const 
sal_Int32 nTable,
 const sal_Int32 nColumn, const sal_Int32 nRow, sal_Bool& bIsAutoStyle) 
const
 {
 DBG_ASSERT(static_cast(nTable) < aTables.size(), "wrong table");
+if (!(static_cast(nTable) < aTables.size()))
+return -1;
 ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]);
 ScMyFormatRangeAddresses::iterator aItr(pFormatRanges->begin());
 ScMyFormatRangeAddresses::iterator aEndItr(pFormatRanges->end());
@@ -947,6 +996,8 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const 
sal_Int32 nTable, const s
 sal_Bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& 
nNumbe

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/ui/view/gridwin4.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 54d7fc9ae303112967c6ca9dd7c990babfa8
Author: Kohei Yoshida 
Date:   Fri Jan 20 21:33:33 2012 -0500

Grid lines should be immediately above or below the background.

Especially grid lines should never be above cell borders.

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a760257..c7b258f 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -695,9 +695,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 
 pContentDev->SetMapMode(MAP_PIXEL);
 aOutputData.DrawDocumentBackground();
+
 if ( bGridFirst && ( bGrid || bPage ) )
 aOutputData.DrawGrid( bGrid, bPage );
+
 aOutputData.DrawBackground();
+
+if ( !bGridFirst && ( bGrid || bPage ) )
+aOutputData.DrawGrid( bGrid, bPage );
+
 if ( bPageMode )
 {
 // DrawPagePreview draws complete lines/page numbers, must always be 
clipped
@@ -707,6 +713,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 pContentDev->SetClipRegion();
 }
 }
+
 aOutputData.DrawShadow();
 aOutputData.DrawFrame();
 if ( !bLogicText )
@@ -730,10 +737,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 if ( rOpts.GetOption( VOPT_NOTES ) )
 aOutputData.DrawNoteMarks();
 
-if ( !bGridFirst && ( bGrid || bPage ) )
-{
-aOutputData.DrawGrid( bGrid, bPage );
-}
 aOutputData.DrawClipMarks();
 
 //  Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch 
bei !bGridFirst
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/ui/view/gridwin4.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 43507c9eb49fdc1de2e193eee32326fb226ff170
Author: Kohei Yoshida 
Date:   Fri Jan 20 21:33:33 2012 -0500

Grid lines should be immediately above or below the background.

Especially grid lines should never be above cell borders.

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a760257..c7b258f 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -695,9 +695,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 
 pContentDev->SetMapMode(MAP_PIXEL);
 aOutputData.DrawDocumentBackground();
+
 if ( bGridFirst && ( bGrid || bPage ) )
 aOutputData.DrawGrid( bGrid, bPage );
+
 aOutputData.DrawBackground();
+
+if ( !bGridFirst && ( bGrid || bPage ) )
+aOutputData.DrawGrid( bGrid, bPage );
+
 if ( bPageMode )
 {
 // DrawPagePreview draws complete lines/page numbers, must always be 
clipped
@@ -707,6 +713,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 pContentDev->SetClipRegion();
 }
 }
+
 aOutputData.DrawShadow();
 aOutputData.DrawFrame();
 if ( !bLogicText )
@@ -730,10 +737,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 if ( rOpts.GetOption( VOPT_NOTES ) )
 aOutputData.DrawNoteMarks();
 
-if ( !bGridFirst && ( bGrid || bPage ) )
-{
-aOutputData.DrawGrid( bGrid, bPage );
-}
 aOutputData.DrawClipMarks();
 
 //  Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch 
bei !bGridFirst
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basctl/source basic/inc

[August Sodora]

 basctl/source/basicide/basicbox.cxx |2 +-
 basctl/source/basicide/baside3.cxx  |2 +-
 basctl/source/basicide/basides1.cxx |2 +-
 basctl/source/basicide/basidesh.cxx |7 +--
 basctl/source/dlged/managelang.cxx  |9 ++---
 basctl/source/inc/basidesh.hxx  |4 ++--
 basctl/source/inc/managelang.hxx|8 
 basic/inc/basic/sbxmeth.hxx |7 ---
 8 files changed, 12 insertions(+), 29 deletions(-)

New commits:
commit 90e983df7b79d9022e24926d770298227becb342
Author: August Sodora 
Date:   Fri Jan 20 20:23:06 2012 -0500

Use a smart pointer here instead

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index c197500..cb56870 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -424,7 +424,7 @@ void BasicLanguageBox::FillBox()
 m_sCurrentText = GetSelectEntry();
 ClearBox();
 
-LocalizationMgr* pCurMgr = 
BasicIDEGlobals::GetShell()->GetCurLocalizationMgr();
+boost::shared_ptr 
pCurMgr(BasicIDEGlobals::GetShell()->GetCurLocalizationMgr());
 if ( pCurMgr->isLibraryLocalized() )
 {
 Enable();
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 55e72c9..7db5434 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1152,7 +1152,7 @@ sal_Bool implImportDialog( Window* pWin, const 
::rtl::OUString& rCurPath, const
 bool bCopyResourcesForDialog = true;
 if( bAddDialogLanguagesToLib )
 {
-LocalizationMgr* pCurMgr = 
pIDEShell->GetCurLocalizationMgr();
+boost::shared_ptr pCurMgr = 
pIDEShell->GetCurLocalizationMgr();
 
 lang::Locale aFirstLocale;
 aFirstLocale = aOnlyInImportLanguages[0];
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index bcf4006..f404f37 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1024,7 +1024,7 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
 else
 {
 ::rtl::OUString aItemStr;
-LocalizationMgr* pCurMgr = GetCurLocalizationMgr();
+boost::shared_ptr 
pCurMgr(GetCurLocalizationMgr());
 if ( pCurMgr->isLibraryLocalized() )
 {
 Sequence< lang::Locale > aLocaleSeq = 
pCurMgr->getStringResourceManager()->getLocales();
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 4aabe00..8458625 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -206,8 +206,6 @@ void BasicIDEShell::Init()
 pObjectCatalog = 0;
 bCreatingWindow = sal_False;
 
-m_pCurLocalizationMgr = NULL;
-
 pTabBar = new BasicIDETabBar( &GetViewFrame()->GetWindow() );
 pTabBar->SetSplitHdl( LINK( this, BasicIDEShell, TabBarSplitHdl ) );
 bTabBarSplitted = sal_False;
@@ -245,8 +243,6 @@ BasicIDEShell::~BasicIDEShell()
 SetWindow( 0 );
 SetCurWindow( 0 );
 
-delete m_pCurLocalizationMgr;
-
 IDEBaseWindow* pWin = aIDEWindowTable.First();
 while ( pWin )
 {
@@ -1014,7 +1010,6 @@ void BasicIDEShell::SetCurLib( const ScriptDocument& 
rDocument, ::rtl::OUString
 void BasicIDEShell::SetCurLibForLocalization( const ScriptDocument& rDocument, 
::rtl::OUString aLibName )
 {
 // Create LocalizationMgr
-delete m_pCurLocalizationMgr;
 Reference< resource::XStringResourceManager > xStringResourceManager;
 try
 {
@@ -1026,9 +1021,8 @@ void BasicIDEShell::SetCurLibForLocalization( const 
ScriptDocument& rDocument, :
 }
 catch (const container::NoSuchElementException& )
 {}
-m_pCurLocalizationMgr = new LocalizationMgr
-( this, rDocument, aLibName, xStringResourceManager );
 
+m_pCurLocalizationMgr = boost::shared_ptr(new 
LocalizationMgr(this, rDocument, aLibName, xStringResourceManager));
 m_pCurLocalizationMgr->handleTranslationbar();
 }
 
diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index d41ed42..eb16d60 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -85,10 +85,8 @@ namespace {
 }
 }
 
-ManageLanguageDialog::ManageLanguageDialog( Window* pParent, LocalizationMgr* 
_pLMgr ) :
-
+ManageLanguageDialog::ManageLanguageDialog( Window* pParent, 
boost::shared_ptr _pLMgr ) :
 ModalDialog( pParent, IDEResId( RID_DLG_MANAGE_LANGUAGE ) ),
-
 m_aLanguageFT   ( this, IDEResId( FT_LANGUAGE ) ),
 m_aLanguageLB   ( this, IDEResId( LB_LANGUAGE ) ),
 m_aAddPB( this, IDEResId( PB_ADD_LANG ) ),
@@ -290,10 +288,9 @@ IMPL_LINK( ManageLanguageDialog, SelectHdl, ListBox *, 
EMPTYARG )
 
 // class SetDefaultLanguageDialog 

[Libreoffice-commits] .: i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/sk_SK.xml |  194 --
 1 file changed, 133 insertions(+), 61 deletions(-)

New commits:
commit 3cf7dcdde2e7a115405c93e4f63580437c8ab744
Author: Milos Sramek 
Date:   Fri Jan 20 13:39:41 2012 +0100

updated [sk-SK] formats and month names

diff --git a/i18npool/source/localedata/data/sk_SK.xml 
b/i18npool/source/localedata/data/sk_SK.xml
index db04531..c3e31f3 100644
--- a/i18npool/source/localedata/data/sk_SK.xml
+++ b/i18npool/source/localedata/data/sk_SK.xml
@@ -38,68 +38,78 @@
 Metric
   
   
-
-  D.M.YY
-
-
-  NN, DD. MMM YY
-
-
-  MM YY
-
-
-  MMM DD
-
-
-  
-
-
-  QQ YY
+D.M.
+D. M.
+D. M. Y
+D. M.
+D. M. Y
+
+  D. M. 
+
+
+  DD.  
+
+
+  DD.MM.
+  Podľa STN 01 6910
 
-
+
   DD.MM.
+  Podľa STN 01 6910
 
-
-  DD.MM.YY
+
+  D. MMM. YY
 
-
-   DD. 
+
+  D. MMM. 
 
-
-  MMM D. YY
+
+  D. MMM. 
 
-
-  MMM D. 
+
+  D.  
+  Podľa STN 01 6910
 
-
-   D. 
+
+  D.  
+  Podľa STN 01 6910
 
-
-  NN, MMM D. YY
+
+  NN, D. MMM. YY
 
-
-  NN,  D. 
+
+  NN, DD. MMM. YY
 
-
-   D. 
+
+  NN, D.  
 
-
-  D. MMM 
+
+  D.  
 
-
-  D.  
-
-
+
   MM-DD
 
-
+
   YY-MM-DD
+  Podľa STN 01 6910
 
-
+
   -MM-DD
-  ISO 8601
+  Podľa ISO 8601, EN 2860, STN 01 6910
+
+
+  MM. YY
+
+
+  DD. MMM.
 
-
+
+  
+
+
+  QQ YY
+
+
   WW
 
 
@@ -230,75 +240,137 @@
   
 
   jan
-  január
+  I
+  január
+
+
+  feb
+  II
+  február
+
+
+  mar
+  III
+  marec
+
+
+  apr
+  IV
+  apríl
+
+
+  may
+  V
+  máj
+
+
+  jun
+  VI
+  jún
+
+
+  jul
+  VII
+  júl
+
+
+  aug
+  VIII
+  august
+
+
+  sep
+  IX
+  september
+
+
+  oct
+  X
+  október
+
+
+  nov
+  XI
+  november
+
+
+  dec
+  XII
+  december
+
+  
+  
+
+  jan
+  I
   januára
 
 
   feb
-  február
+  II
   februára
 
 
   mar
-  marec
+  III
   marca
 
 
   apr
-  apríl
+  IV
   apríla
 
 
   may
-  máj
+  V
   mája
 
 
   jun
-  jún
+  VI
   júna
 
 
   jul
-  júl
+  VII
   júla
 
 
   aug
-  august
+  VIII
   augusta
 
 
   sep
-  september
+  IX
   septembra
 
 
   oct
-  október
+  X
   októbra
 
 
   nov
-  november
+  XI
   novembra
 
 
   dec
-  december
+  XII
   decembra
 
-  
+  
   
 
   bc
-  pred kr.
-  pred kristom
+  pred n. l.
+  pred naším letopočtom
 
 
   ad
-  po kr.
-  po kristovi
+  n. l.
+  nášho letopočtu
 
   
   
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit c39e891d4dc963d2cac9843b426494e4dc490278
Author: Miklos Vajna 
Date:   Sat Jan 21 00:58:48 2012 +0100

fdo#44983 Fix RTF import of \paperh and \paperw

These keywords should not only set the *default* paper height/width but
also set the current values.

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0a1fafb..aab8952 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2366,18 +2366,16 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 pIntValue));
 }
 break;
-case RTF_PAPERH:
+case RTF_PAPERH: // fall through: set the default + current value
 lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgSz, 
NS_ooxml::LN_CT_PageSz_h, pIntValue, true);
-break;
-case RTF_PAPERW:
-lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
-NS_ooxml::LN_EG_SectPrContents_pgSz, 
NS_ooxml::LN_CT_PageSz_w, pIntValue, true);
-break;
 case RTF_PGHSXN:
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgSz, 
NS_ooxml::LN_CT_PageSz_h, pIntValue, true);
 break;
+case RTF_PAPERW: // fall through: set the default + current value
+lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
+NS_ooxml::LN_EG_SectPrContents_pgSz, 
NS_ooxml::LN_CT_PageSz_w, pIntValue, true);
 case RTF_PGWSXN:
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgSz, 
NS_ooxml::LN_CT_PageSz_w, pIntValue, true);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: registry/inc sal/inc

[Norbert Thiebaud]

 registry/inc/registry/reader.h   |2 +-
 registry/inc/registry/registry.h |4 ++--
 sal/inc/osl/process.h|   12 ++--
 sal/inc/osl/socket.h |2 +-
 sal/inc/rtl/locale.h |6 +++---
 sal/inc/rtl/logfile.h|2 +-
 sal/inc/rtl/random.h |   12 ++--
 sal/inc/rtl/strbuf.h |4 ++--
 sal/inc/rtl/string.h |4 ++--
 sal/inc/rtl/tencinfo.h   |2 +-
 sal/inc/rtl/unload.h |2 +-
 sal/inc/rtl/ustrbuf.h|2 +-
 sal/inc/rtl/ustring.h|6 +++---
 sal/inc/sal/log.hxx  |2 +-
 sal/inc/sal/types.h  |2 +-
 15 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 53358305d8620f703d14df3c37a9b65e29a20cb4
Author: Norbert Thiebaud 
Date:   Fri Jan 20 17:16:19 2012 -0600

kill some doxygen warnings

diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index e455d0a..cdbd0ba 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -318,7 +318,7 @@ void SAL_CALL typereg_reader_getFieldTypeName(
@param type an out-parameter obtaining the field value's type; must not be
null
 
-   @param result an out-parameter obtaining the field value's value; must not 
be
+   @param value an out-parameter obtaining the field value's value; must not be
null
 
@return false iff an out-of-memory condition occurred, in which case
diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h
index a35c9df..5374d65 100644
--- a/registry/inc/registry/registry.h
+++ b/registry/inc/registry/registry.h
@@ -58,7 +58,7 @@ RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
 @param  hKey identifies a currently open key. The key which will be opened 
by this function
  is a subkey of the key identified by hKey
 @param  keyName points to a null terminated string specifying the name of 
a key.
-@param  phNewKey points to a variable that receives the handle of the 
opened key.
+@param  phOpenKey points to a variable that receives the handle of the 
opened key.
  The memory to store this variable will be allocated and 
will be freed by the function
  reg_closeKey. If the function fails, phNewKey is NULL.
 @return REG_NO_ERROR if succeeds else an error code.
@@ -415,7 +415,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle 
hRegistry,
 
 /** This function returns the name of a registry.
 
-@param  hReg identifies a currently open registry whose name will be 
returned.
+@param  hRegistry identifies a currently open registry whose name will be 
returned.
 @param  pName returns the name of the registry if the function succeeds 
otherwise an empty string.
 @return REG_NO_ERROR if succeeds else an error code.
 */
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h
index 2eb2954..bd8c2c4 100644
--- a/sal/inc/osl/process.h
+++ b/sal/inc/osl/process.h
@@ -146,7 +146,7 @@ typedef void* oslProcess;
 is undefined. If this parameter is NULL or the caller provides an empty 
string the
 new process will have the same current working directory as the calling 
process.
 
-@param ustrEnviroments
+@param ustrEnvironments
 [in] An array of strings describing environment variables that should be 
merged into the
 environment of the new process. Each string has to be in the form 
"variable=value".
 This parameter can be NULL in which case the new process gets the same 
environment
@@ -190,7 +190,7 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_executeProcess(
 
 /** Execute a process and redirect child process standard IO.
 
-@param ustrImageName
+@param strImageName
 [in] The file URL of the executable to be started.
 Can be NULL in this case the file URL of the executable must be the first 
element
 in ustrArguments.
@@ -216,7 +216,7 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_executeProcess(
 is undefined. If this parameter is NULL or the caller provides an empty 
string the
 new process will have the same current working directory as the calling 
process.
 
-@param ustrEnviroments
+@param ustrEnvironments
 [in] An array of strings describing environment variables that should be 
merged into the
 environment of the new process. Each string has to be in the form 
"variable=value".
 This parameter can be NULL in which case the new process gets the same 
environment
@@ -333,14 +333,14 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL 
osl_joinProcessWithTimeout(
 oslProcess Process, const TimeValue* pTimeout);
 
 /** Retrieves information about a Process
-@param Process [in] the process handle of the process
-@param Field   [in] the information which is to be retrieved
+@param[in] Process  the process handle of the process
+@param[in] Fields   the information which is to be retriev

[Libreoffice-commits] .: 4 commits - basic/source sfx2/inc sfx2/Package_inc.mk sfx2/source

[August Sodora]

 basic/source/basmgr/basmgr.cxx   |4 -
 sfx2/Package_inc.mk  |1 
 sfx2/inc/sfx2/dispatch.hxx   |9 +-
 sfx2/inc/sfx2/minstack.hxx   |   65 
 sfx2/source/control/dispatch.cxx |  123 ---
 sfx2/source/menu/mnumgr.cxx  |1 
 6 files changed, 137 insertions(+), 66 deletions(-)

New commits:
commit 6accc1e65a8ab566db16c07dd76cf5f74c0bf792
Author: August Sodora 
Date:   Fri Jan 20 17:50:02 2012 -0500

Revert "DECL_PTRSTACK->std::stack"

This reverts commit 56208a1b367b25eea8bd7df5507cf4fa1fe8fb1d.

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 0867aa5..de65742 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -37,11 +37,10 @@
 #include 
 #include 
 
-#include 
-
 class SfxSlotServer;
 class SfxShell;
 class SfxRequest;
+class SfxShellStack_Impl;
 class SfxHintPoster;
 class SfxViewFrame;
 class SfxBindings;
@@ -65,18 +64,20 @@ namespace com
 }
 }
 
+//=
+
 #define SFX_SHELL_POP_UNTIL 4
 #define SFX_SHELL_POP_DELETE2
 #define SFX_SHELL_PUSH  1
 
+//=
+
 typedef SfxPoolItem* SfxPoolItemPtr;
 SV_DECL_PTRARR_DEL( SfxItemPtrArray, SfxPoolItemPtr, 4, 4 )
 
 // fuer  shell.cxx
 typedef SfxItemPtrArray SfxItemArray_Impl;
 
-typedef std::deque SfxShellStack_Impl;
-
 class SFX2_DLLPUBLIC SfxDispatcher
 {
 SfxDispatcher_Impl* pImp;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 88dfc70..7b26105 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -75,14 +75,19 @@
 
 namespace css = ::com::sun::star;
 
+//==
 DBG_NAME(SfxDispatcherFlush)
 DBG_NAME(SfxDispatcherFillState)
 
+//==
 typedef SfxRequest* SfxRequestPtr;
 SV_IMPL_PTRARR( SfxItemPtrArray, SfxPoolItemPtr );
 SV_DECL_PTRARR_DEL( SfxRequestPtrArray, SfxRequestPtr, 4, 4 )
 SV_IMPL_PTRARR( SfxRequestPtrArray, SfxRequestPtr );
 
+DECL_PTRSTACK(SfxShellStack_Impl, SfxShell*, 8, 4 );
+//==
+
 struct SfxToDo_Impl
 {
 SfxShell*  pCluster;
@@ -570,15 +575,14 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const 
SfxShell& rShell, sal_Bool bDee
 for(std::deque::reverse_iterator i = 
pImp->aToDoStack.rbegin(); i != pImp->aToDoStack.rend(); ++i)
 {
 if(i->bPush)
-aStack.push_front(i->pCluster);
+aStack.Push(i->pCluster);
 else
 {
 SfxShell* pPopped(NULL);
 do
 {
-DBG_ASSERT( aStack.size(), "popping from empty stack" );
-pPopped = aStack.front();
-aStack.pop_front();
+DBG_ASSERT( aStack.Count(), "popping from empty stack" );
+pPopped = aStack.Pop();
 }
 while(i->bUntil && pPopped != i->pCluster);
 DBG_ASSERT(pPopped == i->pCluster, "popping unpushed 
SfxInterface");
@@ -587,12 +591,9 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& 
rShell, sal_Bool bDee
 
 sal_Bool bReturn;
 if ( bDeep )
-{
-SfxShellStack_Impl::const_iterator i = std::find(aStack.begin(), 
aStack.end(), &rShell);
-bReturn = (i != aStack.end());
-}
+bReturn = aStack.Contains(&rShell);
 else
-bReturn = aStack.front() == &rShell;
+bReturn = aStack.Top() == &rShell;
 return bReturn;
 }
 
@@ -618,15 +619,15 @@ sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& 
rShell )
 SFX_STACK(SfxDispatcher::GetShellLevel);
 Flush();
 
-for(size_t n = 0; n < pImp->aStack.size(); ++n)
-if ( pImp->aStack[n] == &rShell )
+for ( sal_uInt16 n = 0; n < pImp->aStack.Count(); ++n )
+if ( pImp->aStack.Top( n ) == &rShell )
 return n;
 if ( pImp->pParent )
 {
 sal_uInt16 nRet = pImp->pParent->GetShellLevel(rShell);
 if ( nRet == USHRT_MAX )
 return nRet;
-return  nRet + pImp->aStack.size();
+return  nRet + pImp->aStack.Count();
 }
 
 return USHRT_MAX;
@@ -646,9 +647,9 @@ SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const
 */
 
 {
-sal_uInt16 nShellCount = pImp->aStack.size();
+sal_uInt16 nShellCount = pImp->aStack.Count();
 if ( nIdx < nShellCount )
-return pImp->aStack[nIdx];
+return pImp->aStack.Top(nIdx);
 else if ( pImp->pParent )
 return pImp->pParent->GetShell( nIdx - nShellCount );
 return 0;
@@ -739,8 +740,8 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, 
SfxViewFrame* /* pOld */ )
 if ( IsAppDispatcher() )
 return;
 
-for(size_t i = 0; i < pImp->aStack.size(); ++i)
-   

[Libreoffice-commits] .: 5 commits - sc/source sfx2/inc sfx2/source svx/inc svx/source sw/source

[Kohei Yoshida]

 sc/source/core/data/documen8.cxx  |2 
 sc/source/ui/docshell/arealink.cxx|   15 -
 sc/source/ui/docshell/externalrefmgr.cxx  |2 
 sc/source/ui/docshell/tablink.cxx |7 
 sfx2/inc/sfx2/linkmgr.hxx |   14 +
 sfx2/source/appl/linkmgr2.cxx |   52 +-
 svx/inc/svx/svdograf.hxx  |   45 ++---
 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx |8 
 svx/source/svdraw/svdograf.cxx|  156 ++
 sw/source/filter/ww8/ww8graf.cxx  |2 
 10 files changed, 186 insertions(+), 117 deletions(-)

New commits:
commit 5708d3dcb065247d5774dafbd7911bb5bab72849
Author: Kohei Yoshida 
Date:   Fri Jan 20 16:36:06 2012 -0500

More on String to rtl::OUString changes.

diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 3e32e82..9110f4d 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1031,7 +1031,7 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin)
 {
 // Update failed.  Notify the user.
 
-String aFile;
+rtl::OUString aFile;
 pLinkManager->GetDisplayNames(pRefLink, NULL, &aFile, NULL, 
NULL);
 // Decode encoded URL for display friendliness.
 INetURLObject aUrl(aFile,INetURLObject::WAS_ENCODED);
diff --git a/sc/source/ui/docshell/arealink.cxx 
b/sc/source/ui/docshell/arealink.cxx
index 18e163d..832036f 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -129,13 +129,8 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* 
rEndEditHdl */ )
 sfx2::LinkManager* 
pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
 if (pLinkManager!=NULL)
 {
-String aTmp1;
-String aTmp2;
-String aTmp3;
-pLinkManager->GetDisplayNames(this, NULL, &aTmp1, &aTmp2, &aTmp3);
-rtl::OUString aFile = aTmp1;
-rtl::OUString aArea = aTmp2;
-rtl::OUString aFilter = aTmp3;
+rtl::OUString aFile, aArea, aFilter;
+pLinkManager->GetDisplayNames(this, NULL, &aFile, &aArea, &aFilter);
 
 //  the file dialog returns the filter name with the application prefix
 //  -> remove prefix
@@ -148,9 +143,9 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* 
rEndEditHdl */ )
 
 // adjust in dialog:
 String aNewLinkName;
-aTmp1 = aFilter;
-sfx2::MakeLnkName(aNewLinkName, NULL, aFile, aArea, &aTmp1);
-aFilter = aTmp1;
+String aTmp = aFilter;
+sfx2::MakeLnkName(aNewLinkName, NULL, aFile, aArea, &aTmp);
+aFilter = aTmp;
 SetName( aNewLinkName );
 }
 
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 7931074..eaf72bc 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1250,7 +1250,7 @@ void ScExternalRefLink::Closed()
 if (!mbDoRefresh)
 return SUCCESS;
 
-String aFile, aFilter;
+rtl::OUString aFile, aFilter;
 mpDoc->GetLinkManager()->GetDisplayNames(this, NULL, &aFile, NULL, 
&aFilter);
 ScExternalRefManager* pMgr = mpDoc->GetExternalRefManager();
 
diff --git a/sc/source/ui/docshell/tablink.cxx 
b/sc/source/ui/docshell/tablink.cxx
index baaff72..f154f0a 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -147,11 +147,8 @@ void ScTableLink::Edit( Window* pParent, const Link& 
rEndEditHdl )
 sfx2::LinkManager* 
pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
 if (pLinkManager!=NULL)
 {
-String aTmp1;
-String aTmp2;
-pLinkManager->GetDisplayNames(this, 0, &aTmp1, NULL, &aTmp2);
-rtl::OUString aFile = aTmp1;
-rtl::OUString aFilter = aTmp2;
+rtl::OUString aFile, aFilter;
+pLinkManager->GetDisplayNames(this, 0, &aFile, NULL, &aFilter);
 
 //  the file dialog returns the filter name with the application prefix
 //  -> remove prefix
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 7aec55a..96860bd 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2978,7 +2978,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( 
SdrObject* &rpObject,
 {
 const SdrGrafObj *pGrf= (const SdrGrafObj*)rpObject;
 bool bDone = false;
-if (pGrf->IsLinkedGraphic() && pGrf->GetFileName().Len())
+if (pGrf->IsLinkedGraphic() && !pGrf->GetFileName().isEmpty())
 {
 GraphicType eType = pGrf->GetGraphicType();
 String aGrfName(
commit 88869c1dd907c4851cd8671f0822a0d7c4fd3f36
Author: Kohei Yoshida 
Date:   Fri Jan 20 15:

[Libreoffice-commits] .: android/qa

[Tor Lillqvist]

 android/qa/sc/Makefile |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5ef52d43a308f8153c6f8ac5b07521080fdeb2db
Author: Tor Lillqvist 
Date:   Fri Jan 20 22:39:17 2012 +0200

filters_test needs a shitload of components

Ugly duplication of the list if components. Could obviously do some
elegant refactoring to have each component mentioned just once. But on
the other hand, this is just a temporary way to build this unit test
app, no? If/when eventually gbuildifying this, the data from the
gb_CppunitTest_add_components calls in the correspondig
CppunitTest_FOO.mk files can be used, one hopes.

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 35e5acd..dbf9fb4 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -133,7 +133,7 @@ copy-stuff:
for F in xml/ure/services; do \
sed -e 
's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g'
 <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
done
-   for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml 
configmgr/source/configmgr; do \
+   for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml 
configmgr/source/configmgr basic/util/sb 
chart2/source/controller/chartcontroller chart2/source/tools/charttools 
chart2/source/model/chartmodel comphelper/util/comphelp dbaccess/util/dba 
eventattacher/source/evtatt fileaccess/source/fileacc 
filter/source/config/cache/filterconfig1 forms/util/frm oox/util/oox 
package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap 
sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt 
scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot 
svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl 
unoxml/source/rdf/unordf; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
sed -e 
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' 
<$(WORKDIR)/ComponentTarget/$$F.component 
>assets/ComponentTarget/$$F.component; \
done
@@ -168,12 +168,12 @@ uninstall:
adb uninstall $(APP_PACKAGE)
 
 run_ucalc:
-   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/ComponentTarget/ucb/source/core/ucb1.component 
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
+   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' 
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb 
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/ComponentTarget/ucb/source/core/ucb1.component 
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library 
libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
 
 run_filters_test:
-   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry 
module:file:///assets/xml/registry/spool' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/s

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

[August Sodora]

 basic/inc/basic/basmgr.hxx |   13 +--
 basic/source/basmgr/basicmanagerrepository.cxx |9 --
 basic/source/basmgr/basmgr.cxx |  101 ++---
 3 files changed, 21 insertions(+), 102 deletions(-)

New commits:
commit 81605eaafa4cd645ca92013120f8da0c753cdf42
Author: August Sodora 
Date:   Fri Jan 20 15:20:55 2012 -0500

Replace BasicErrorManager with std::vector

diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index f5ac0aa..04820ad 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include "basicdllapi.h"
+#include 
 
 // Basic XML Import/Export
 BASIC_DLLPUBLIC com::sun::star::uno::Reference< 
com::sun::star::script::XStarBasicAccess >
@@ -72,12 +73,10 @@ public:
 voidSetErrorStr( const String& rStr){ aErrStr = rStr; }
 };
 
-
-
 class BasicLibs;
 class ErrorManager;
 class BasicLibInfo;
-class BasicErrorManager;
+
 namespace basic { class BasicManagerCleaner; }
 
 // Library password handling for 5.0 documents
@@ -127,7 +126,7 @@ class BASIC_DLLPUBLIC BasicManager : public SfxBroadcaster
 
 private:
 BasicLibs*  pLibs;
-BasicErrorManager*  pErrorMgr;
+std::vector aErrors;
 
 String  aName;
 String  maStorageName;
@@ -140,7 +139,7 @@ private:
 
 protected:
 sal_BoolImpLoadLibary( BasicLibInfo* pLibInfo ) const;
-sal_BoolImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* 
pCurStorage, sal_Bool bInfosOnly = sal_False ) const;
+sal_BoolImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* 
pCurStorage, sal_Bool bInfosOnly = sal_False );
 voidImpCreateStdLib( StarBASIC* pParentFromStdLib );
 voidImpMgrNotLoaded(  const String& rStorageName  );
 BasicLibInfo*   CreateLibInfo();
@@ -198,9 +197,7 @@ public:
 sal_BoolIsModified() const;
 sal_BoolIsBasicModified() const;
 
-sal_BoolHasErrors();
-BasicError* GetFirstError();
-BasicError* GetNextError();
+std::vector& GetErrors();
 
 /** sets a global constant in the basic library, referring to some UNO 
object, to a new value.
 
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index fa219ad..8d0c2eb 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -454,21 +454,20 @@ namespace basic
 _out_rpBasicManager = new BasicManager( *xDummyStor, String() /* 
TODO/LATER: xStorage */,
 pAppBasic,
 &aAppBasicDir, 
sal_True );
-if ( _out_rpBasicManager->HasErrors() )
+if ( !_out_rpBasicManager->GetErrors().empty() )
 {
 // handle errors
-BasicError* pErr = _out_rpBasicManager->GetFirstError();
-while ( pErr )
+std::vector& aErrors = 
_out_rpBasicManager->GetErrors();
+for(std::vector::const_iterator i = 
aErrors.begin(); i != aErrors.end(); ++i)
 {
 // show message to user
-if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( 
pErr->GetErrorId() ) )
+if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( 
i->GetErrorId() ) )
 {
 // user wants to break loading of BASIC-manager
 BasicManagerCleaner::deleteBasicManager( 
_out_rpBasicManager );
 xStorage.clear();
 break;
 }
-pErr = _out_rpBasicManager->GetNextError();
 }
 }
 }
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 3e5a0dd..234a196 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -382,68 +382,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( 
const ContainerEvent&
 }
 }
 
-
-//=
-
-class BasicErrorManager
-{
-private:
-BasErrorLst aErrorList;
-size_t CurrentError;
-
-public:
-BasicErrorManager();
-~BasicErrorManager();
-
-voidReset();
-voidInsertError( const BasicError& rError );
-
-boolHasErrors() { return !aErrorList.empty(); }
-BasicError* GetFirstError();
-BasicError* GetNextError();
-};
-
-BasicErrorManager::BasicErrorManager()
-: CurrentError( 0 )
-{
-}
-
-BasicErrorManager::~BasicErrorManager()
-{
-Reset();
-}
-
-void BasicErrorManager::Reset()
-{
-for ( size_t i = 0, n = aErrorList.size(); i < n; ++i )
-delete aErrorList[ i ];
-aErrorList.clear();
-}

[Libreoffice-commits] .: android/qa

[Tor Lillqvist]

 android/qa/sc/Makefile |4 
 1 file changed, 4 insertions(+)

New commits:
commit cce52394e979d02941e7f9f15f6706502a056800
Author: Tor Lillqvist 
Date:   Fri Jan 20 14:17:42 2012 +0200

Add a target for the stdio redirection magic commands

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 6c499f8..35e5acd 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -185,6 +185,10 @@ run: run_ucalc run_filters_test
 stop-start-cycle:
adb shell stop && adb shell start && sleep 10
 
+# Too hard to remember this stuff;)
+redirect-stdio:
+   adb shell stop && adb shell setprop log.redirect-stdio true && adb 
shell start
+
 clean:
ant clean
rm -rf assets $(SODEST) $(OBJLOCAL)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sfx2/source/appl/shutdownicon.cxx |8 
 sw/source/ui/shells/textsh.cxx|3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0cf0382d4eb8588c91e850adbd874c3cb5ef6f03
Author: Takeshi Abe 
Date:   Sat Jan 21 04:42:55 2012 +0900

replaced UniString by rtl::OUString

See also d2991722b34fb597d34a3270cd4a806277c52da5

diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index 141aacd..ffaa63d 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -391,8 +391,8 @@ OUString ShutdownIcon::GetResString( int id )
 if( !m_pResMgr || !m_pResMgr->IsAvailable( aResId ) )
 return OUString();
 
-UniString aRes( ResId(id, *m_pResMgr) );
-return OUString( aRes );
+ResId aRes( id, *m_pResMgr );
+return ResId::toString( aRes );
 }
 
 // ---
@@ -831,8 +831,8 @@ rtl::OUString ShutdownIcon::getShortcutName()
 if( pMgr )
 {
 ::SolarMutexGuard aGuard;
-UniString aRes( SfxResId( STR_QUICKSTART_LNKNAME ) );
-aShortcutName = OUString( aRes );
+SfxResId aRes( STR_QUICKSTART_LNKNAME );
+aShortcutName = ResId::toString( aRes );
 }
 #ifdef WNT
 aShortcutName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".lnk" ) );
commit a06e1a6b63dfcb84cb1a3a7c5fd30829b9d33c82
Author: Takeshi Abe 
Date:   Fri Jan 20 00:14:44 2012 +0900

It does not require SwAppletImpl but only a couple of subheaders

diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 59bb69c..ef2f4b9 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -32,6 +32,8 @@
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -100,7 +102,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/Package_inc.mk sfx2/source

[August Sodora]

 sfx2/Package_inc.mk  |1 
 sfx2/inc/sfx2/minstack.hxx   |   65 ---
 sfx2/source/control/dispatch.cxx |1 
 sfx2/source/menu/mnumgr.cxx  |1 
 4 files changed, 68 deletions(-)

New commits:
commit fabf6aa20117fb1132fc7e730e5eeecd0378e67e
Author: August Sodora 
Date:   Fri Jan 20 14:49:21 2012 -0500

Remove DECL_PTRSTACK

diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 4dd559d..3714d21 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -83,7 +83,6 @@ $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.h
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
-$(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
 $(eval $(call 
gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
deleted file mode 100644
index 361c304..000
--- a/sfx2/inc/sfx2/minstack.hxx
+++ /dev/null
@@ -1,65 +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 _SFXMINSTACK_HXX
-#define _SFXMINSTACK_HXX
-
-#include 
-
-#define DECL_PTRSTACK( ARR, T, nI, nG ) \
-DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \
-class ARR: private ARR##arr_ \
-{ \
-public: \
-ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
-ARR##arr_( nInitSize, nGrowSize ) \
-{} \
-\
-ARR( const ARR& rOrig ): \
-ARR##arr_( rOrig ) \
-{} \
-\
-sal_uInt16  Count() const { return ARR##arr_::Count(); } \
-voidPush( T rElem ) { Append( rElem ); } \
-T   Top( sal_uInt16 nLevel = 0 ) const \
-{ return (*this)[Count()-nLevel-1]; } \
-T   Bottom() const { return (*this)[0]; } \
-T   Pop() \
-{   T aRet = (*this)[Count()-1]; \
-Remove( Count()-1, 1 ); \
-return aRet; \
-} \
-T*   operator*() \
-{ return &(*this)[Count()-1]; } \
-voidClear() { ARR##arr_::Clear(); } \
-sal_BoolContains( const T pItem ) const \
-{ return ARR##arr_::Contains( pItem ); } \
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 88dfc70..9a8e607 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -48,7 +48,6 @@
 #include "appdata.hxx"
 #include "sfx2/sfxhelp.hxx"
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 8b87238..c46c5e9 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -62,7 +62,6 @@
 #include "virtmenu.hxx"
 #include 
 #include 
-#include 
 #include 
 #include "sfxtypes.hxx"
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[August Sodora]

 sfx2/inc/sfx2/dispatch.hxx   |9 +-
 sfx2/inc/sfx2/msgpool.hxx|1 
 sfx2/source/control/dispatch.cxx |  122 ++-
 3 files changed, 63 insertions(+), 69 deletions(-)

New commits:
commit 6dc58d6c28b20d8dfb12673c3e733417e0644090
Author: August Sodora 
Date:   Fri Jan 20 14:44:41 2012 -0500

Fix build

diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index a110b58..bd65772 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -37,6 +37,7 @@
 #include 
 
 #include 
+#include 
 
 class SfxInterface;
 class SfxSlot;
commit 56208a1b367b25eea8bd7df5507cf4fa1fe8fb1d
Author: August Sodora 
Date:   Fri Jan 20 14:37:00 2012 -0500

DECL_PTRSTACK->std::stack

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index de65742..0867aa5 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -37,10 +37,11 @@
 #include 
 #include 
 
+#include 
+
 class SfxSlotServer;
 class SfxShell;
 class SfxRequest;
-class SfxShellStack_Impl;
 class SfxHintPoster;
 class SfxViewFrame;
 class SfxBindings;
@@ -64,20 +65,18 @@ namespace com
 }
 }
 
-//=
-
 #define SFX_SHELL_POP_UNTIL 4
 #define SFX_SHELL_POP_DELETE2
 #define SFX_SHELL_PUSH  1
 
-//=
-
 typedef SfxPoolItem* SfxPoolItemPtr;
 SV_DECL_PTRARR_DEL( SfxItemPtrArray, SfxPoolItemPtr, 4, 4 )
 
 // fuer  shell.cxx
 typedef SfxItemPtrArray SfxItemArray_Impl;
 
+typedef std::deque SfxShellStack_Impl;
+
 class SFX2_DLLPUBLIC SfxDispatcher
 {
 SfxDispatcher_Impl* pImp;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 7b26105..88dfc70 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -75,19 +75,14 @@
 
 namespace css = ::com::sun::star;
 
-//==
 DBG_NAME(SfxDispatcherFlush)
 DBG_NAME(SfxDispatcherFillState)
 
-//==
 typedef SfxRequest* SfxRequestPtr;
 SV_IMPL_PTRARR( SfxItemPtrArray, SfxPoolItemPtr );
 SV_DECL_PTRARR_DEL( SfxRequestPtrArray, SfxRequestPtr, 4, 4 )
 SV_IMPL_PTRARR( SfxRequestPtrArray, SfxRequestPtr );
 
-DECL_PTRSTACK(SfxShellStack_Impl, SfxShell*, 8, 4 );
-//==
-
 struct SfxToDo_Impl
 {
 SfxShell*  pCluster;
@@ -575,14 +570,15 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const 
SfxShell& rShell, sal_Bool bDee
 for(std::deque::reverse_iterator i = 
pImp->aToDoStack.rbegin(); i != pImp->aToDoStack.rend(); ++i)
 {
 if(i->bPush)
-aStack.Push(i->pCluster);
+aStack.push_front(i->pCluster);
 else
 {
 SfxShell* pPopped(NULL);
 do
 {
-DBG_ASSERT( aStack.Count(), "popping from empty stack" );
-pPopped = aStack.Pop();
+DBG_ASSERT( aStack.size(), "popping from empty stack" );
+pPopped = aStack.front();
+aStack.pop_front();
 }
 while(i->bUntil && pPopped != i->pCluster);
 DBG_ASSERT(pPopped == i->pCluster, "popping unpushed 
SfxInterface");
@@ -591,9 +587,12 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& 
rShell, sal_Bool bDee
 
 sal_Bool bReturn;
 if ( bDeep )
-bReturn = aStack.Contains(&rShell);
+{
+SfxShellStack_Impl::const_iterator i = std::find(aStack.begin(), 
aStack.end(), &rShell);
+bReturn = (i != aStack.end());
+}
 else
-bReturn = aStack.Top() == &rShell;
+bReturn = aStack.front() == &rShell;
 return bReturn;
 }
 
@@ -619,15 +618,15 @@ sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& 
rShell )
 SFX_STACK(SfxDispatcher::GetShellLevel);
 Flush();
 
-for ( sal_uInt16 n = 0; n < pImp->aStack.Count(); ++n )
-if ( pImp->aStack.Top( n ) == &rShell )
+for(size_t n = 0; n < pImp->aStack.size(); ++n)
+if ( pImp->aStack[n] == &rShell )
 return n;
 if ( pImp->pParent )
 {
 sal_uInt16 nRet = pImp->pParent->GetShellLevel(rShell);
 if ( nRet == USHRT_MAX )
 return nRet;
-return  nRet + pImp->aStack.Count();
+return  nRet + pImp->aStack.size();
 }
 
 return USHRT_MAX;
@@ -647,9 +646,9 @@ SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const
 */
 
 {
-sal_uInt16 nShellCount = pImp->aStack.Count();
+sal_uInt16 nShellCount = pImp->aStack.size();
 if ( nIdx < nShellCount )
-return pImp->aStack.Top(nIdx);
+return pImp->aStack[nIdx];
 else if ( pImp->pParent )
 return pImp->pParent->GetShell( nIdx - nShellCount );
 return 0;
@@ -740,8 +739,8 @@ void SfxDispatcher::DoActivate_Impl( sa

[Libreoffice-commits] .: android/qa

[Tor Lillqvist]

 android/qa/desktop/Makefile |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f7c1f80ae4f9a4f33cdac48040e2d48a8610604c
Author: Tor Lillqvist 
Date:   Fri Jan 20 21:19:51 2012 +0200

Fix file: URI syntax

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 96f617f..57dc6a4 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -32,14 +32,14 @@ buildrcs:
echo "[Bootstrap]" > assets/program/sofficerc
echo "Logo=1" >> assets/program/sofficerc
echo "NativeProgress=1" >> assets/program/sofficerc
-   echo "URE_BOOTSTRAP=file://assets/program/fundamentalrc" >> 
assets/program/sofficerc
+   echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> 
assets/program/sofficerc
 # fundamentalrc ini ...
echo "[Bootstrap]" > assets/program/fundamentalrc
echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/fundamentalrc
echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/fundamentalrc # checkme - is this used to find configs ?
-   echo "BRAND_BASE_DIR=file://assets/" >> assets/program/fundamentalrc
+   echo "BRAND_BASE_DIR=file:///assets/" >> assets/program/fundamentalrc
echo "CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry 
module:${BRAND_BASE_DIR}/share/registry/modules 
res:${BRAND_BASE_DIR}/share/registry 
bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
xcsxcu:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
 
userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu"
 >> assets/program/fundamentalrc
-   echo 
"URE_BIN_DIR=file://assets/ure/bin/dir/not-here/can-we/exec-anyway" >> 
assets/program/fundamentalrc
+   echo 
"URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway" >> 
assets/program/fundamentalrc
echo "URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb 
file:///assets/program/types/types.rdb $${URE_MORE_TYPES}" >> 
assets/program/fundamentalrc
echo "URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb 
file:///assets/program/services/services.rdb $${URE_MORE_SERVICES}" >> 
assets/program/fundamentalrc
 # unorc ini ...
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[August Sodora]

 sfx2/inc/sfx2/msgpool.hxx   |3 ---
 sfx2/source/control/msgpool.cxx |   19 ---
 2 files changed, 22 deletions(-)

New commits:
commit c987ddfec57cfe712088ee44f864774ac26ed262
Author: August Sodora 
Date:   Fri Jan 20 14:07:55 2012 -0500

Actually this is unused

diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 35d4be6..a110b58 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -40,16 +40,13 @@
 
 class SfxInterface;
 class SfxSlot;
-class SfxSlotType_Impl;
 
 typedef std::basic_string< sal_uInt16 > SfxSlotGroupArr_Impl;
-typedef std::vector SfxSlotTypeArr_Impl;
 typedef std::vector SfxInterfaceArr_Impl;
 
 class SFX2_DLLPUBLIC SfxSlotPool
 {
 SfxSlotGroupArr_Impl*   _pGroups;
-SfxSlotTypeArr_Impl*_pTypes;
 SfxSlotPool*_pParentPool;
 ResMgr* _pResMgr;
 SfxInterfaceArr_Impl*   _pInterfaces;
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f49de94..8b6cee9 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -43,19 +43,8 @@
 
 #include 
 
-struct SfxSlotType_Impl
-{
-sal_uInt16  nId;
-TypeId  nType;
-
-SfxSlotType_Impl( sal_uInt16 nTheId, TypeId nTheType ):
-nId(nTheId), nType(nTheType)
-{}
-};
-
 SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager )
  : _pGroups(0)
- , _pTypes(0)
  , _pParentPool( pParent )
  , _pResMgr( pResManager )
  , _pInterfaces(0)
@@ -76,12 +65,6 @@ SfxSlotPool::~SfxSlotPool()
 delete pIF;
 delete _pInterfaces;
 delete _pGroups;
-if ( _pTypes )
-{
-for(sal_uInt16 n = 0; n < _pTypes->size(); ++n)
-delete (*_pTypes)[n];
-delete _pTypes;
-}
 }
 
 //
@@ -111,8 +94,6 @@ void SfxSlotPool::RegisterInterface( SfxInterface& 
rInterface )
 }
 }
 
-if ( !_pTypes )
-_pTypes = new SfxSlotTypeArr_Impl;
 for ( size_t nFunc = 0; nFunc < rInterface.Count(); ++nFunc )
 {
 SfxSlot *pDef = rInterface[nFunc];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 8 commits - sfx2/inc sfx2/source

[August Sodora]

 sfx2/inc/arrdecl.hxx|4 --
 sfx2/inc/sfx2/frmdescr.hxx  |2 -
 sfx2/inc/sfx2/msgpool.hxx   |9 ++
 sfx2/source/appl/appdata.cxx|1 
 sfx2/source/appl/appquit.cxx|1 
 sfx2/source/control/msgpool.cxx |   54 +---
 sfx2/source/inc/appdata.hxx |9 --
 sfx2/source/inc/virtmenu.hxx|4 --
 sfx2/source/menu/mnumgr.cxx |7 -
 sfx2/source/menu/virtmenu.cxx   |   25 ++
 sfx2/source/view/viewimp.hxx|6 
 sfx2/source/view/viewsh.cxx |   34 +++--
 12 files changed, 53 insertions(+), 103 deletions(-)

New commits:
commit 21ec8d068f457f222fa170eed296415717716a14
Author: August Sodora 
Date:   Fri Jan 20 01:25:10 2012 -0500

Remove unused DECL_PTRSTACK

diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index e9d7cf8..8b87238 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -76,7 +76,6 @@
 #include 
 #include "thessubmenu.hxx"
 
-
 static const sal_uInt16 nCompatVersion = 4;
 static const sal_uInt16 nVersion = 5;
 
@@ -85,12 +84,6 @@ PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
 
 using namespace com::sun::star;
 
-//=
-
-DECL_PTRSTACK(SfxMenuCfgItemArrStack, SfxMenuCfgItemArr*, 4, 4 );
-
-//-
-
 void TryToHideDisabledEntries_Impl( Menu* pMenu )
 {
 DBG_ASSERT( pMenu, "invalid menu" );
commit ee0d6e3ab040ddd2ce1cd73945ee44da69201ca4
Author: August Sodora 
Date:   Fri Jan 20 01:23:16 2012 -0500

DECL_PTRARRAY->std::vector

diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 0c7eab1..35d4be6 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -40,9 +40,10 @@
 
 class SfxInterface;
 class SfxSlot;
-class SfxSlotTypeArr_Impl;
+class SfxSlotType_Impl;
 
 typedef std::basic_string< sal_uInt16 > SfxSlotGroupArr_Impl;
+typedef std::vector SfxSlotTypeArr_Impl;
 typedef std::vector SfxInterfaceArr_Impl;
 
 class SFX2_DLLPUBLIC SfxSlotPool
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 9201f86..f49de94 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -43,7 +43,6 @@
 
 #include 
 
-
 struct SfxSlotType_Impl
 {
 sal_uInt16  nId;
@@ -54,9 +53,6 @@ struct SfxSlotType_Impl
 {}
 };
 
-DECL_PTRARRAY(SfxSlotTypeArr_Impl, SfxSlotType_Impl*, 8, 8)
-
-
 SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager )
  : _pGroups(0)
  , _pTypes(0)
@@ -82,8 +78,8 @@ SfxSlotPool::~SfxSlotPool()
 delete _pGroups;
 if ( _pTypes )
 {
-for ( sal_uInt16 n =_pTypes->Count(); n--; )
-delete _pTypes->GetObject(n);
+for(sal_uInt16 n = 0; n < _pTypes->size(); ++n)
+delete (*_pTypes)[n];
 delete _pTypes;
 }
 }
commit 33e9d339224f2443bc5a69af814a0311d5a2ec7b
Author: August Sodora 
Date:   Fri Jan 20 01:18:22 2012 -0500

DECL_PTRARRAY->std::vector

diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 425ecd7..0c7eab1 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -40,12 +40,10 @@
 
 class SfxInterface;
 class SfxSlot;
-class SfxInterfaceArr_Impl;
 class SfxSlotTypeArr_Impl;
 
 typedef std::basic_string< sal_uInt16 > SfxSlotGroupArr_Impl;
-
-//=
+typedef std::vector SfxInterfaceArr_Impl;
 
 class SFX2_DLLPUBLIC SfxSlotPool
 {
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 9667d72..9201f86 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -43,7 +43,6 @@
 
 #include 
 
-//
 
 struct SfxSlotType_Impl
 {
@@ -55,10 +54,8 @@ struct SfxSlotType_Impl
 {}
 };
 
-DECL_PTRARRAY(SfxInterfaceArr_Impl, SfxInterface*, 6, 3)
 DECL_PTRARRAY(SfxSlotTypeArr_Impl, SfxSlotType_Impl*, 8, 8)
 
-//
 
 SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager )
  : _pGroups(0)
@@ -97,13 +94,13 @@ SfxSlotPool::~SfxSlotPool()
 void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
 {
 // add to the list of SfxObjectInterface instances
-if ( _pInterfaces == 0 )
+if ( _pInterfaces == NULL )
 _pInterfaces = new SfxInterfaceArr_Impl;
-_pInterfaces->Append(&rInterface);
+_pInterfaces->push_back(&rInterface);
 
 // Stop at a (single) Null-slot (for syntactic reasons the interfaces
 // always contain at least one slot)
-if ( rInterface.Count() == 1 && !rInterface[0]->nSlotId )
+if ( rInterface.Count() != 0 && !rInterface[0]->nSlotId )
 return;
 
 // possibly add Interface-id and group-ids of funcs to the list of groups
@@

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

[Michael Stahl]

 basic/source/sbx/sbxvalue.cxx|   15 +--
 dbaccess/source/core/api/RowSetCache.cxx |2 --
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit fd29a786e3e94710d1e79c0a6c510491ef461302
Author: Lionel Elie Mamane 
Date:   Thu Jan 19 19:29:36 2012 +0100

fdo#44025: repair dbaccess::ORowSetCache::isLast() after matrix (re)fill

After filling matrix, *do* check if we hit the last row and update
m_nRowCount accordingly. Else, a subsequent isLast() will return true
on the last row of the prefetch window, even if it is not the last row
of the data. Thus the algorithm:
while ( ! pResultSet->isLast() )
{
//do stuff
pResultSet->next()
}
will stop too soon, which is exactly the symptom in fdo#44025.

Signed-off-by: Michael Stahl 

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 49f6368..272d260 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -803,7 +803,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& 
_nNewStartPos,sal_Int32 _nNewEndPos
 }
 // we have to read one row forward to ensure that we know when we are on 
last row
 // but only when we don't know it already
-/*
 if(!m_bRowCountFinal)
 {
 if(!m_pCacheSet->next())
@@ -816,7 +815,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& 
_nNewStartPos,sal_Int32 _nNewEndPos
m_nRowCount = std::max(i,m_nRowCount);
 
 }
-*/
 return bCheck;
 }
 
commit 7c18b784ce1e6a5e71e978cd3c896b2ddc73d649
Author: Noel Power 
Date:   Fri Jan 20 17:13:41 2012 +

restore special DATE handling code for SbxValue::Compute fdo#44385

restore code that seemed to be erroneously moved as part of the currency 
enhancement feature

Signed-off-by: Michael Stahl 

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 2c36ce5..ed413d4 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1264,16 +1264,6 @@ Lbl_OpIsDouble:
 else aL.nDouble /= aR.nDouble; break;
 case SbxPLUS:
 aL.nDouble += aR.nDouble; break;
-#if 0
-// See 'break' on preceding line... this
-// is unreachable code. Do not delete this
-// #if 0 block unless you know for sure
-// the 'break' above is intentional.
-
-// #45465 Date needs with "+" a special handling: 
forces date type
-if( GetType() == SbxDATE || rOp.GetType() == 
SbxDATE )
-aL.eType = SbxDATE;
-#endif
 case SbxMINUS:
 aL.nDouble -= aR.nDouble; break;
 case SbxNEG:
@@ -1282,6 +1272,11 @@ Lbl_OpIsDouble:
 SetError( SbxERR_NOTIMP );
 }
 
+// #45465 Date needs with "+" a special handling: forces 
date type
+
+if( eOp == SbxPLUS && (GetType() == SbxDATE || 
rOp.GetType() == SbxDATE ) )
+aL.eType = SbxDATE;
+
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - android/qa configure.in desktop/Module_desktop.mk README.Android

[Michael Meeks]

 README.Android|7 +
 android/qa/desktop/AndroidManifest.xml|   23 +++
 android/qa/desktop/Makefile   |  202 ++
 android/qa/desktop/ant.properties |   17 ++
 android/qa/desktop/build.xml  |  114 
 android/qa/desktop/fonts.conf |  134 +++
 android/qa/desktop/local.properties.in|2 
 android/qa/desktop/project.properties |   14 ++
 android/qa/desktop/res/layout/main.xml|   12 +
 android/qa/desktop/res/values/strings.xml |4 
 configure.in  |1 
 desktop/Module_desktop.mk |4 
 12 files changed, 530 insertions(+), 4 deletions(-)

New commits:
commit 4635ed7aee4cf2d74e6a4459ea7c1a8cc64c97e0
Author: Michael Meeks 
Date:   Fri Jan 20 17:21:00 2012 +

android: add new desktop module, it gets to vcl init and fails.

diff --git a/android/qa/desktop/AndroidManifest.xml 
b/android/qa/desktop/AndroidManifest.xml
new file mode 100644
index 000..e59e4b5
--- /dev/null
+++ b/android/qa/desktop/AndroidManifest.xml
@@ -0,0 +1,23 @@
+
+http://schemas.android.com/apk/res/android";
+  package="org.libreoffice.android.libo"
+  android:versionCode="1"
+  android:versionName="1.0">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
new file mode 100644
index 000..96f617f
--- /dev/null
+++ b/android/qa/desktop/Makefile
@@ -0,0 +1,202 @@
+# lo-main-library - parameter denoting which shlib to load and execute
+# 'lo_main' from
+
+include ../../../config_host.mk
+
+# The package of this app
+APP_PACKAGE=org.libreoffice.android.libo
+
+# The name of the Bootstrap activity class
+BOOTSTRAP=org.libreoffice.android.Bootstrap
+
+# The full path the the app's directory needs to be supplied in a
+# couple of places, unfortunately.
+
+APP_DATA_PATH=/data/data/$(APP_PACKAGE)
+
+SODEST=libs/armeabi-v7a
+OBJLOCAL=obj/local/armeabi-v7a
+
+define COPY
+cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1))) && \
+cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
+endef
+
+# The default target just builds.
+
+all: build-ant
+
+buildrcs:
+# main sofficerc ini ...
+   mkdir -p assets/program/
+   echo "[Bootstrap]" > assets/program/sofficerc
+   echo "Logo=1" >> assets/program/sofficerc
+   echo "NativeProgress=1" >> assets/program/sofficerc
+   echo "URE_BOOTSTRAP=file://assets/program/fundamentalrc" >> 
assets/program/sofficerc
+# fundamentalrc ini ...
+   echo "[Bootstrap]" > assets/program/fundamentalrc
+   echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/fundamentalrc
+   echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/fundamentalrc # checkme - is this used to find configs ?
+   echo "BRAND_BASE_DIR=file://assets/" >> assets/program/fundamentalrc
+   echo "CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry 
module:${BRAND_BASE_DIR}/share/registry/modules 
res:${BRAND_BASE_DIR}/share/registry 
bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
xcsxcu:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
 
userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu"
 >> assets/program/fundamentalrc
+   echo 
"URE_BIN_DIR=file://assets/ure/bin/dir/not-here/can-we/exec-anyway" >> 
assets/program/fundamentalrc
+   echo "URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb 
file:///assets/program/types/types.rdb $${URE_MORE_TYPES}" >> 
assets/program/fundamentalrc
+   echo "URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb 
file:///assets/program/services/services.rdb $${URE_MORE_SERVICES}" >> 
assets/program/fundamentalrc
+# unorc ini ...
+   echo "[Bootstrap]" > assets/program/unorc
+   echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/unorc
+   echo "UNO_TYPES=file:///assets/ure/share/misc/types.rdb 
file:///assets/program/types/types.rdb $${URE_MORE_TYPES}" >> 
assets/program/unorc
+   echo "UNO_SERVICES=file:///assets/ure/share/misc/services.rdb 
file:///assets/program/services/services.rdb $${URE_MORE_SERVICES}" >> 
assets/program/unorc
+
+copy-stuff: buildrcs
+#
+# Copy shared libraries we need to libs/armeabi-v7a so that ant will
+

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

[Eike Rathke]

 i18npool/source/localedata/data/gu_IN.xml |  103 --
 1 file changed, 55 insertions(+), 48 deletions(-)

New commits:
commit 4e0928278df9e327dac9ac4d0ebf40bf04ef8dd9
Author: Eike Rathke 
Date:   Fri Jan 20 17:08:49 2012 +0100

corrected [gu-IN] currency symbol update

diff --git a/i18npool/source/localedata/data/gu_IN.xml 
b/i18npool/source/localedata/data/gu_IN.xml
index eff6975..606091f 100644
--- a/i18npool/source/localedata/data/gu_IN.xml
+++ b/i18npool/source/localedata/data/gu_IN.xml
@@ -12,7 +12,7 @@
 
   
   
-  
+  
   
   
   
@@ -143,6 +143,13 @@
   Rupee
   2
 
+
+  INR
+  ઋુ.
+  INR
+  Rupee
+  2
+
   
   
   
commit 5d6af4f2947432a55324e4f5cc67bca202f939e9
Author: Ankitkumar Rameshchandra Patel 
Date:   Fri Jan 20 17:01:38 2012 +0100

changed [gu-IN] month names and reserved words, updated currency symbol

diff --git a/i18npool/source/localedata/data/gu_IN.xml 
b/i18npool/source/localedata/data/gu_IN.xml
index e1b8c14..eff6975 100644
--- a/i18npool/source/localedata/data/gu_IN.xml
+++ b/i18npool/source/localedata/data/gu_IN.xml
@@ -12,7 +12,7 @@
 
   
   
-  
+  
   
   
   
@@ -21,112 +21,112 @@
   
 
   sun
-  ઋવિ.
-  ઋવિવાઋ
+  રવિ
+  રવિવાર
 
 
   mon
-  સોમ.
-  સોમવાઋ્
+  સોમવાર
+  સોમવાર
 
 
   tue
-  મંગલ.
-  મંગલવાઋ
+  મંગળ
+  મંગળવાર
 
 
   wed
-  બુધ.
-  બુધવાઋ
+  બુધ
+  બુધવાર
 
 
   thu
-  ગુઋુ.
-  ગુઋુવાઋ
+  ગુરુ
+  ગુરુવાર
 
 
   fri
-  શુક્ઋ.
-  શુક્ઋવાઋ
+  શુક્ર
+  શુક્રવાર
 
 
   sat
-  શનિ.
-  શનિવાઋ
+  શનિ
+  શનિવાર
 
   
   
 
   jan
-  જનવઋી.
-  જનવઋી
+  જાન
+  જાન્યુઆરી
 
 
   feb
-  ફઋવઋી.
-  ફઋવઋી
+  ફેબ
+  ફેબ્રુઆરી
 
 
   mar
-  માઋ્ચ.
-  માઋ્ચ
+  માર્ચ
+  માર્ચ
 
 
   apr
-  અપ્ઋેલ.
-  અપ્ઋેલ
+  એપ્રિલ
+  એપ્રિલ
 
 
   may
-  મઈ.
-  મઈ
+  મે
+  મે
 
 
   jun
-  જૂન.
+  જૂન
   જૂન
 
 
   jul
-  જુલાઇ.
+  જુલ
   જુલાઇ
 
 
   aug
-  અગસ્ત.
-  અગસ્ત
+  ઑગ
+  ઑગસ્ટ
 
 
   sep
-  સિતંબઋ.
-  સિતંબઋ
+  સપ્ટ
+  સપ્ટેમ્બર
 
 
   oct
-  અક્તોબઋ.
-  અક્તોબઋ
+  ઑક્ટ
+  ઑક્ટોબર
 
 
   nov
-  નવંબઋ.
-  નવંબઋ
+  નવ
+  નવેમ્બર
 
 
   dec
-  ડિસધંબઋ.
-  ડિસંબઋ
+  ડિસ
+  ડિસેમ્બર
 
   
   
 
   bc
-  
ઈસાપૂઋ્વ.હ્ન
-  ઈસાપૂઋ્વ.
+  ઈ.સ.પૂ.
+  
ઈસવીસનપૂર્વે
 
 
   ad
-  સન.
-  સન.
+  ઈ.સ.
+  ઈસવીસન
 
   
   
@@ -138,7 +138,7 @@
   
 
   INR
-  ઋુ.
+  ₹
   INR
   Rupee
   2
@@ -154,13 +154,13 @@
   
 
 
-  સહી
-  ગલત
-  પેહલા હંત 1
-  ડૂસઋા હંત 2
-  તીસઋા હંત 3
-  ચૌતા હંત 4
-  ઊપઋ
+  ખરું
+  ખોટું
+  ચતુર્થાંશ૧
+  ચતુર્થાંશ૨
+  ચતુર્થાંશ૩
+  ચતુર્થાંશ૪
+  ઊપર
   નીચે
   Q1
   Q2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists

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

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a4bd804fd95a4a79ec4ebb64555aade5bea63a14
Author: Fridrich Å trba 
Date:   Fri Jan 20 16:12:13 2012 +0100

Fix WiLangId.vbs operation

The script needs %TEMP% to be set in order to work properly.
Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the
TEMP variable to $TMPDIR before we call the cscript.exe.

Signed-off-by: Michael Meeks 

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a743b45..96c9606 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -980,8 +980,10 @@ sub create_transforms
 
 installer::logger::include_header_into_logfile("Creating Transforms");
 
+my $cscript = "cscript.exe";# Has to be in the path
 my $msitran = "msitran.exe";# Has to be in the path
 my $msidb = "msidb.exe";# Has to be in the path
+my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for 
WiLangId.vbs to work
 my $wilangid = $ENV{WINDOWS_SDK_HOME} . 
"/Samples/SysMgmt/Msi/scripts/WiLangId.vbs";
 
 my $from = cwd();
@@ -1121,7 +1123,7 @@ sub create_transforms
 }
 }
 
-$systemcall = "cscript.exe " . $wilangid . " " . $basedbname . " Package " 
. $templatevalue;
+$systemcall = "TEMP=" . $tmpdir . " " . $cscript . " " . $wilangid . " " . 
$basedbname . " Package " . $templatevalue;
 
 $returnvalue = system($systemcall);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: shell/source

[Jesús Corrius]

 shell/source/win32/shlxthandler/util/utilities.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 933cb63dcc51a15cab8ecebcbbe23ca258f90e78
Author: Jesús Corrius 
Date:   Fri Jan 20 15:50:14 2012 +0100

Fix spelling typo

diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx 
b/shell/source/win32/shlxthandler/util/utilities.cxx
index 6e540a0..214d63e 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -150,7 +150,7 @@ bool HasOnlySpaces(const std::wstring& String)
 }
 
 //-
-/** helper function to convert windows pathes to short form.
+/** helper function to convert windows paths to short form.
 @returns
 shortend path.
 */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 490301650899abec73128258569e0dffdc52d7c9
Author: Fridrich Å trba 
Date:   Fri Jan 20 16:12:13 2012 +0100

Fix WiLangId.vbs operation

The script needs %TEMP% to be set in order to work properly.
Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the
TEMP variable to $TMPDIR before we call the cscript.exe.

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a097780..f7185d3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -980,8 +980,10 @@ sub create_transforms
 
 installer::logger::include_header_into_logfile("Creating Transforms");
 
+my $cscript = "cscript.exe";# Has to be in the path
 my $msitran = "msitran.exe";# Has to be in the path
 my $msidb = "msidb.exe";# Has to be in the path
+my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for 
WiLangId.vbs to work
 my $wilangid = $ENV{WINDOWS_SDK_HOME} . 
"/Samples/SysMgmt/Msi/scripts/WiLangId.vbs";
 
 my $from = cwd();
@@ -1121,7 +1123,7 @@ sub create_transforms
 }
 }
 
-$systemcall = "cscript.exe " . $wilangid . " " . $basedbname . " Package " 
. $templatevalue;
+$systemcall = "TEMP=" . $tmpdir . " " . $cscript . " " . $wilangid . " " . 
$basedbname . " Package " . $templatevalue;
 
 $returnvalue = system($systemcall);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Cédric Bosdonnat]

 sw/source/ui/docvw/PageBreakWin.cxx|   22 --
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   19 ---
 2 files changed, 32 insertions(+), 9 deletions(-)

New commits:
commit 23ac66dd14d09acc07868ee75da05073c6a78f44
Author: Miklos Vajna 
Date:   Fri Jan 20 01:36:25 2012 +0100

Fix RTF import of dotted and word underline

The problem was that these are flags, not toggles.

Signed-off-by: Cédric Bosdonnat 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 82b2a31..62445de 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1455,6 +1455,21 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 checkUnicode();
 RTFSkipDestination aSkip(*this);
 int nParam = -1;
+int nSprm = -1;
+
+// Map all underline flags to a single sprm.
+switch (nKeyword)
+{
+case RTF_ULD: nSprm = 4; break;
+case RTF_ULW: nSprm = 2; break;
+default: break;
+}
+if (nSprm >= 0)
+{
+RTFValue::Pointer_t pValue(new RTFValue(nSprm));
+m_aStates.top().aCharacterSprms->push_back(make_pair(NS_sprm::LN_CKul, 
pValue));
+return 0;
+}
 
 // Indentation
 switch (nKeyword)
@@ -2558,11 +2573,10 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword 
nKeyword, bool bParam, int nParam
 int nSprm = -1;
 RTFValue::Pointer_t pBoolValue(new RTFValue(!bParam || nParam != 0));
 
-// Map all underline keywords to a single sprm.
+// Map all underline toggles to a single sprm.
 switch (nKeyword)
 {
 case RTF_UL: nSprm = 1; break;
-case RTF_ULD: nSprm = 4; break;
 case RTF_ULDASH: nSprm = 7; break;
 case RTF_ULDASHD: nSprm = 9; break;
 case RTF_ULDASHDD: nSprm = 10; break;
@@ -2576,7 +2590,6 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, 
bool bParam, int nParam
 case RTF_ULTHDASHDD: nSprm = 26; break;
 case RTF_ULTHLDASH: nSprm = 55; break;
 case RTF_ULULDBWAVE: nSprm = 43; break;
-case RTF_ULW: nSprm = 2; break;
 case RTF_ULWAVE: nSprm = 11; break;
 default: break;
 }
commit 0c8c85ec6ec3a19f86df844b59b2f540d8972186
Author: Cédric Bosdonnat 
Date:   Fri Jan 20 15:40:02 2012 +0100

Revert "Page Breaks: IsLeaveWindow() is unreliable, we do not need it here."

This reverts commit 1e0de54d88a79c99f0671f608f7de096cb721537. This
commit introduces the button flickering behavior.

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index ff5050b..0edeb61 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -83,11 +83,17 @@ namespace
 
 void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt )
 {
-Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !m_pWin->Contains( aEventPos ) )
-m_pWin->Fade( false );
+if ( rMEvt.IsLeaveWindow() )
+{
+// don't fade if we just move to the 'button'
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !m_pWin->Contains( aEventPos ) )
+m_pWin->Fade( false );
+}
 else if ( !m_pWin->IsVisible() )
+{
 m_pWin->Fade( true );
+}
 
 if ( !rMEvt.IsSynthetic() )
 {
@@ -303,9 +309,13 @@ void SwPageBreakWin::Select( )
 
 void SwPageBreakWin::MouseMove( const MouseEvent& rMEvt )
 {
-Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !Contains( aEventPos ) && !PopupMenu::IsInExecute() )
-Fade( false );
+if ( rMEvt.IsLeaveWindow() )
+{
+// don't fade if we just move to the 'line', or the popup menu is open
+Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !Contains( aEventPos ) && !PopupMenu::IsInExecute() )
+Fade( false );
+}
 else if ( !IsVisible() )
 Fade( true );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 tools/inc/tools/fsys.hxx |   15 ---
 tools/inc/tools/stream.hxx   |   10 +-
 tools/source/fsys/dirent.cxx |   26 +-
 3 files changed, 10 insertions(+), 41 deletions(-)

New commits:
commit 9e5ad09552c8e3beba619a46d3bec6a508d877b2
Author: Michael Meeks 
Date:   Fri Jan 20 14:55:06 2012 +

cleanup: privatise SvStream's LockFile impl. and in-line Redirector bits

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 33cb5e1..4160e19 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -453,21 +453,6 @@ class FSysRedirector
 static sal_Bool _bEnabled;
 
 public:
-/** This method must called with the one and only instance of the
-subclass which implements the redirection.
-
-It must be called with 0 when the instance is destroyed.
- */
-static void Register( FSysRedirector *pRedirector );
-
-//---
-/** This method returns the currently registererd instance of
-a subclass which implements the redirection.
-
-If no redirector is registered, it returns 0.
- */
-static FSysRedirector*  Redirector();
-
 //---
 /** This method is to be used to redirect a file system path.
 
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 8c7fa0c..e8f414b 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -586,6 +586,11 @@ private:
 SvFileStream (const SvFileStream&);
 SvFileStream & operator= (const SvFileStream&);
 
+sal_Bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
+sal_Bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
+sal_Bool LockFile();
+sal_Bool UnlockFile();
+
 protected:
 
 virtual sal_SizeGetData( void* pData, sal_Size nSize );
@@ -602,11 +607,6 @@ public:
 
 virtual voidResetError();
 
-sal_BoolLockRange( sal_Size nByteOffset, sal_Size nBytes );
-sal_BoolUnlockRange( sal_Size nByteOffset, sal_Size nBytes );
-sal_BoolLockFile();
-sal_BoolUnlockFile();
-
 voidOpen( const String& rFileName, StreamMode eOpenMode );
 voidClose();
 sal_BoolIsOpen() const { return bIsOpen; }
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index e52fbba..2f726d0 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -140,17 +140,6 @@ sal_Bool bInRedirection = sal_False;
 static osl::Mutex* pRedirectMutex = 0;
 
 //
-void FSysRedirector::Register( FSysRedirector *pRedirector )
-{
-if ( pRedirector )
-pRedirectMutex = new osl::Mutex;
-else
-DELETEZ( pRedirectMutex );
-_pRedirector = pRedirector;
-}
-
-//
-
 void FSysRedirector::DoRedirect( String &rPath )
 {
 String aURL(rPath);
@@ -185,21 +174,16 @@ void FSysRedirector::DoRedirect( String &rPath )
 aURL.Insert( String("file:///", osl_getThreadTextEncoding()), 0 );
 
 // do redirection
-Redirector();
+if ( !_pRedirector )
+{
+pRedirectMutex = new osl::Mutex;
+_pRedirector = new FSysRedirector;
+}
 
 bInRedirection = sal_False;
 return;
 }
 
-//
-
-FSysRedirector* FSysRedirector::Redirector()
-{
-if ( !_pRedirector )
-Register( new FSysRedirector );
-return _pRedirector;
-}
-
 #endif // BOOTSTRAP
 
 //
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - connectivity/source svl/Module_svl.mk sw/source xmloff/source

[Michael Stahl]

 connectivity/source/drivers/file/FResultSet.cxx |   50 +---
 svl/Module_svl.mk   |1 
 sw/source/ui/config/optpage.cxx |4 +
 xmloff/source/text/txtparae.cxx |   32 ++-
 4 files changed, 44 insertions(+), 43 deletions(-)

New commits:
commit c82ed24c4e51492105b5d94e164ece3cf86d6d86
Author: Michael Stahl 
Date:   Fri Jan 20 13:45:54 2012 +0100

rhbz#746174: also export list restart for non root list

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 6db50ff..3761121 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -906,8 +906,8 @@ void XMLTextParagraphExport::exportListChange(
 // Thus, for other document types  is empty.
 const ::rtl::OUString sListId( rNextInfo.GetListId() );
 bool bExportListStyle( true );
-bool bRestartNumberingAtContinuedRootList( false );
-sal_Int16 nRestartValueForContinuedRootList( -1 );
+bool bRestartNumberingAtContinuedList( false );
+sal_Int32 nRestartValueForContinuedList( -1 );
 bool bContinueingPreviousSubList = !bRootListToBeStarted &&

rNextInfo.IsContinueingPreviousSubTree();
 do {
@@ -980,9 +980,9 @@ void XMLTextParagraphExport::exportListChange(
  ( nListLevelsToBeOpened != 1 ||
!rNextInfo.HasStartValue() ) )
 {
-bRestartNumberingAtContinuedRootList = true;
-nRestartValueForContinuedRootList =
-
rNextInfo.GetListLevelStartValue();
+bRestartNumberingAtContinuedList = true;
+nRestartValueForContinuedList =
+rNextInfo.GetListLevelStartValue();
 }
 }
 
@@ -1003,6 +1003,18 @@ void XMLTextParagraphExport::exportListChange(
 GetExport().AddAttribute( XML_NAMESPACE_TEXT, 
XML_STYLE_NAME,
 GetExport().EncodeStyleName( sListStyleName ) );
 bExportListStyle = false;
+
+
+}
+else
+{
+// rhbz#746174: also export list restart for non root list
+if (rNextInfo.IsRestart() && !rNextInfo.HasStartValue())
+{
+bRestartNumberingAtContinuedList = true;
+nRestartValueForContinuedList =
+rNextInfo.GetListLevelStartValue();
+}
 }
 
 if ( bContinueingPreviousSubList )
@@ -1030,9 +1042,7 @@ void XMLTextParagraphExport::exportListChange(
 //  or 
 GetExport().CheckAttrList();
 
-/* Export start value in case of 

-   at correct list item (#i97309#)
-*/
+/* Export start value at correct list item (#i97309#) */
 if ( nListLevelsToBeOpened == 1 )
 {
 if ( rNextInfo.HasStartValue() )
@@ -1042,14 +1052,14 @@ void XMLTextParagraphExport::exportListChange(
 GetExport().AddAttribute( XML_NAMESPACE_TEXT, 
XML_START_VALUE,
   aBuffer.makeStringAndClear() );
 }
-else if ( bRestartNumberingAtContinuedRootList )
+else if (bRestartNumberingAtContinuedList)
 {
 OUStringBuffer aBuffer;
-aBuffer.append( 
(sal_Int32)nRestartValueForContinuedRootList );
+aBuffer.append( nRestartValueForContinuedList );
 GetExport().AddAttribute( XML_NAMESPACE_TEXT,
   XML_START_VALUE,
   aBuffer.makeStringAndClear() 
);
-bRestartNumberingAtContinuedRootList = false;
+bRestartNumberingAtContinuedList = false;
 }
 }
 
commit 35e8190b0317972abb376dd2ed55567c43bc8b4d
Author: Michael Stahl 
Date:   Thu Jan 19 15:25:07 2012 +0100

connectivity: fdo#43479: fix crash on DISTINCT:

Since commit f89f2b8bf506de0cc547ad596c75cbe1a0cf1ef1,
OResultSet::sortRows() works on the rows after SELECT, not on full rows.
So OResultSet::OpenImpl() has to be adapted to not use the mapping from
selected columns to entries rows in m_aColMapping any more; instead,
use the given ORDER BY clause for sorting.
But first extend the sort order to cover all columns, so it is no longer

[Libreoffice-commits] .: sal/osl

[Fridrich Strba]

 sal/osl/w32/file_dirvol.cxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 5a8a1d024bee83eff8d9a85ae6dda6c8823c3f2e
Author: Michael Meeks 
Date:   Fri Jan 20 15:01:14 2012 +0100

Implement osl_identicalDirectoryItem for win32

diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 8e3ea7f..7694818 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -1219,6 +1219,26 @@ oslFileError SAL_CALL osl_releaseDirectoryItem( 
oslDirectoryItem Item )
 return osl_File_E_None;
 }
 
+
+sal_Bool
+SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
+{
+DirectoryItem_Impl *pA = (DirectoryItem_Impl *) a;
+DirectoryItem_Impl *pB = (DirectoryItem_Impl *) b;
+if (a == b)
+return sal_True;
+/* same name => same item, unless renaming / moving madness has occurred */
+if (rtl_ustr_compare_WithLength(
+pA->m_pFullPath->buffer, pA->m_pFullPath->length,
+pB->m_pFullPath->buffer, pB->m_pFullPath->length ) == 0)
+return sal_True;
+
+// FIXME: as/when/if this is used in anger on Windows we could
+// do better here.
+
+return sal_False;
+}
+
 //#
 // volume / file info handling functions
 //#
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Fridrich Strba]

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

New commits:
commit 7514488ad4c3e8289aebe3a03bd14c293479627b
Author: Fridrich Å trba 
Date:   Fri Jan 20 14:44:42 2012 +0100

Oops, my bad

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index a0559ff..284c2eb 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -254,7 +254,7 @@ define gb_Helper_convert_native
 $(subst file:!!!,file:///, \
 $(subst //,/, \
 $(subst file:///,file:!!!, \
-$(subst $(REPODIR),$(pathsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
+$(subst $(REPODIR),$(patsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Fridrich Strba]

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

New commits:
commit 29a3d25eb516adf3fbf73520c9196be11f5cb5e3
Author: Matus Kukan 
Date:   Fri Jan 20 14:35:41 2012 +0100

Fix windows build of cppu

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 7552f09..a0559ff 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -254,7 +254,7 @@ define gb_Helper_convert_native
 $(subst file:!!!,file:///, \
 $(subst //,/, \
 $(subst file:///,file:!!!, \
-$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
+$(subst $(REPODIR),$(pathsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: README.Android

[Michael Meeks]

 README.Android |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 0eef5f6b501ca9d2fb105d276ef86c896671e9cc
Author: Michael Meeks 
Date:   Fri Jan 20 12:08:01 2012 +

android: Add debugging tips

diff --git a/README.Android b/README.Android
index 555f093..aae6531 100644
--- a/README.Android
+++ b/README.Android
@@ -28,6 +28,22 @@ this point:
 
and continue onwards & upwards.
 
+* Debugging
+
+   Debugging is fun, the default NDK gdb (in v7) is busted, you
+need to download a new one from:
+
+   http://code.google.com/p/mingw-and-ndk/
+
+   Even this 'fixed' gdb is broken in the way that it can see
+symbols only for shlibs that were already loaded when the debuggee was
+attached, so you need to carefully guess where to put:
+
+   fprintf(stderr, "Sleeping NOW!\n"); ::sleep(20);
+
+   into the code; and when you see that in logcat, you have time
+to run: ndk-gdb and it will attach the process.
+
 * Detailed explanation
 
 Unit tests are the first thing we want to run on Android, to get some
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: README.cross

[Tor Lillqvist]

 README.cross |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4a4edda5fab3f01ae83e10d43e90f26ec0219530
Author: Tor Lillqvist 
Date:   Fri Jan 20 13:28:28 2012 +0200

Add --with-android-sdk to the sample autogen.lastrun

diff --git a/README.cross b/README.cross
index 31bcbf3..67fb1d4 100644
--- a/README.cross
+++ b/README.cross
@@ -327,6 +327,7 @@ Here is my autogen.lastrun for Android, when 
cross-compiling from Mac OS X:
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
 --with-android-ndk=/Users/tml/android-ndk-r7
+--with-android-sdk=/Users/tml/android-sdk-macosx
 --build=x86_64-apple-darwin11
 --disable-zenity
 --enable-werror
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - android/qa config_host.mk.in configure.in README.cross

[Tor Lillqvist]

 README.cross  |2 -
 android/qa/sc/Makefile|   21 -
 android/qa/sc/local.properties.in |2 +
 config_host.mk.in |1 
 configure.in  |   59 --
 5 files changed, 67 insertions(+), 18 deletions(-)

New commits:
commit dd013e7a6f68ab144ce2330ca139cd5d5e80e479
Author: Tor Lillqvist 
Date:   Fri Jan 20 13:20:13 2012 +0200

Improve Android configury

Add a --with-android-sdk switch, and make that and the
--with-android-ndk mandatory when building for Android. Automatically
create a proper android/sc/qa/local.properties file (which points to
the SDK) for Ant.

Restore the Android ARM code generation related flags that I think we
want to use (that used to be mentioned in README.cross but were
accidentally dropped) to the automated setting of CC and CXX.

diff --git a/android/qa/sc/local.properties.in 
b/android/qa/sc/local.properties.in
new file mode 100644
index 000..27c8eb5
--- /dev/null
+++ b/android/qa/sc/local.properties.in
@@ -0,0 +1,2 @@
+# Location of the SDK. This is only used by Ant.
+sdk.dir=@ANDROID_SDK_HOME@
diff --git a/config_host.mk.in b/config_host.mk.in
index 9bd874d..7087cb4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -12,6 +12,7 @@ export ALIGNOF_SHORT="@ALIGNOF_SHORT@"
 export ALLOC="@ALLOC@"
 export ANCIENT_BISON="@ANCIENT_BISON@"
 export ANDROID_NDK_HOME="@ANDROID_NDK_HOME@"
+export ANDROID_SDK_HOME="@ANDROID_SDK_HOME@"
 export AR="@AR@"
 export AWTLIB='@AWTLIB@'
 export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@"
diff --git a/configure.in b/configure.in
index f9a889e..d3c4864 100644
--- a/configure.in
+++ b/configure.in
@@ -90,25 +90,40 @@ if test -z "$SED"; then
 fi
 
 dnl ===
-dnl Building with an android-ndk implies a lot of pre-canned defaults
+dnl When building for Android the --with-android-ndk is mandatory
 dnl ===
 ANDROID_NDK_HOME=
-if test "z$with_android_ndk" != "z"; then
+if test -n "$with_android_ndk"; then
ANDROID_NDK_HOME=$with_android_ndk
+   # Set up a lot of pre-canned defaults
+   # What if the NDK at some point starts including several toolchains for 
different
+   # gcc versions (like some 3rd-party improved NDK builds already do)?
+   # Then the use of a wildcard below will break.
ANDROID_ABI_PREBUILT_BIN=`echo 
$ANDROID_NDK_HOME/toolchains/arm-linux*/prebuilt/*/bin`
+
test -z "$SYSBASE" && SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-arm
test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ar
test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-nm
test -z "$OBJDUMP" && 
OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-objdump
test -z "$RANLIB" && 
RANLIB=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ranlib
test -z "$STRIP" && 
STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip
-   test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
--sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm  
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
-   test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
--sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -I 
$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions 
-frtti"
-#   PATH="$ANDROID_NDK_HOME/:$PATH"
+
+   ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
+   test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
$ANDROIDCFLAGS"
+   test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-fexceptions -frtti"
 fi
 AC_SUBST(ANDROID_NDK_HOME)
 
 dnl ===
+dnl Also --with-android-sdk is mandatory
+dnl ===
+ANDROID_SDK_HOME=
+if test -n "$with_android_sdk"; then
+   ANDROID_SDK_HOME=$with_android_sdk
+fi
+AC_SUBST(ANDROID_SDK_HOME)
+
+dnl ===
 dnl The following is a list of supported systems.
 dnl Sequential to keep the logic very simple
 dnl These values may be checked and reset later.
@@ -301,14 +316,22 @@ linux-androideabi*)
 test_unix_quickstarter=no
 _os=Android
 
-# Make sure env vars pointing to where to find the cross-build
-# toolchain are set. The

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

[Stephan Bergmann]

 binfilter/bf_sc/source/core/data/sc_cell.cxx  |   12 +---
 binfilter/bf_sc/source/core/data/sc_cell2.cxx |3 -
 binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx  |   11 +---
 binfilter/bf_sc/source/core/tool/sc_interpr1.cxx  |6 +-
 binfilter/bf_sc/source/core/tool/sc_token.cxx |   22 +++-
 binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx |   58 +++---
 binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx   |2 
 binfilter/bf_sw/source/core/text/sw_txtinit.cxx   |   10 +--
 8 files changed, 55 insertions(+), 69 deletions(-)

New commits:
commit bee87efffce9405cbb47c46b1b1b06ca5b89209f
Author: Stephan Bergmann 
Date:   Fri Jan 20 11:46:18 2012 +0100

Mempool size args are unused.

diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx 
b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 8ccfe99..503eafd 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -79,14 +79,10 @@ namespace binfilter {
 
 #ifdef USE_MEMPOOL
 // MemPools auf 4k Boundaries  - 64 Bytes ausrichten
-/*N*/ const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
-/*N*/ const USHORT nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
-/*N*/ const USHORT nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
-/*N*/ const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell,   nMemPoolValueCell, 
nMemPoolValueCell )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, 
nMemPoolFormulaCell )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell,  nMemPoolStringCell, 
nMemPoolStringCell )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell,  nMemPoolNoteCell, 
nMemPoolNoteCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell )
 #endif
 
 #ifdef _MSC_VER
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx 
b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index 06844cb..e381e29 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -53,8 +53,7 @@ namespace binfilter {
 #endif
 
 #ifdef USE_MEMPOOL
-const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell, nMemPoolEditCell, nMemPoolEditCell 
)
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell )
 #endif
 
 #ifdef _MSC_VER
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx 
b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index ce2fd90..ed20bb9 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -58,11 +58,9 @@ namespace binfilter {
 
 /*N*/ DECLARE_STACK( ScChangeActionStack, ScChangeAction* )
 
-const USHORT nMemPoolChangeActionCellListEntry = (0x2000 - 64) / 
sizeof(ScChangeActionCellListEntry);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry, 
nMemPoolChangeActionCellListEntry, nMemPoolChangeActionCellListEntry )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry )
 
-const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / 
sizeof(ScChangeActionLinkEntry);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, 
nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
 
 // loaded MSB > eigenes => inkompatibel
 #define SC_CHGTRACK_FILEFORMAT_FIRST0x0001
@@ -1340,8 +1338,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 
64) / sizeof(ScChangeActi
 
 // --- ScChangeActionContent ---
 
-const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / 
sizeof(ScChangeActionContent);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent, 
nMemPoolChangeActionContent, nMemPoolChangeActionContent )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent )
 
 
 /*N*/ ScChangeActionContent::ScChangeActionContent( SvStream& rStrm,
@@ -1999,7 +1996,7 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) 
/ sizeof(ScChangeAction
 
 // --- ScChangeTrack ---
 
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo, 16, 16 )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
 
 const USHORT ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot();
 const USHORT ScChangeTrack::nContentSlots =
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx 
b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 9eb51bd..f8622b9 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -73,9 +73,9 @@ namespace binfilter {
 /*N*/ #pragma code_seg("SCSTATICS")
 /*N*/ #endif
 
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack, 8, 4 )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScErrorStack, 8, 4 )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter, 32,

[Libreoffice-commits] .: 3 commits - README.Android vcl/android vcl/Library_vcl.mk

[Michael Meeks]

 README.Android  |   30 
 vcl/Library_vcl.mk  |   17 -
 vcl/android/androidinst.cxx |   55 +++-
 3 files changed, 100 insertions(+), 2 deletions(-)

New commits:
commit 56db0770f64a1b68c3f5c08106562a10d521a894
Author: Michael Meeks 
Date:   Fri Jan 20 10:19:42 2012 +

android: more goodness into the README a bit more

diff --git a/README.Android b/README.Android
index 503b50b..555f093 100644
--- a/README.Android
+++ b/README.Android
@@ -20,7 +20,13 @@ Then it is necessary to get stdout/err to go to somewhere we 
can find it:
make run ; adb shell logcat
 
And if all goes well - you should have some nice unit
-test output to enjoy.
+test output to enjoy. After a while of this loop you'll probably
+find that android has lost a lot of space on your device at
+this point:
+
+   adb shell stop ; adb shell start
+
+   and continue onwards & upwards.
 
 * Detailed explanation
 
commit d45b38c9e332b184d3e61b38403c0e867ab6653b
Author: Michael Meeks 
Date:   Fri Jan 20 09:44:26 2012 +

android: add missing VCL init symbol goodness

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 647bb2e..3983608 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -458,11 +458,26 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/generic/fontmanager/fontmanager \
 vcl/generic/fontmanager/helper \
 vcl/generic/fontmanager/parseAFM \
-vcl/android/androidinst \
 vcl/unx/generic/printer/jobdata \
 vcl/unx/generic/printer/ppdparser \
 vcl/null/printerinfomanager \
+vcl/android/androidinst \
+vcl/headless/svpbmp \
+vcl/headless/svpdummies \
+vcl/headless/svpelement \
+vcl/headless/svpframe \
+vcl/headless/svpgdi \
+vcl/headless/svpinst \
+vcl/headless/svpdata \
+vcl/headless/svpprn \
+vcl/headless/svptext \
+vcl/headless/svpvd \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+   basebmp \
 ))
+
 $(eval $(call gb_Library_use_externals,vcl,\
fontconfig \
freetype \
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 3ce5d5b..6a1bbcd 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -52,9 +52,14 @@ public:
   int nDefButton )
 {
 (void)rButtons; (void)nDefButton;
+#if 0
 __android_log_print(ANDROID_LOG_INFO, "LibreOffice - dialog '%s': 
'%s'",
 rtl::OUStringToOString(rTitle, 
RTL_TEXTENCODING_ASCII_US).getStr(),
 rtl::OUStringToOString(rMessage, 
RTL_TEXTENCODING_ASCII_US).getStr());
+#endif
+fprintf (stderr, "LibreOffice - dialog '%s': '%s'",
+ rtl::OUStringToOString(rTitle, 
RTL_TEXTENCODING_ASCII_US).getStr(),
+ rtl::OUStringToOString(rMessage, 
RTL_TEXTENCODING_ASCII_US).getStr());
 return 0;
 }
 };
@@ -74,9 +79,57 @@ public:
 
 SalInstance *CreateSalInstance()
 {
-SvpSalInstance* pInstance = new SvpSalInstance( new SalYieldMutex() );
+AndroidSalInstance* pInstance = new AndroidSalInstance( new 
SalYieldMutex() );
 new AndroidSalData( pInstance );
 return pInstance;
 }
 
+void DestroySalInstance( SalInstance *pInst )
+{
+pInst->ReleaseYieldMutex();
+delete pInst;
+}
+
+// All the interesting stuff is slaved from the AndroidSalInstance
+void InitSalData()   {}
+void DeInitSalData() {}
+void InitSalMain()   {}
+void DeInitSalMain() {}
+
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+{
+rtl::OUString aError( rErrorText );
+if( aError.isEmpty() )
+aError = rtl::OUString::createFromAscii("Unknown application error");
+::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, 
osl_getThreadTextEncoding()).getStr() );
+
+#if 0
+__android_log_print(ANDROID_LOG_INFO, "SalAbort: '%s'",
+rtl::OUStringToOString(aError, 
RTL_TEXTENCODING_ASCII_US).getStr());
+#endif
+fprintf( stderr, "SalAbort: '%s'",
+ rtl::OUStringToOString(aError, 
RTL_TEXTENCODING_ASCII_US).getStr() );
+if( bDumpCore )
+abort();
+else
+_exit(1);
+}
+
+const OUString& SalGetDesktopEnvironment()
+{
+static rtl::OUString aEnv( RTL_CONSTASCII_USTRINGPARAM( "android" ) );
+return aEnv;
+}
+
+SalData::SalData() :
+m_pInstance( 0 ),
+m_pPlugin( 0 ),
+m_pPIManager(0 )
+{
+}
+
+SalData::~SalData()
+{
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a0ce2a2f7a8533fd2ea6cd4a05e250a32f609ed7
Author: Michael Meeks 
Date:   Fri Jan 20 09:44:00 2012 +

android: more notes on running the test

diff --git a/README.Android b/README.Android
index e58c811..503b50b 100644
--- a/README.Android
+++ b/README.Android
@@ -1,5 +1,29 @@
 Android-specific notes
 
+* Getting something running
+
+   Create an AVD in the android UI, don't even try to get
+the data 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - libvisio/libvisio-0.0.13.patch libvisio/libvisio-0.0.14.patch libvisio/makefile.mk ooo.lst.in writerperfect/source

[Fridrich Strba]

 libvisio/libvisio-0.0.13.patch   |   20 
 libvisio/libvisio-0.0.14.patch   |   20 
 libvisio/makefile.mk |4 +-
 ooo.lst.in   |2 -
 writerperfect/source/filter/OdgGenerator.cxx |   43 +--
 5 files changed, 64 insertions(+), 25 deletions(-)

New commits:
commit a61ea02511d6e81035495fefaa24e77b30701362
Author: Fridrich Å trba 
Date:   Fri Jan 20 10:51:35 2012 +0100

Uploading even newer and even more shiny libvisio 0.0.14

Signed-off-by: Thorsten Behrens 

diff --git a/libvisio/libvisio-0.0.13.patch b/libvisio/libvisio-0.0.13.patch
deleted file mode 100644
index c93983b..000
--- a/libvisio/libvisio-0.0.13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/libvisio-0.0.13/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.13/src/lib/libvisio_utils.h
-@@ -42,17 +42,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#endif
- 
- #endif
- 
diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch
new file mode 100644
index 000..456f5ad
--- /dev/null
+++ b/libvisio/libvisio-0.0.14.patch
@@ -0,0 +1,20 @@
+--- misc/libvisio-0.0.14/src/lib/libvisio_utils.h
 misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h
+@@ -42,17 +42,8 @@
+ 
+ #else
+ 
+-#ifdef HAVE_CONFIG_H
+-#include 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#endif
+ 
+ #endif
+ 
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 6d29b7d..9adf426 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
-TARFILE_NAME=libvisio-0.0.13
-TARFILE_MD5=adb5c5c8398fd89ebee2d9b4e90e061e
+TARFILE_NAME=libvisio-0.0.14
+TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9
 
 PATCH_FILES=\
 $(TARFILE_NAME).patch
diff --git a/ooo.lst.in b/ooo.lst.in
index 3ebd860..a71ed38 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
+776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
commit 4a49fcfe961f7f6fe78378e8fa94fb3697c53007
Author: Fridrich Å trba 
Date:   Mon Jan 16 17:32:23 2012 +0100

Implementing text rotations

Signed-off-by: Thorsten Behrens 

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 5681ed5..79722e8 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1371,10 +1371,27 @@ void OdgGenerator::startTextObject(const 
WPXPropertyList &propList, const WPXPro
 pStyleGraphicPropertiesOpenElement->addAttribute("draw:fill", "none");
 pStyleGraphicPropertiesOpenElement->addAttribute("draw:fill-color", 
"#ff");
 
+double x = 0.0;
+double y = 0.0;
+double height = 0.0;
+double width = 0.0;
 if (propList["svg:x"])
-pDrawFrameOpenElement->addAttribute("svg:x", 
propList["svg:x"]->getStr());
+x = propList["svg:x"]->getDouble();
 if (propList["svg:y"])
-pDrawFrameOpenElement->addAttribute("svg:y", 
propList["svg:y"]->getStr());
+y = propList["svg:y"]->getDouble();
+if (propList["svg:width"])
+width = propList["svg:width"]->getDouble();
+if (propList["svg:height"])
+height = propList["svg:height"]->getDouble();
+
+double angle(propList["libwpg:rotate"] ? - M_PI * 
propList["libwpg:rotate"]->getDouble() / 180.0 : 0.0);
+if (angle != 0.0)
+{
+double deltax((width*cos(angle)+height*sin(angle)-width)/2.0);
+double deltay((-width*sin(angle)+height*cos(angle)-height)/2.0);
+x -= deltax;
+y -= deltay;
+}
 
 if (!propList["svg:width"] && !propList["svg:height"])
 {
@@ -1452,6 +1469,28 @@ void OdgGenerator::startTextObject(const WPXPropertyList 
&propList, const WPXPro
 pDrawFrameOpenElement->addAttribute("draw:opacity", 
propList["draw:opacity"]->getStr());
 pStyleGraphicPropertiesOpenElement->addAttribute("draw:opacity", 
propList["draw:opacity"]->getStr());
 }
+
+WPXProperty *svg_x = WPXPropertyFactory::newInchProp(x);
+WPXProperty *svg_y = WPXPropertyFactory::newInchProp(y);
+if (angle != 0.0)
+{
+WPXProperty *libwpg_rotate = WPXPropertyFactory::newDoubleProp(angle);
+sValue.sprintf("rotate (%s) translate(%s, %s)",
+   libwpg_rotate->getStr().cstr(),
+

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

[Andras Timar]

 cui/source/tabpages/tabarea.src |  205 
 1 file changed, 148 insertions(+), 57 deletions(-)

New commits:
commit 4039f725e784031ebb8370da74cc5c2f9f55bb64
Author: David Tardon 
Date:   Fri Jan 20 10:32:42 2012 +0100

add missing semicolons. *blush*

Signed-off-by: Andras Timar 

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 6c830d0..fe22673 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1001,14 +1001,14 @@ TabPage RID_SVXPAGE_BITMAP
 File = "sc05502.bmp" ;
 };
 };
-}
+};
 CheckBox BTN_EMBED
 {
HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED";
 Pos = MAP_APPFONT ( 197 , 124 ) ;
 Size = MAP_APPFONT ( 122 , 10 ) ;
 Text [ en-US ] =  "Embed";
-}
+};
 };
 
 // --
commit 1651cbac6bf5b1523db0c06df2146059c4d968c3
Author: David Tardon 
Date:   Fri Jan 20 09:41:59 2012 +0100

make these strings localizable again (fdo#44947)

Our translation tools read the src files literally, line by line, only
reacting on specific patterns (e.g., 'Text [en-US] = "...";'). Therefore
use of macros like this cannot work.

Signed-off-by: Andras Timar 

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index b1117b1..6c830d0 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -682,51 +682,6 @@ TabPage RID_SVXPAGE_SHADOW
 };
 };
 
-// Helper for creating the load / save / embed buttons in std. positions
-
-#define LOAD_BUTTON(hid,qhtxt) \
-ImageButton BTN_LOAD \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = "sc05501.bmp" ; \
-}; \
-}; \
-} \
-
-#define SAVE_BUTTON(hid,qhtxt) \
-ImageButton BTN_SAVE \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 217 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = "sc05502.bmp" ; \
-}; \
-}; \
-}
-
-#define EMBED_BUTTON(hid,txt) \
-CheckBox BTN_EMBED \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 124 ) ; \
-Size = MAP_APPFONT ( 122 , 10 ) ; \
-Text [ en-US ] = txt ; \
-}
-
 // --
 TabPage RID_SVXPAGE_HATCH
 {
@@ -868,9 +823,43 @@ TabPage RID_SVXPAGE_HATCH
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD", "Load Hatches 
List" );
-SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE", "Save Hatches 
List" );
-EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED", "Embed" );
+ImageButton BTN_LOAD
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD";
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Load Hatches List";
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = "sc05501.bmp" ;
+};
+};
+};
+ImageButton BTN_SAVE
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE";
+Pos = MAP_APPFONT ( 217 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Save Hatches List";
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = "sc05502.bmp" ;
+};
+};
+};
+CheckBox BTN_EMBED
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED";
+Pos = MAP_APPFONT ( 197 , 124 ) ;
+Size = MAP_APPFONT ( 122 , 10 ) ;
+Text [ en-US ] = "Embed";
+};
 };
 
 // --
@@ -983,9 +972,43 @@ TabPage RID_SVXPAGE_BITMAP
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD", "Load Bitmap 
List" );
-SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE", "Save Bitmap 
List" );
-EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED", "Embed" );
+ImageButton BTN_LOAD
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD";
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Load Bitmap List";
+ButtonImage = Imag

[Libreoffice-commits] .: libvisio/libvisio-0.0.13.patch libvisio/libvisio-0.0.14.patch libvisio/makefile.mk ooo.lst.in

[Fridrich Strba]

 libvisio/libvisio-0.0.13.patch |   20 
 libvisio/libvisio-0.0.14.patch |   20 
 libvisio/makefile.mk   |4 ++--
 ooo.lst.in |2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 32d4f05c022d785a86c6b0c39c74bc1ad46f6e61
Author: Fridrich Å trba 
Date:   Fri Jan 20 10:51:35 2012 +0100

Uploading even newer and even more shiny libvisio 0.0.14

diff --git a/libvisio/libvisio-0.0.13.patch b/libvisio/libvisio-0.0.13.patch
deleted file mode 100644
index c93983b..000
--- a/libvisio/libvisio-0.0.13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/libvisio-0.0.13/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.13/src/lib/libvisio_utils.h
-@@ -42,17 +42,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#endif
- 
- #endif
- 
diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch
new file mode 100644
index 000..456f5ad
--- /dev/null
+++ b/libvisio/libvisio-0.0.14.patch
@@ -0,0 +1,20 @@
+--- misc/libvisio-0.0.14/src/lib/libvisio_utils.h
 misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h
+@@ -42,17 +42,8 @@
+ 
+ #else
+ 
+-#ifdef HAVE_CONFIG_H
+-#include 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#endif
+ 
+ #endif
+ 
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 6d29b7d..9adf426 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
-TARFILE_NAME=libvisio-0.0.13
-TARFILE_MD5=adb5c5c8398fd89ebee2d9b4e90e061e
+TARFILE_NAME=libvisio-0.0.14
+TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9
 
 PATCH_FILES=\
 $(TARFILE_NAME).patch
diff --git a/ooo.lst.in b/ooo.lst.in
index af2f02e..3f26b25 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -87,7 +87,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
+776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[David Tardon]

 cui/source/tabpages/tabarea.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 614feec5481ee618bea98dabab2df0281995385e
Author: David Tardon 
Date:   Fri Jan 20 10:32:42 2012 +0100

add missing semicolons. *blush*

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 6c830d0..fe22673 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1001,14 +1001,14 @@ TabPage RID_SVXPAGE_BITMAP
 File = "sc05502.bmp" ;
 };
 };
-}
+};
 CheckBox BTN_EMBED
 {
HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED";
 Pos = MAP_APPFONT ( 197 , 124 ) ;
 Size = MAP_APPFONT ( 122 , 10 ) ;
 Text [ en-US ] =  "Embed";
-}
+};
 };
 
 // --
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/Module_sd.mk |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 1ccb93b138b3d29b7ee497cdfb8a7cec5acb01cd
Author: Stephan Bergmann 
Date:   Fri Jan 20 10:15:07 2012 +0100

Disable sd_regression_test until "do not embed font config" is fixed.

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index edc6f25..f015d04 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -52,7 +52,18 @@ endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
 JunitTest_sd_unoapi \
-CppunitTest_sd_regression_test \
 ))
+#TODO: Disabled for now, needs work by Thorsten Behrens to get "don't embed 
font
+# config" taken into account, otherwise leads to failures like
+#  regression-test.cxx:84:Assertion
+#  Test name: SdFiltersTest::test
+#  assertion failed
+#  - Expression: false
+#  - Mismatch between reference file and exported file in line 60.
+#  Expected: 
+#  Found   : 
+# CppunitTest_sd_regression_test \
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[David Tardon]

 cui/source/tabpages/tabarea.src |  205 
 1 file changed, 148 insertions(+), 57 deletions(-)

New commits:
commit a13d3436852a28c50a36c4ebd26c0e0c4fd9718c
Author: David Tardon 
Date:   Fri Jan 20 09:41:59 2012 +0100

make these strings localizable again (fdo#44947)

Our translation tools read the src files literally, line by line, only
reacting on specific patterns (e.g., 'Text [en-US] = "...";'). Therefore
use of macros like this cannot work.

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index b1117b1..6c830d0 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -682,51 +682,6 @@ TabPage RID_SVXPAGE_SHADOW
 };
 };
 
-// Helper for creating the load / save / embed buttons in std. positions
-
-#define LOAD_BUTTON(hid,qhtxt) \
-ImageButton BTN_LOAD \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = "sc05501.bmp" ; \
-}; \
-}; \
-} \
-
-#define SAVE_BUTTON(hid,qhtxt) \
-ImageButton BTN_SAVE \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 217 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = "sc05502.bmp" ; \
-}; \
-}; \
-}
-
-#define EMBED_BUTTON(hid,txt) \
-CheckBox BTN_EMBED \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 124 ) ; \
-Size = MAP_APPFONT ( 122 , 10 ) ; \
-Text [ en-US ] = txt ; \
-}
-
 // --
 TabPage RID_SVXPAGE_HATCH
 {
@@ -868,9 +823,43 @@ TabPage RID_SVXPAGE_HATCH
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD", "Load Hatches 
List" );
-SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE", "Save Hatches 
List" );
-EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED", "Embed" );
+ImageButton BTN_LOAD
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD";
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Load Hatches List";
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = "sc05501.bmp" ;
+};
+};
+};
+ImageButton BTN_SAVE
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE";
+Pos = MAP_APPFONT ( 217 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Save Hatches List";
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = "sc05502.bmp" ;
+};
+};
+};
+CheckBox BTN_EMBED
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED";
+Pos = MAP_APPFONT ( 197 , 124 ) ;
+Size = MAP_APPFONT ( 122 , 10 ) ;
+Text [ en-US ] = "Embed";
+};
 };
 
 // --
@@ -983,9 +972,43 @@ TabPage RID_SVXPAGE_BITMAP
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD", "Load Bitmap 
List" );
-SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE", "Save Bitmap 
List" );
-EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED", "Embed" );
+ImageButton BTN_LOAD
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD";
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Load Bitmap List";
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = "sc05501.bmp" ;
+};
+};
+};
+ImageButton BTN_SAVE
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE";
+Pos = MAP_APPFONT ( 217 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = "Save Bitmap List";
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = "sc05502.bmp" ;
+};
+};
+}
+CheckBox BTN_EMBED
+{
+   HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED";
+Pos = MAP_APPFONT ( 197 , 124 ) ;
+Size = MAP_APPFONT ( 122 , 10 ) ;
+Text [ en-US ] =  "Embed";
+}
 };
 
 // ---

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

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit ccc8753d7fc573db29159ab21492b8939f0ddab8
Author: Andras Timar 
Date:   Thu Jan 19 23:22:38 2012 +0100

fdo#44915 MSI installer l10n bug

Unfortunately msiinfo.exe has a limitation, it truncates Language
property in Summary Information at char position 254.
The replacement, WiLangId.vbs does not have this limitation.

Signed-off-by: Fridrich Å trba 

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 43e6ee3..a743b45 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -982,14 +982,11 @@ sub create_transforms
 
 my $msitran = "msitran.exe";# Has to be in the path
 my $msidb = "msidb.exe";# Has to be in the path
-my $msiinfo = "msiinfo.exe";# Has to be in the path
+my $wilangid = $ENV{WINDOWS_SDK_HOME} . 
"/Samples/SysMgmt/Msi/scripts/WiLangId.vbs";
 
 my $from = cwd();
 
-my $architecture = "Intel";
-if (( $allvariableshashref->{'64BITPRODUCT'} ) && ( 
$allvariableshashref->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
-
-my $templatevalue = "\"" . $architecture . ";1033";
+my $templatevalue = "1033";
 
 $installdir = installer::converter::make_path_conform($installdir);
 
@@ -1124,8 +1121,7 @@ sub create_transforms
 }
 }
 
-$templatevalue = $templatevalue . "\""; # adding 
ending '"'
-$systemcall = $msiinfo . " " . $basedbname . " -p " . $templatevalue;
+$systemcall = "cscript.exe " . $wilangid . " " . $basedbname . " Package " 
. $templatevalue;
 
 $returnvalue = system($systemcall);
 
@@ -1134,12 +1130,12 @@ sub create_transforms
 
 if ($returnvalue)
 {
-$infoline = "ERROR: Could not execute $msiinfo!\n";
+$infoline = "ERROR: Could not execute WiLangId.vbs!\n";
 push( @installer::globals::logfileinfo, $infoline);
 }
 else
 {
-$infoline = "Success: Executed $msiinfo successfully!\n";
+$infoline = "Success: Executed WiLangId.vbs successfully!\n";
 push( @installer::globals::logfileinfo, $infoline);
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits