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

2011-11-23 Thread Kohei Yoshida 
 sc/inc/document.hxx   |1 +
 sc/source/core/data/document.cxx  |   10 ++
 sc/source/filter/xml/xmlsubti.cxx |6 --
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 808ca6d894630f3375ed6fda1f27f4c6cec9e67d
Author: Kohei Yoshida 
Date:   Thu Nov 24 02:06:06 2011 -0500

We still need to set the name to the 1st sheet.

This should fix the filters-test breakage.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8157929..3db0dc6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -578,6 +578,7 @@ public:
 SC_DLLPUBLIC void   
CreateValidTabNames(std::vector& aNames, SCTAB nCount) const;
 
 void AppendTabOnLoad(const rtl::OUString& rName);
+void SetTabNameOnLoad(SCTAB nTab, const rtl::OUString& rName);
 
 SC_DLLPUBLIC bool   InsertTab( SCTAB nPos, const rtl::OUString& 
rName,
 bool bExternalDocument = false );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 52dc4ce..8f277c6 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -408,6 +408,16 @@ void ScDocument::AppendTabOnLoad(const rtl::OUString& 
rName)
 maTabs.push_back( new ScTable(this, nTabCount, aName) );
 }
 
+void ScDocument::SetTabNameOnLoad(SCTAB nTab, const rtl::OUString& rName)
+{
+if (!ValidTab(nTab) || static_cast(maTabs.size()) <= nTab)
+return;
+
+if (!ValidTabName(rName))
+return;
+
+maTabs[nTab]->SetName(rName);
+}
 
 bool ScDocument::InsertTab( SCTAB nPos, const rtl::OUString& rName,
 bool bExternalDocument )
diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 3ea979f..97aa9a5 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -186,10 +186,12 @@ void ScMyTables::NewSheet(const rtl::OUString& 
sTableName, const rtl::OUString&
 maProtectionData = rProtectData;
 ScDocument *pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
 
+// The document contains one sheet when created. So for the first
+// sheet, we only need to set its name.
 if (nCurrentSheet > 0)
-{
 pDoc->AppendTabOnLoad(sTableName);
-}
+else
+pDoc->SetTabNameOnLoad(nCurrentSheet, sTableName);
 
 rImport.SetTableStyle(sStyleName);
 SetTableStyle(sStyleName);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-23 Thread Kohei Yoshida 
 sc/source/core/data/document.cxx  |   17 ++---
 sc/source/filter/xml/xmlsubti.cxx |   14 --
 2 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 5992e15796131f9814d9fb22cf807a2ee530d264
Author: Kohei Yoshida 
Date:   Thu Nov 24 01:19:10 2011 -0500

i#97680, fdo#43152: Load this file without crashing.

The document contains invalid sheet names.  We check it on load, sees
it invalid, decide not to append sheet.  The next time the importer
tries to put cell data into it thinking the sheet has already been
created, the sheet instance is not there, and it crashes.

The solution I used is to go ahead and append new sheet with a default
name in case the supplied sheet name is invalid.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5a50aef..52dc4ce 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -334,14 +334,15 @@ void ScDocument::CreateValidTabName(rtl::OUString& rName) 
const
 
 for ( SCTAB i = static_cast(maTabs.size())+1; !bOk ; i++ )
 {
-rName  = aStrTable;
-rName += rtl::OUString::valueOf(static_cast(i));
+rtl::OUStringBuffer aBuf;
+aBuf.append(aStrTable);
+aBuf.append(static_cast(i));
+rName = aBuf.makeStringAndClear();
 if (bPrefix)
 bOk = ValidNewTabName( rName );
 else
 bOk = !GetTable( rName, nDummy );
 }
-
 }
 else
 {
@@ -398,11 +399,13 @@ void 
ScDocument::CreateValidTabNames(std::vector& aNames, SCTAB n
 void ScDocument::AppendTabOnLoad(const rtl::OUString& rName)
 {
 SCTAB nTabCount = static_cast(maTabs.size());
+if (!ValidTab(nTabCount))
+// max table count reached.  No more tables.
+return;
 
-if (ValidTab(nTabCount) && ValidNewTabName(rName))
-{
-maTabs.push_back( new ScTable(this, nTabCount, rName) );
-}
+rtl::OUString aName = rName;
+CreateValidTabName(aName);
+maTabs.push_back( new ScTable(this, nTabCount, aName) );
 }
 
 
diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 315bf2b..3ea979f 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -648,20 +648,6 @@ void ScMyTables::DeleteTable()
 pProtect->setOption(ScTableProtection::SELECT_UNLOCKED_CELLS, 
maProtectionData.mbSelectUnprotectedCells);
 rImport.GetDocument()->SetTabProtection(nCurrentSheet, pProtect.get());
 }
-
-//#95582#; find out whether it was possible to set the sheet name
-// test it here, because if it is a linked table the name is changed by 
importing
-// the linking informations
-uno::Reference < container::XNamed > xNamed(xCurrentSheet, uno::UNO_QUERY 
);
-if ( xNamed.is() )
-{
-rtl::OUString sCurrentName(xNamed->getName());
-if (sCurrentName != sCurrentSheetName && rImport.GetDocument())
-{
-rImport.GetDocument()->RenameTab( nCurrentSheet,
-sCurrentSheetName, false, true);
-}
-}
 }
 
 table::CellAddress ScMyTables::GetRealCellPos()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-23 Thread Kohei Yoshida 
 sc/inc/table.hxx  |   35 +++
 sc/qa/unit/ucalc.cxx  |1 +
 sc/source/core/data/cell.cxx  |2 ++
 sc/source/core/data/table1.cxx|1 +
 sc/source/core/data/table2.cxx|1 +
 sc/source/ui/vba/vbaworksheet.cxx |1 +
 6 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 92e03b82880ab1c83a1bfd59e179e3fb9f565257
Author: Kohei Yoshida 
Date:   Wed Nov 23 23:34:18 2011 -0500

Cleaned up the ScTable declaration a bit.

* make it officially non-copyable. It was never copied anyway.
* retire std::auto_ptr which is deprecated.  Let's use boost::scoped_ptr.
* some unused typedef's.

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 906d306..af57e62 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -30,7 +30,6 @@
 #define SC_TABLE_HXX
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -38,11 +37,10 @@
 #include "column.hxx"
 #include "sortparam.hxx"
 #include "compressedarray.hxx"
-#include "dbdata.hxx"
 
-#include 
 #include 
-#include 
+#include 
+#include 
 
 namespace utl {
 class TextSearch;
@@ -89,28 +87,25 @@ struct ScSetStringParam;
 struct ScColWidthParam;
 struct ScColWidthParam;
 class ScRangeName;
+class ScDBData;
 
-typedef boost::unordered_map< ::rtl::OUString, rtl::OUString, 
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap;
-
-class ScTable
+class ScTable : boost::noncopyable
 {
 private:
 typedef ::std::vector< ScRange > ScRangeVec;
 typedef ::std::pair< SCCOL, SCROW > ScAddress2D;
 typedef ::std::vector< ScAddress2D > ScAddress2DVec;
-typedef ::std::auto_ptr< ScAddress2DVec > ScAddress2DVecPtr;
 
-//  data per table
 ScColumnaCol[MAXCOLCOUNT];
 
 rtl::OUString aName;
 rtl::OUString aCodeName;
 rtl::OUString aComment;
 
-rtl::OUString  aLinkDoc;
-rtl::OUString  aLinkFlt;
-rtl::OUString  aLinkOpt;
-rtl::OUString  aLinkTab;
+rtl::OUString   aLinkDoc;
+rtl::OUString   aLinkFlt;
+rtl::OUString   aLinkOpt;
+rtl::OUString   aLinkTab;
 sal_uLong   nLinkRefreshDelay;
 sal_uInt8   nLinkMode;
 
@@ -122,17 +117,17 @@ private:
 SCROW   nRepeatStartY;
 SCROW   nRepeatEndY;
 
-::std::auto_ptr pTabProtection;
+boost::scoped_ptr pTabProtection;
 
 sal_uInt16* pColWidth;
-::boost::shared_ptr mpRowHeights;
+boost::scoped_ptr mpRowHeights;
 
 sal_uInt8*  pColFlags;
 ScBitMaskCompressedArray< SCROW, sal_uInt8>* pRowFlags;
-::boost::shared_ptr  mpHiddenCols;
-::boost::shared_ptr  mpHiddenRows;
-::boost::shared_ptr  mpFilteredCols;
-::boost::shared_ptr  mpFilteredRows;
+boost::scoped_ptr  mpHiddenCols;
+boost::scoped_ptr  mpHiddenRows;
+boost::scoped_ptr  mpFilteredCols;
+boost::scoped_ptr  mpFilteredRows;
 
 ::std::set  maRowPageBreaks;
 ::std::set  maRowManualBreaks;
@@ -153,7 +148,7 @@ private:
 
 mutable rtl::OUString aUpperName; // #i62977# filled only on 
demand, reset in SetName
 
-ScAddress2DVecPtr mxUninitNotes;
+boost::scoped_ptr mxUninitNotes;
 
 // sort parameter to minimize stack size of quicksort
 ScSortParam aSortParam;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9b0cbcc..21914d9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -46,6 +46,7 @@
 #include "queryentry.hxx"
 #include "postit.hxx"
 #include "attrib.hxx"
+#include "dbdata.hxx"
 
 #include "docsh.hxx"
 #include "docfunc.hxx"
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 88fcbfd..9267133 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -53,6 +53,8 @@
 #include "postit.hxx"
 #include "externalrefmgr.hxx"
 #include "macromgr.hxx"
+#include "dbdata.hxx"
+
 #include 
 #include 
 #include 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 0505da7..e88fba6 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -55,6 +55,7 @@
 #include "tabprotection.hxx"
 #include "sheetevents.hxx"
 #include "segmenttree.hxx"
+#include "dbdata.hxx"
 
 #include 
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index beb638b..75b5c44 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -62,6 +62,7 @@
 #include "segmenttree.hxx"
 #include "queryparam.hxx"
 #include "queryentry.hxx"
+#include "dbdata.hxx"
 
 // STATIC DATA ---
 
diff --git a/sc/source/ui/vba/vbaworksheet.cxx 
b/sc/source/ui/vba/vbaworksheet.cxx
index cea1ee5..5ccab92 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -109,6 +109,7 @@
 #include "vbasheetobjects.hxx"

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

2011-11-23 Thread Kohei Yoshida 
 sc/inc/markdata.hxx  |   40 +++---
 sc/inc/scmod.hxx |2 
 sc/source/core/data/markdata.cxx |   54 +--
 sc/source/core/tool/chgtrack.cxx |1 
 sc/source/ui/Accessibility/AccessibleCell.cxx|1 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|2 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |1 
 sc/source/ui/app/inputhdl.cxx|1 
 sc/source/ui/app/inputwin.cxx|1 
 sc/source/ui/app/scmod.cxx   |1 
 sc/source/ui/app/seltrans.cxx|1 
 sc/source/ui/docshell/dbdocfun.cxx   |1 
 sc/source/ui/docshell/docsh.cxx  |1 
 sc/source/ui/docshell/docsh3.cxx |1 
 sc/source/ui/docshell/editable.cxx   |1 
 sc/source/ui/drawfunc/fuins2.cxx |1 
 sc/source/ui/drawfunc/fumark.cxx |1 
 sc/source/ui/inc/AccessibleSpreadsheet.hxx   |1 
 sc/source/ui/inc/undodat.hxx |7 +-
 sc/source/ui/inc/undotab.hxx |6 +-
 sc/source/ui/inc/viewdata.hxx|   10 +--
 sc/source/ui/navipi/content.cxx  |1 
 sc/source/ui/navipi/navipi.cxx   |1 
 sc/source/ui/pagedlg/areasdlg.cxx|1 
 sc/source/ui/undo/undodat.cxx|9 +--
 sc/source/ui/undo/undotab.cxx|7 +-
 sc/source/ui/undo/undoutil.cxx   |1 
 sc/source/ui/unoobj/viewuno.cxx  |1 
 sc/source/ui/vba/vbarange.cxx|1 
 sc/source/ui/vba/vbawindow.cxx   |1 
 sc/source/ui/vba/vbaworksheet.cxx|1 
 sc/source/ui/vba/vbaworksheets.cxx   |1 
 sc/source/ui/view/cellsh.cxx |1 
 sc/source/ui/view/cellsh1.cxx|1 
 sc/source/ui/view/cellsh2.cxx|1 
 sc/source/ui/view/cellsh3.cxx|2 
 sc/source/ui/view/cliputil.cxx   |1 
 sc/source/ui/view/colrowba.cxx   |1 
 sc/source/ui/view/dbfunc.cxx |1 
 sc/source/ui/view/dbfunc3.cxx|1 
 sc/source/ui/view/formatsh.cxx   |1 
 sc/source/ui/view/gridwin.cxx|1 
 sc/source/ui/view/gridwin4.cxx   |1 
 sc/source/ui/view/hdrcont.cxx|1 
 sc/source/ui/view/preview.cxx|1 
 sc/source/ui/view/select.cxx |1 
 sc/source/ui/view/selectionstate.cxx |1 
 sc/source/ui/view/spelleng.cxx   |2 
 sc/source/ui/view/tabcont.cxx|1 
 sc/source/ui/view/tabview2.cxx   |1 
 sc/source/ui/view/tabview3.cxx   |1 
 sc/source/ui/view/tabvwsh3.cxx   |1 
 sc/source/ui/view/tabvwsha.cxx   |1 
 sc/source/ui/view/tabvwshc.cxx   |1 
 sc/source/ui/view/tabvwshf.cxx   |1 
 sc/source/ui/view/viewdata.cxx   |   38 -
 sc/source/ui/view/viewfun5.cxx   |1 
 sc/source/ui/view/viewfun6.cxx   |1 
 58 files changed, 145 insertions(+), 80 deletions(-)

New commits:
commit c4a3e29626126658cfb9e8755e9f98cfc4500abd
Author: Kohei Yoshida 
Date:   Wed Nov 23 21:32:01 2011 -0500

Reducing header dependency on markdata.hxx.

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index e90936b..5a51b08 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 #include "global.hxx"   // ScInputMode
-#include "markdata.hxx" // ScMarkData
 #include "shellids.hxx"
 #include 
 #include 
@@ -79,6 +78,7 @@ class ScTransferObj;
 class ScDrawTransferObj;
 class ScSelectionTransferObj;
 class ScFormEditData;
+class ScMarkData;
 struct ScDragData;
 struct ScClipData;
 
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index dc5b097..3a4fcf7 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -51,6 +51,7 @@
 #include "inputopt.hxx" // GetExpandRefs
 #include "patattr.hxx"
 #include "hints.hxx"
+#include "markdata.hxx"
 
 #include "globstr.hrc"
 
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 881a895..6ca5585 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -44,6 +44,7 @@
 #include "editsrc.hxx"
 #

[Libreoffice-commits] .: sw/source

2011-11-23 Thread Miklos Vajna 
 sw/source/filter/ww8/rtfattributeoutput.cxx |   41 
 sw/source/filter/ww8/rtfattributeoutput.hxx |8 -
 2 files changed, 49 deletions(-)

New commits:
commit 7a37392d1495f50fe9ef3a3bb1bbea063d5cf158
Author: Miklos Vajna 
Date:   Thu Nov 24 01:05:49 2011 +0100

RtfAttributeOutput: remove unnecessary includes

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 32855a4..2cd6033 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -28,24 +28,12 @@
  /
 
 #include "rtfattributeoutput.hxx"
-#include "rtfexport.hxx"
 #include "rtfsdrexport.hxx"
 #include "writerwordglue.hxx"
-#include "wrtww8.hxx"
 #include "ww8par.hxx"
 #include "fmtcntnt.hxx"
-#include "fmtsrnd.hxx"
 #include "fchrfmt.hxx"
-#include "tgrditem.hxx"
-#include "fmtruby.hxx"
-#include "charfmt.hxx"
-#include "breakit.hxx"
 
-#include 
-
-#include 
-
-#include 
 #include 
 
 #include 
@@ -53,9 +41,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -69,77 +55,50 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
 #include 
-#include 
-#include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
-#include 
-#include 
-#include 
-
-#include 
-
 #include 
 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
 
 using ::editeng::SvxBorderLine;
 using rtl::OString;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 4ac68be..856b14f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -30,19 +30,11 @@
 #ifndef _RTFATTRIBUTEOUTPUT_HXX_
 #define _RTFATTRIBUTEOUTPUT_HXX_
 
-#include 
 #include "attributeoutputbase.hxx"
-#include "fields.hxx"
 #include "rtfexport.hxx"
 
-#include 
-
-#include 
 #include 
 
-#include 
-
-
 class SwGrfNode;
 class SwOLENode;
 class SdrObject;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-23 Thread Kohei Yoshida 
 sc/source/filter/excel/xeview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0215f8b19451ab67c7fdaf91f2da8298a9b89c47
Author: Kohei Yoshida 
Date:   Wed Nov 23 18:23:14 2011 -0500

fdo#39589: Avoid using ulimit_cast between signed and unsigned.

If you do, things go very very wrong.  These *limit_cast try to be
clever and check ranges of various types before casting, but they
fail to do the right thing when casting a signed integer into unsigned.

diff --git a/sc/source/filter/excel/xeview.cxx 
b/sc/source/filter/excel/xeview.cxx
index 37d075e..94f082a 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -368,8 +368,8 @@ XclExpTabViewSettings::XclExpTabViewSettings( const 
XclExpRoot& rRoot, SCTAB nSc
 else
 {
 // split window: position is in twips
-maData.mnSplitX = ulimit_cast< sal_uInt16 >( 
rTabSett.maSplitPos.X() );
-maData.mnSplitY = ulimit_cast< sal_uInt32 >( 
rTabSett.maSplitPos.Y() );
+maData.mnSplitX = static_cast(rTabSett.maSplitPos.X());
+maData.mnSplitY = static_cast(rTabSett.maSplitPos.Y());
 }
 
 // selection
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_svtools

2011-11-23 Thread Caolán McNamara 
 binfilter/bf_svtools/source/config/svt_useroptions.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1761e9c96eb2d673d77712c840a51c2679d169f1
Author: Caolán McNamara 
Date:   Wed Nov 23 22:17:54 2011 +

remove EraseLeadingAndTrailingChars

diff --git a/binfilter/bf_svtools/source/config/svt_useroptions.cxx 
b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
index 00f870a..976fa42 100644
--- a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
@@ -27,7 +27,7 @@
  /
 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -179,8 +179,7 @@ void SvtUserOptions_Impl::InitUserPropertyNames()
 
 void SvtUserOptions_Impl::InitFullName()
 {
-m_aFullName = GetFirstName();
-m_aFullName.EraseLeadingAndTrailingChars();
+m_aFullName = comphelper::string::strip(GetFirstName(), ' ');
 if ( m_aFullName.Len() )
 m_aFullName += ' ';
 m_aFullName += GetLastName();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 9 commits - automation/source comphelper/inc comphelper/qa comphelper/source connectivity/source l10ntools/source linguistic/source sc/inc sc/source shell/source starmath/sour

2011-11-23 Thread Caolán McNamara 
 automation/source/testtool/objtest.cxx   |5 +-
 comphelper/inc/comphelper/string.hxx |   20 ++
 comphelper/qa/string/test_string.cxx |   22 +++
 comphelper/source/misc/string.cxx|   10 +
 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx |3 +
 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx |2 -
 l10ntools/source/export2.cxx |4 +-
 l10ntools/source/helpmerge.cxx   |6 ---
 l10ntools/source/merge.cxx   |2 -
 linguistic/source/dicimp.cxx |3 +
 sc/inc/rangenam.hxx  |2 -
 sc/source/core/data/dpobject.cxx |6 +--
 sc/source/core/tool/rangenam.cxx |   15 ---
 sc/source/filter/html/htmlpars.cxx   |4 +-
 sc/source/filter/rtf/eeimpars.cxx|4 +-
 sc/source/ui/cctrl/editfield.cxx |8 ++--
 sc/source/ui/dbgui/validate.cxx  |3 +
 sc/source/ui/formdlg/dwfunctr.cxx|6 +--
 sc/source/ui/miscdlgs/conflictsdlg.cxx   |4 +-
 shell/source/tools/lngconvex/lngconvex.cxx   |3 +
 shell/source/tools/lngconvex/makefile.mk |8 ++--
 starmath/source/cursor.cxx   |2 -
 starmath/source/node.cxx |4 +-
 svl/source/misc/lngmisc.cxx  |2 -
 svtools/source/misc/sampletext.cxx   |   15 +++
 svx/source/dialog/fntctrl.cxx|   10 -
 sw/source/core/frmedt/fetab.cxx  |4 +-
 sw/source/filter/rtf/rtffld.cxx  |2 -
 sw/source/filter/ww8/ww8par5.cxx |4 +-
 sw/source/filter/ww8/ww8scan.cxx |2 -
 tools/inc/tools/string.hxx   |1 
 tools/source/inet/inetstrm.cxx   |4 +-
 unusedcode.easy  |2 -
 vcl/source/control/combobox.cxx  |7 ++-
 vcl/source/control/field.cxx |2 -
 vcl/source/control/longcurr.cxx  |3 +
 vcl/source/window/toolbox2.cxx   |3 +
 37 files changed, 127 insertions(+), 80 deletions(-)

New commits:
commit 52e04a433149d110a4a738ec6f8b7fa40c54e23c
Author: Caolán McNamara 
Date:   Wed Nov 23 23:11:17 2011 +

fix some stray typos

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index e7c6ebc..4feb13d 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1700,7 +1700,7 @@ void SmBraceNode::CreateTextFromNode(String &rText)
 {
 String aStr;
 GetSubNode(2)->CreateTextFromNode(aStr);
-aStr = comphelper::string:strip(aStr, ' ');
+aStr = comphelper::string::strip(aStr, ' ');
 aStr = comphelper::string::stripStart(aStr, '\\');
 if (aStr.Len())
 {
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index edf4c7c..ec53c7e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3447,7 +3447,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* 
/*pF*/, String& rStr )
 //HYPERLINK "filename" [switches]
 bool bOptions=false;
 
-rStr = comphelper::strip::stripEnd(rStr, 1);
+rStr = comphelper::string::stripEnd(rStr, 1);
 
 if (!bDataImport)
 {
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 032bf4a..e6fdcac 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6251,7 +6251,7 @@ void lcl_checkFontname( String& sString )
 if( bFound )
 {
 sString = comphelper::string::remove(sString, 1);
-sString = comphelper::string::strip(aString, ';');
+sString = comphelper::string::strip(sString, ';');
 }
 }
 
commit 94566b08a3a26230d4aed86a6834fc1cd9f67909
Author: Caolán McNamara 
Date:   Wed Nov 23 22:28:19 2011 +

IniParser::Dump uncalled, but potentially useful for debugging

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index f56df91..ce8235e 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -110,7 +110,8 @@ IniParser::IniParser(OUString const & rIniName) 
throw(com::sun::star::io::IOExce
 }
 #endif
 }
-#if OSL_DEBUG_LEVEL > 0

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

2011-11-23 Thread Thorsten Behrens 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx  |4 ++--
 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx |4 +++-
 svx/source/sdr/properties/attributeproperties.cxx   |3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c8e7d34e3a238c9383151a09f99e7951877a6821
Author: alg 
Date:   Thu Oct 6 14:55:24 2011 +

118414: applied patch, added forcing that SfxItemSet inside 
AttributeProperties::SetModel

 * found as LGPLv3-only fix at svn rev 1179654 
(http://svn.apache.org/viewvc?view=revision&revision=1179654)

diff --git a/svx/source/sdr/properties/attributeproperties.cxx 
b/svx/source/sdr/properties/attributeproperties.cxx
index 9edc2a4..cece99f 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -479,8 +479,9 @@ namespace sdr
 }
 
 // each object gets the default Style if there is none set yet.
-if(mpItemSet && !GetStyleSheet() && pNewModel && 
!pNewModel->IsLoading())
+if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading())
 {
+GetObjectItemSet(); // i#118414 force ItemSet to allow 
style to be set
 SetStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True);
 }
 }
commit f82da782158d8f5b89a6a9057df1a4695425ed75
Author: awf 
Date:   Tue Nov 1 16:18:25 2011 +

i118560 - slide sorter: pass PageSelector object by reference

 * found as LGPLv3-only fix at svn rev 1196092 
(http://svn.apache.org/viewvc?view=revision&revision=1196092)

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index f3a0074..e3a86bb 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1156,8 +1156,8 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& 
rRequest)
 aPagesToSelect.end(),
 ::boost::bind(
 static_cast(&PageSelector::SelectPage),
-rSelector,
-_1));
+::boost::ref(rSelector),
+_1));
 }
 
 IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 42ab151..394dd89 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+
 
 class SdPage;
 
@@ -63,7 +65,7 @@ class SlideSorterController;
 Indices of pages relate allways to the number of all pages in the model
 (as returned by GetPageCount()) not just the selected pages.
 */
-class PageSelector
+class PageSelector : private ::boost::noncopyable
 {
 public:
 PageSelector (SlideSorter& rSlideSorter);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 11 commits - filter/inc filter/source sc/source sd/source svtools/source svx/source vcl/inc vcl/source

2011-11-23 Thread Thorsten Behrens 
 filter/inc/filter/msfilter/escherex.hxx |   16 +++-
 filter/source/msfilter/escherex.cxx |   15 
 filter/source/msfilter/msdffimp.cxx |   52 +---
 filter/source/pdf/pdfexport.cxx |6 +
 sc/source/filter/xcl97/xcl97esc.cxx |2 
 sd/source/filter/eppt/eppt.cxx  |   19 -
 sd/source/filter/eppt/eppt.hxx  |4 -
 sd/source/filter/eppt/epptbase.hxx  |4 -
 sd/source/filter/eppt/epptso.cxx|   13 +++-
 sd/source/filter/eppt/escherex.cxx  |3 
 sd/source/filter/eppt/escherex.hxx  |2 
 sd/source/filter/eppt/pptx-epptbase.cxx |4 -
 sd/source/filter/eppt/pptx-epptooxml.cxx|9 ++
 sd/source/filter/sdpptwrp.cxx   |   11 ++-
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |2 
 sd/source/ui/animations/CustomAnimationCreateDialog.src |2 
 sd/source/ui/unoidl/unomodel.cxx|4 -
 svtools/source/filter/filter.cxx|   14 +---
 svx/source/svdraw/svdograf.cxx  |   27 +++-
 vcl/inc/vcl/pdfextoutdevdata.hxx|4 +
 vcl/source/gdi/pdfextoutdevdata.cxx |9 ++
 21 files changed, 139 insertions(+), 83 deletions(-)

New commits:
commit 825839b24d4ad04df17269ef407c844fd6b2cc81
Author: Thorsten Behrens 
Date:   Wed Nov 23 23:23:23 2011 +0100

Fixup pptx export after impress212 merges.

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 71d4ac6..d81caf1 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1411,7 +1411,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 delete pIn;
 }
 }
-if ( !aUniqueId.Len() )
+if ( !aUniqueId.getLength() )
 {
 if ( pGraphicProvider )
 {
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 26fcd2c..d76fb52 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -74,7 +74,7 @@ using ::com::sun::star::beans::XPropertySet;
 
 // PPTWriter ==
 
-PPTWriter::PPTWriter( const std::vector< com::sun::star::beans::PropertyValue 
>& rMediaData, SvStorageRef& rSvStorage,
+PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel 
> & rXModel,
 ::com::sun::star::uno::Reference< 
::com::sun::star::task::XStatusIndicator > & rXStatInd,
 SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
@@ -97,7 +97,7 @@ PPTWriter::PPTWriter( const std::vector< 
com::sun::star::beans::PropertyValue >&
 {
 }
 
-void PPTWriter::exportPPTPre()
+void PPTWriter::exportPPTPre( const std::vector< 
com::sun::star::beans::PropertyValue >& rMediaData )
 {
 if ( !mrStg.Is() )
 return;
@@ -132,7 +132,6 @@ void PPTWriter::exportPPTPre()
 {
 if ( (*aIter).Name.equals( sBaseURI ) )
 {
-rtl::OUString sBaseURI;
 (*aIter).Value >>= maBaseURI;
 break;
 }
@@ -1498,10 +1497,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool 
__LOADONCALLAPI ExportPPT( const std::v
 PPTWriter*  pPPTWriter;
 sal_Bool bStatus = sal_False;
 
-pPPTWriter = new PPTWriter( rMediaData, rSvStorage, rXModel, rXStatInd, 
pVBA, nCnvrtFlags );
+pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, 
nCnvrtFlags );
 if ( pPPTWriter )
 {
-pPPTWriter->exportPPT();
+pPPTWriter->exportPPT(rMediaData);
 bStatus = ( pPPTWriter->IsValid() == sal_True );
 delete pPPTWriter;
 }
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 6096276..96f19c4 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -296,7 +296,7 @@ class PPTWriter : public PPTWriterBase, public 
PPTExBulletProvider
 
 sal_BoolIsValid() const { return mbStatus; };
 
-virtual voidexportPPTPre();
+virtual voidexportPPTPre( const std::vector< 
com::sun::star::beans::PropertyValue >& );
 virtual voidexportPPTPost( );
 };
 
diff --git a/sd/source/filter/eppt/epptbase.hxx 
b/sd/source/filter/eppt/epptbase.hxx
index f21db68..33a43d3 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -378,7 +378,7 @@ protected:
 virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, 
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* 
aXBackgroundPropSet */ ) {}
 virtual void ImplWriteL

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

2011-11-23 Thread Kohei Yoshida 
 src/xlsrecord.py |   38 ++
 src/xlsstream.py |4 ++--
 2 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 9d825cc43815bd9accabe792abca76f3cc1fb18f
Author: Kohei Yoshida 
Date:   Wed Nov 23 16:57:05 2011 -0500

Handlers for WINDOW2 and PANE records.

Handler for WINDOW2 is still incomplete.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 6927836..11c2fce 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2347,6 +2347,44 @@ class Font(BaseRecordHandler):
 self.appendLine("font family: %s"%Font.getFontFamily(fontFamily))
 self.appendLine("font name: %s (%d)"%(fontName, nameLen))
 
+class Window2(BaseRecordHandler):
+def __parseBytes (self):
+flag = self.readUnsignedInt(2)
+self.displayFormula =  (flag & 0x0001) != 0
+self.displayGrid = (flag & 0x0002) != 0
+self.displayHeadings = (flag & 0x0004) != 0
+self.frozen =  (flag & 0x0008) != 0
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineBoolean("display formula", self.displayFormula)
+self.appendLineBoolean("display grid", self.displayGrid)
+self.appendLineBoolean("display headings", self.displayHeadings)
+self.appendLineBoolean("frozen window", self.frozen)
+
+class Pane(BaseRecordHandler):
+
+activePanes = [
+"bottom-right",
+"top-right",
+"bottom-left",
+"top-left"
+]
+
+def __parseBytes (self):
+self.x = self.readUnsignedInt(2)
+self.y = self.readUnsignedInt(2)
+self.bottomRow = self.readUnsignedInt(2)
+self.rightCol  = self.readUnsignedInt(2)
+self.activePane = self.readUnsignedInt(1)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLine("split position: (x=%d,y=%d)"%(self.x,self.y))
+self.appendLine("top-left position of SE pane: (row=%d,col=%d)"%
+(self.bottomRow,self.rightCol))
+self.appendLine("active pane: %s"%
+globals.getValueOrUnknown(Pane.activePanes, self.activePane))
 
 class XF(BaseRecordHandler):
 
diff --git a/src/xlsstream.py b/src/xlsstream.py
index d000840..bb9f6ae 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -71,7 +71,7 @@ recData = {
 0x003C: ["CONTINUE", "Continues Long Records"],
 0x003D: ["WINDOW1", "Window Information"],
 0x0040: ["BACKUP", "Save Backup Version of the File"],
-0x0041: ["PANE", "Number of Panes and Their Position"],
+0x0041: ["PANE", "Number of Panes and Their Position", xlsrecord.Pane],
 0x0042: ["CODEPAGE/CODENAME", "Default Code Page/VBE Object Name"],
 0x004D: ["PLS", "Environment-Specific Print Record", xlsrecord.Pls],
 0x0050: ["DCON", "Data Consolidation Information"],
@@ -216,7 +216,7 @@ recData = {
 0x0225: ["DEFAULTROWHEIGHT", "Default Row Height", xlsrecord.DefRowHeight],
 0x0231: ["FONT", "Font Description", xlsrecord.Font],
 0x0236: ["TABLE", "Data Table"],
-0x023E: ["WINDOW2", "Sheet Window Information"],
+0x023E: ["WINDOW2", "Sheet Window Information", xlsrecord.Window2],
 0x027E: ["RK", "Cell with Encoded Integer or Floating-Point", 
xlsrecord.RK],
 0x0293: ["STYLE", "Style Information", xlsrecord.Style],
 0x041E: ["FORMAT", "Number Format", xlsrecord.Format],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

2011-11-23 Thread Stephan Bergmann 
 sal/inc/sal/log.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0a1f03544a72596b5022985f2367bdcd0699adeb
Author: Stephan Bergmann 
Date:   Wed Nov 23 21:55:59 2011 +0100

Call getResult with fully qualified name.

diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index cf22519..2e09c29 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -131,7 +131,8 @@ inline char const * unwrapStream(StreamIgnore const &) {
 #define SAL_DETAIL_LOG_STREAM(condition, level, area, where, stream) \
 do { \
 if (condition) { \
-if (sizeof getResult(::sal::detail::StreamStart() << stream) == 1) 
\
+if (sizeof ::sal::detail::getResult( \
+::sal::detail::StreamStart() << stream) == 1) \
 { \
 ::sal_detail_log( \
 (level), (area), (where), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-23 Thread Eike Rathke 
 i18npool/source/localedata/data/la_VA.xml |  172 --
 1 file changed, 117 insertions(+), 55 deletions(-)

New commits:
commit 0b00165c300c6fe4cbdc952d49d050121d3d0063
Author: Roman Eisele 
Date:   Wed Nov 23 21:45:31 2011 +0100

updated Latin [la-VA] locale data

diff --git a/i18npool/source/localedata/data/la_VA.xml 
b/i18npool/source/localedata/data/la_VA.xml
index 693ced4..042e9f4 100644
--- a/i18npool/source/localedata/data/la_VA.xml
+++ b/i18npool/source/localedata/data/la_VA.xml
@@ -30,8 +30,8 @@
   “
   ”
 
-m.
-p.
+a.m.
+p.m.
 metric
   
   
@@ -182,124 +182,186 @@
 A-Z
 0
 1
- e seg.
- e segg.
+ et seq.
+ et seqq.
   
   
 
   
 
   sun
-  dom
-  dominicus dies
+  Dom
+  Dominicus dies
 
 
   mon
-  lun
-  lunae dies
+  Lun
+  Lunae dies
 
 
   tue
-  mar
-  martis dies
+  Mar
+  Martis dies
 
 
   wed
-  mer
-  mercuri dies
+  Mer
+  Mercurii dies
 
 
   thu
-  jov
-  jovis dies
+  Iov
+  Iovis dies
 
 
   fri
-  ven
-  veneris dies
+  Ven
+  Veneris dies
 
 
   sat
-  sab
-  sabbatum
+  Sab
+  Sabbatum
 
   
   
 
   jan
-  jan
-  januarius
+  Ian
+  Ianuarius
 
 
   feb
-  feb
-  februarius
+  Feb
+  Februarius
 
 
   mar
-  mar
-  martius
+  Mar
+  Martius
 
 
   apr
-  apr
-  aprilis
+  Apr
+  Aprilis
 
 
   may
-  mai
-  maius
+  Mai
+  Maius
 
 
   jun
-  jun
-  junius
+  Iun
+  Iunius
 
 
   jul
-  jul
-  julius
+  Iul
+  Iulius
 
 
   aug
-  aug
-  augustus
+  Aug
+  Augustus
 
 
   sep
-  sep
-  septembris
+  Sep
+  September
 
 
   oct
-  oct
-  octobris
+  Oct
+  October
 
 
   nov
-  nov
-  novembris
+  Nov
+  November
 
 
   dec
-  dec
-  decembris
+  Dec
+  December
 
   
+  
+
+  jan
+  Ian
+  Ianuarii
+
+
+  feb
+  Feb
+  Februarii
+
+
+  mar
+  Mar
+  Martii
+
+
+  apr
+  Apr
+  Aprilis
+
+
+  may
+  Mai
+  Maii
+
+
+  jun
+  Iun
+  Iunii
+
+
+  jul
+  Iul
+  Iulii
+
+
+  aug
+  Aug
+  Augusti
+
+
+  sep
+  Sep
+  Septembris
+
+
+  oct
+  Oct
+  Octobris
+
+
+  nov
+  Nov
+  Novembris
+
+
+  dec
+  Dec
+  Decembris
+
+  
   
 
   bc
-  aC
-  aC
+  a.C.n.
+  ante Christum natum
 
 
   ad
-  dC
-  dC
+  p.C.n.
+  post Christum natum
 
   
   
-mon
+sun
   
   4
 
@@ -330,14 +392,14 @@
   
   
 
-  vero
-  falso
-  1. quarto
-  2. quarto
-  3. quarto
-  4. quarto
-  sopra
-  sotto
+  verum
+  falsum
+  prima quarta pars
+  secunda quarta pars
+  tertia quarta pars
+  quarta quarta pars
+  supra
+  infra
   Q1
   Q2
   Q3
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-23 Thread Kohei Yoshida 
 sc/source/ui/unoobj/docuno.cxx |   13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit f8625e8fba02136fcdac4685b85a3597eedf82e2
Author: Kohei Yoshida 
Date:   Wed Nov 23 15:44:01 2011 -0500

Simplify it a bit.

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 3bc1018..ab469b4 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2643,22 +2643,15 @@ sal_Int32 ScTableSheetsObj::importSheet(
 ScModelObj* pObj = ScModelObj::getImplementation(xDocSrc);
 ScDocShell* pDocShellSrc = 
static_cast(pObj->GetEmbeddedObject());
 
-SCTAB nIndexDest;
-nIndexDest = -1;
-
 // SourceSheet Position and does srcName exists ?
 SCTAB nIndexSrc;
 if ( !pDocShellSrc->GetDocument()->GetTable( srcName, nIndexSrc ) )
 throw lang::IllegalArgumentException();
 
-// control nDestPosition < maxtab
+// Check the validity of destination index.
 SCTAB nCount = pDocDest->GetTableCount();
-nIndexDest = static_cast(nDestPosition);
-if ( nIndexDest > nCount )
-throw lang::IndexOutOfBoundsException();
-
-// control nDestPosition > 0
-if (nIndexDest < 0)
+SCTAB nIndexDest = static_cast(nDestPosition);
+if (nIndexDest > nCount || nIndexDest < 0)
 throw lang::IndexOutOfBoundsException();
 
 // Transfert Tab
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source sc/xml

2011-11-23 Thread Kohei Yoshida 
 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/sheet/XSpreadsheets2.idl |   75 +++
 sc/inc/docuno.hxx|   13 
 sc/source/ui/unoobj/docuno.cxx   |   59 +
 sc/xml/ScTableSheetsObj.xml  |1 
 5 files changed, 137 insertions(+), 12 deletions(-)

New commits:
commit ba897375db27a2b74ead5251516824572260b029
Author: Kohei Yoshida 
Date:   Wed Nov 23 15:27:51 2011 -0500

Let's throw out-of-bound exception on out-of-bound destination position.

diff --git a/offapi/com/sun/star/sheet/XSpreadsheets2.idl 
b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
index c4f8af1..c3635b9 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets2.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //=
 
@@ -64,7 +64,7 @@ interface XSpreadsheets2: com::sun::star::sheet::XSpreadsheets
 [in] string srcName,
 [in] long  nDestPosition)
 raises (com::sun::star::lang::IllegalArgumentException,
-com::sun::star::uno::RuntimeException);
+com::sun::star::lang::IndexOutOfBoundsException);
 };
 
 //=
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 1ca0d71..35296da 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -406,7 +406,9 @@ public:
 ::com::sun::star::sheet::XSpreadsheetDocument > & xDocSrc,
 const rtl::OUString& srcName,
 const sal_Int32 nDestPosition)
-throw(::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
+throw(::com::sun::star::lang::IllegalArgumentException,
+  ::com::sun::star::lang::IndexOutOfBoundsException,
+  ::com::sun::star::uno::RuntimeException);
 
 // XCellRangesAccess
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 95632e6..3bc1018 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2632,7 +2632,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const 
rtl::OUString& aName )
 sal_Int32 ScTableSheetsObj::importSheet(
 const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc,
 const rtl::OUString& srcName, const sal_Int32 nDestPosition )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
+throw( lang::IllegalArgumentException, 
lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
 //pDocShell is the destination
 ScDocument* pDocDest = pDocShell->GetDocument();
@@ -2655,11 +2655,11 @@ sal_Int32 ScTableSheetsObj::importSheet(
 SCTAB nCount = pDocDest->GetTableCount();
 nIndexDest = static_cast(nDestPosition);
 if ( nIndexDest > nCount )
-nIndexDest = nCount;
+throw lang::IndexOutOfBoundsException();
 
 // control nDestPosition > 0
-if ( nIndexDest < 0)
-nIndexDest = 0;
+if (nIndexDest < 0)
+throw lang::IndexOutOfBoundsException();
 
 // Transfert Tab
 bool bInsertNew = true;
commit 2ee55872ebc5aeb71041c3267d9b3baa9607b85b
Author: Laurent Godard 
Date:   Mon Nov 21 17:32:13 2011 +0100

importSheet from an external provided document

define a new interface XSpreadsheets2
clean some String in docuno.cxx while i'm at it.

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4328206..f63ddd3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3458,6 +3458,7 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
XSpreadsheetDocument \
XSpreadsheetView \
XSpreadsheets \
+   XSpreadsheets2 \
XSubTotalCalculatable \
XSubTotalDescriptor \
XSubTotalField \
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets2.idl 
b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
new file mode 100644
index 000..c4f8af1
--- /dev/null
+++ b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
@@ -0,0 +1,75 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ *
+ * Author(s): Laurent Godard 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Pu

[Libreoffice-commits] .: sal/inc

2011-11-23 Thread Stephan Bergmann 
 sal/inc/sal/log.hxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 364a3d2864973935b2cd18b328392d1b556456dd
Author: Stephan Bergmann 
Date:   Wed Nov 23 20:26:52 2011 +0100

Silence bogus MSC "must return a value" errors.

diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index be71d02..cf22519 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -91,25 +91,39 @@ template< typename T > inline StreamIgnore operator <<(
 StreamStart const &, T const &)
 {
 std::abort();
+#if defined _MSC_VER
+return StreamIgnore();
+#endif
 }
 
 template< typename T > inline StreamIgnore operator <<(
 StreamString const &, T const &)
 {
 std::abort();
+#if defined _MSC_VER
+return StreamIgnore();
+#endif
 }
 
 template< typename T > inline StreamIgnore operator <<(
 StreamIgnore const &, T const &)
 {
 std::abort();
+#if defined _MSC_VER
+return StreamIgnore();
+#endif
 }
 
 template< typename T > typename T::Result getResult(T const &);
 
 inline char const * unwrapStream(StreamString const & s) { return s.string; }
 
-inline char const * unwrapStream(StreamIgnore const &) { std::abort(); }
+inline char const * unwrapStream(StreamIgnore const &) {
+std::abort();
+#if defined _MSC_VER
+return 0;
+#endif
+}
 
 } }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-23 Thread Stephan Bergmann 
 sc/source/ui/app/inputwin.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5d7964a5c4f7fbb41df05042229d540feb32de8c
Author: Stephan Bergmann 
Date:   Wed Nov 23 18:20:53 2011 +0100

-Werror=unused-but-set-variable fix

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index da067b8..4818785 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -754,7 +754,6 @@ void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
 if ( lcl_isExperimentalMode() )
 {
 Point aPosPixel = GetPointerPosPixel();
-Point aPnt = PixelToLogic( aPosPixel );
 
 ScInputBarGroup* pGroupBar = dynamic_cast< ScInputBarGroup* > ( 
pRuntimeWindow.get() );
 if ( bInResize || ( GetOutputSizePixel().Height() - aPosPixel.Y() <= 4 
 ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-23 Thread Petr Mladek 
 sw/source/core/doc/docdesc.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 23daad00e0fdea88edb746dffaf12d684dec6909
Author: Petr Mladek 
Date:   Wed Nov 23 18:07:27 2011 +0100

fixed the German translations

Ränder means margins
Umrandung means borders

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index c8b7a73..30f 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -92,9 +92,9 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
 const Size aPhysSize = SvxPaperInfo::GetDefaultPaperSize();
 aFrmSize.SetSize( aPhysSize );
 
-// Prepare for default borders.
-// Borders have a default minimum size.
-// If the printer forces a larger border, that's ok too.
+// Prepare for default margins.
+// Margins have a default minimum size.
+// If the printer forces a larger margins, that's ok too.
 // The HTML page desc had A4 as page size always.
 // This has been changed to take the page size from the printer.
 // Unfortunately, the margins of the HTML page desc are smaller than
@@ -117,7 +117,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
 nMinLeft = nMinRight = 1800;//  1,25 Inch
 }
 
-// Set borders.
+// set margins
 SvxLRSpaceItem aLR( RES_LR_SPACE );
 SvxULSpaceItem aUL( RES_UL_SPACE );
 
@@ -262,7 +262,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 {
 SwFmtHeader aHead( MakeLayoutFmt( RND_STD_HEADERL, 0 ) );
 pDesc->GetLeft().SetFmtAttr( aHead );
-// Take over additional attributes (borders, border strips ...).
+// take over additional attributes (margins, borders ...)
 ::lcl_DescSetAttr( *rHead.GetHeaderFmt(), *aHead.GetHeaderFmt(), 
sal_False);
 }
 else
@@ -322,7 +322,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 {
 SwFmtFooter aFoot( MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
 pDesc->GetLeft().SetFmtAttr( aFoot );
-// Take over additional attributes (borders, border strips ...).
+// Take over additional attributes (margins, borders ...).
 ::lcl_DescSetAttr( *rFoot.GetFooterFmt(), *aFoot.GetFooterFmt(), 
sal_False);
 }
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-23 Thread Petr Mladek 
 sw/source/core/doc/doccomp.cxx |2 
 sw/source/core/doc/docdde.cxx  |   52 ++---
 sw/source/core/doc/docdesc.cxx |  153 ++---
 3 files changed, 97 insertions(+), 110 deletions(-)

New commits:
commit ed870efe80397042d8f51d2ca7002025ba4e111f
Author: Philipp Weissenbacher 
Date:   Sat Nov 19 12:05:18 2011 +0100

Translated German comments to English.

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 169fa4d..6962621 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1510,7 +1510,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool 
bUseDocInfo )
 }
 else
 {
-// liegen hintereinander also zusammen fassen
+// are consecutive, so combine
 rSttEnd = *((SwPaM*)pTmp->GetNext())->End();
 delete pTmp->GetNext();
 }
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 10892ca..f364f8c 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -42,11 +42,11 @@
 #include 
 #include 
 #include 
-#include// fuer Server-Funktionalitaet
+#include// for server functionality
 #include 
 #include 
-#include   // fuer SwSectionFmt
-#include   // fuer SwTable
+#include   // for SwSectionFmt
+#include   // for SwTable
 #include 
 #include 
 #include 
@@ -106,20 +106,20 @@ sal_Bool lcl_FindSection( const SwSectionFmtPtr& 
rpSectFmt, void* pArgs, bool bC
 : GetAppCharClass().lower( pItem->m_Item ) );
 if( sNm == sCompare )
 {
-// gefunden, als erfrage die Daten
+// found, so get the data
 const SwNodeIndex* pIdx;
 if( 0 != (pIdx = rpSectFmt->GetCntnt().GetCntntIdx() ) &&
 &rpSectFmt->GetDoc()->GetNodes() == &pIdx->GetNodes() )
 {
-// eine Tabelle im normalen NodesArr
+// a table in the normal NodesArr
 pItem->pSectNd = pIdx->GetNode().GetSectionNode();
 return sal_False;
 }
-//nein!!// sollte der Namen schon passen, der Rest aber nicht, 
dann haben wir
-// sie nicht. Die Namen sind immer eindeutig.
+// If the name is already correct, but not the rest then we don't 
have them.
+// The names are always unique.
 }
 }
-return sal_True;// dann weiter
+return sal_True;
 }
 sal_Bool lcl_FindSectionCaseSensitive( const SwSectionFmtPtr& rpSectFmt, void* 
pArgs )
 {
@@ -145,15 +145,15 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, 
void* pArgs )
 pFBox->GetSttNd() &&
 &rpTableFmt->GetDoc()->GetNodes() == 
&pFBox->GetSttNd()->GetNodes() )
 {
-// eine Tabelle im normalen NodesArr
+// a table in the normal NodesArr
 pItem->pTblNd = (SwTableNode*)
 pFBox->GetSttNd()->FindTableNode();
 return sal_False;
 }
-//nein! // sollte der Namen schon passen, der Rest aber nicht, dann haben 
wir
-// sie nicht. Die Namen sind immer eindeutig.
+// If the name is already correct, but not the rest then we don't have 
them.
+// The names are always unique.
 }
-return sal_True;// dann weiter
+return sal_True;
 }
 
 
@@ -161,7 +161,7 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, 
void* pArgs )
 bool SwDoc::GetData( const String& rItem, const String& rMimeType,
  uno::Any & rValue ) const
 {
-//search for bookmarks and sections case senstive at first. If nothing is 
found then try again case insensitive
+// search for bookmarks and sections case senstive at first. If nothing is 
found then try again case insensitive
 bool bCaseSensitive = true;
 while( true )
 {
@@ -169,14 +169,14 @@ bool SwDoc::GetData( const String& rItem, const String& 
rMimeType,
 if(pBkmk)
 return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
 
-// haben wir ueberhaupt das Item vorraetig?
+// Do we already have the Item?
 String sItem( bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
 _FindItem aPara( sItem );
 ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
 bCaseSensitive ? 
lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara );
 if( aPara.pSectNd )
 {
-// gefunden, als erfrage die Daten
+// found, so get the data
 return SwServerObject( *aPara.pSectNd ).GetData( rValue, rMimeType 
);
 }
 if( !bCaseSensitive )
@@ -200,7 +200,7 @@ bool SwDoc::GetData( const String& rItem, const

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

2011-11-23 Thread Noel Power 
 sc/inc/sc.hrc |4 -
 sc/source/ui/app/inputwin.cxx |  146 --
 sc/source/ui/inc/inputwin.hxx |   19 +++--
 sc/source/ui/src/toolbox.src  |   11 +++
 4 files changed, 140 insertions(+), 40 deletions(-)

New commits:
commit 6151ec073e86be2fccffd5bf46d31a8261a232d3
Author: Noel Power 
Date:   Wed Nov 23 16:27:17 2011 +

add mouse resize (and other bits ) to gsoc formulabar

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 2edba1e..6ca8544 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1006,7 +1006,9 @@
 #define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
 #define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
 #define SCSTR_DDEDOC_NOT_LOADED (STR_START + 405)
-#define SCSTR_EXTDOC_NOT_LOADED (STR_START + 406)
+#define SCSTR_QHELP_EXPAND_FORMULA   (STR_START + 406)
+#define SCSTR_QHELP_COLLAPSE_FORMULA (STR_START + 407)
+#define SCSTR_EXTDOC_NOT_LOADED (STR_START + 408)
 
 
 #define STR_END (SCSTR_EXTDOC_NOT_LOADED)
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 82d9253..da067b8 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -88,7 +88,7 @@
 #define THESIZE 100 //!!! langt... :-)
 #define TBX_WINDOW_HEIGHT   22 // in Pixeln - fuer alle Systeme gleich?
 #define LEFT_OFFSET 5
-#define INPUTWIN_MULTILINES 10
+#define INPUTWIN_MULTILINES 6
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::UNO_QUERY;
@@ -179,7 +179,8 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* 
pBind ) :
 aTextSum( ScResId( SCSTR_QHELP_BTNSUM ) ),
 aTextEqual  ( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
 bIsOkCancelMode ( false ),
-bIsMultiLine( false )
+bIsMultiLine( false ),
+bInResize   ( false )
 {
 ScModule*pScMod  = SC_MOD();
 SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
@@ -516,7 +517,7 @@ void ScInputWindow::Select()
 
 void ScInputWindow::Resize()
 {
-
+ToolBox::Resize();
 if ( lcl_isExperimentalMode() )
 {
 Size aSize = GetSizePixel();
@@ -536,7 +537,6 @@ void ScInputWindow::Resize()
 aTextWindow.SetSizePixel( aSize );
 aTextWindow.Invalidate();
 }
-ToolBox::Resize();
 }
 
 void ScInputWindow::SetFuncString( const String& rString, sal_Bool bDoEdit )
@@ -749,14 +749,72 @@ void ScInputWindow::DataChanged( const DataChangedEvent& 
rDCEvt )
 ToolBox::DataChanged( rDCEvt );
 }
 
-bool ScInputWindow::GetMultiLineStatus()
+void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
 {
-return bIsMultiLine;
+if ( lcl_isExperimentalMode() )
+{
+Point aPosPixel = GetPointerPosPixel();
+Point aPnt = PixelToLogic( aPosPixel );
+
+ScInputBarGroup* pGroupBar = dynamic_cast< ScInputBarGroup* > ( 
pRuntimeWindow.get() );
+if ( bInResize || ( GetOutputSizePixel().Height() - aPosPixel.Y() <= 4 
 ) )
+{
+SetPointer( Pointer( POINTER_WINDOW_SSIZE ) );
+
+if ( rMEvt.IsLeft() )
+{
+// Don't leave the mouse pointer leave *this* window
+CaptureMouse();
+bInResize = true;
+}
+else
+{
+ReleaseMouse();
+bInResize = false;
+}
+
+if ( bInResize )
+{
+// Trigger resize
+long nResizeThreshold = ( (long)TBX_WINDOW_HEIGHT * 0.7 );
+bool bResetPointerPos = false;
+if ( GetOutputSizePixel().Height() - aPosPixel.Y() < 
-nResizeThreshold  )
+{
+pGroupBar->IncrementVerticalSize();
+bResetPointerPos = true;
+}
+else if ( ( GetOutputSizePixel().Height() - aPosPixel.Y()  ) > 
nResizeThreshold )
+{
+bResetPointerPos = true;
+pGroupBar->DecrementVerticalSize();
+}
+
+if ( bResetPointerPos )
+{
+aPosPixel.Y() =  GetOutputSizePixel().Height();
+SetPointerPosPixel( aPosPixel );
+}
+
+}
+}
+else
+{
+ReleaseMouse();
+SetPointer( Pointer( POINTER_ARROW ) );
+}
+}
+ToolBox::MouseMove( rMEvt );
 }
 
-void ScInputWindow::SetMultiLineStatus(bool bMode)
+void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
-bIsMultiLine=bMode;
+if ( lcl_isExperimentalMode() )
+{
+ReleaseMouse();
+if ( rMEvt.IsLeft() )
+bInResize = false;
+}
+ToolBox::MouseButtonUp( rMEvt );
 }
 
 
@@ -783,9 +841,9 @@ ScInputBarGroup::ScInputBarGroup(Window* pParent)
   
aButton.SetSizePixel(Size(GetSettings().GetStyleSettings().GetScrollBarSize(), 
TBX_WINDOW_HEIGHT) );
   aButton.Enable(

[Libreoffice-commits] .: icc/prj icc/source

2011-11-23 Thread Tomáš Chvátal 
 icc/prj/build.lst  |4 ++--
 icc/source/create_sRGB_profile/makefile.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ce2a78b4efe5c62d4aa13109401dc820e3891e71
Author: Tomas Chvatal 
Date:   Wed Nov 23 17:05:19 2011 +0100

Whitespace and expand comment, drop useless rm.

diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index 45fbe5a..ac7cf32 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,4 +1,4 @@
-ip icc :   solenv external sal NULL
+ip icc :   solenv external sal NULL
 ip icc usr1-   all ip_mkout
NULL
 ip icc nmake   -   all ip_icc  
NULL
-ip  icc/source/create_sRGB_profile nmake   -   all ip_profile 
ip_icc   NULL 
+ip icc/source/create_sRGB_profile  nmake   -   all ip_profile 
ip_icc   NULL 
diff --git a/icc/source/create_sRGB_profile/makefile.mk 
b/icc/source/create_sRGB_profile/makefile.mk
index d3dc3f9..56a9a67 100644
--- a/icc/source/create_sRGB_profile/makefile.mk
+++ b/icc/source/create_sRGB_profile/makefile.mk
@@ -68,6 +68,7 @@ APP1STDLIBS=\
 -lICC_utils
 # this library is not in pkgconfig but in the same dir
 # so no need to cry for it and just hardcode it here
+# bug also opened upstream about this
 .ELSE
 APP1LIBS=\
 $(SLB)$/proflib.lib \
@@ -81,5 +82,4 @@ APP1OBJS= $(OBJFILES)
 ALLTAR: $(TARGET)$(EXECPOST)
 
 $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST)
-rm -rf $@
 cd $(BIN)$/ && $(BIN)$/$(TARGET)$(EXECPOST)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in icc/makefile.mk icc/prj icc/SampleICC-makefiles.patch icc/source set_soenv.in

2011-11-23 Thread Tomáš Chvátal 
 configure.in   |   21 +
 icc/SampleICC-makefiles.patch  |2 
 icc/makefile.mk|   15 -
 icc/prj/build.lst  |5 
 icc/prj/d.lst  |4 
 icc/source/create_sRGB_profile/Makefile.am |   13 
 icc/source/create_sRGB_profile/Makefile.in |  378 -
 icc/source/create_sRGB_profile/makefile.mk |   35 +-
 set_soenv.in   |3 
 9 files changed, 58 insertions(+), 418 deletions(-)

New commits:
commit 07f2c05391f5cf8eed94c20787ab87cd0e09378f
Author: Tomas Chvatal 
Date:   Wed Nov 23 16:44:03 2011 +0100

Make SampleICC switchable between system and internal one.

diff --git a/configure.in b/configure.in
index 6abcc22..58a20d1 100644
--- a/configure.in
+++ b/configure.in
@@ -951,6 +951,11 @@ AC_ARG_WITH(system-nss,
 [Use NSS/nspr libraries already on system.]),,
 [with_system_nss="$with_system_libs"])
 
+AC_ARG_WITH(system-sampleicc,
+AS_HELP_STRING([--with-system-sampleicc],
+[Use SampleICC libraries already on system (used only during 
build).]),,
+[with_system_sampleicc="$with_system_libs"])
+
 AC_ARG_WITH(mozilla-version,
 AS_HELP_STRING([--with-mozilla-version],
 [Choose which version of Mozilla to use while building Mozilla.
@@ -6205,6 +6210,22 @@ AC_SUBST(GRAPHITE_LIBS)
 AC_SUBST(GRAPHITE_CFLAGS)
 
 dnl ===
+dnl SampleICC
+dnl ===
+AC_MSG_CHECKING([whether to use system SampleICC])
+if test "$with_system_sampleicc" = "yes"; then
+AC_MSG_RESULT([yes])
+SYSTEM_SAMPLEICC=YES
+PKG_CHECK_MODULES(SAMPLEICC, sampleicc)
+else
+AC_MSG_RESULT([no])
+SYSTEM_SAMPLEICC=NO
+fi
+AC_SUBST(SYSTEM_SAMPLEICC)
+AC_SUBST(SAMPLEICC_LIBS)
+AC_SUBST(SAMPLEICC_CFLAGS)
+
+dnl ===
 dnl Checks for libraries.
 dnl ===
 dnl Check for Mac OS X native GUI, which may is now required; the X11 build is 
no longer supported
diff --git a/icc/SampleICC-makefiles.patch b/icc/SampleICC-makefiles.patch
index 34a59ff..7a11866 100644
--- a/icc/SampleICC-makefiles.patch
+++ b/icc/SampleICC-makefiles.patch
@@ -46,7 +46,7 @@
 +ALLTAR: Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST)
 +
 +Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST) .PHONY:
-+cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake && cd 
..$/CmdLine$/create_sRGB_profile && dmake
++cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake
 +
 --- /dev/null  2011-10-28 11:24:51.341910850 +0100
 +++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk   2011-11-04 
08:50:20.0 +
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 8bf13c3..e885c53 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -30,6 +30,11 @@ PRJ=.
 PRJNAME=icc
 TARGET=icc
 
+.IF "$(SYSTEM_SAMPLEICC)" == "YES"
+all:
+@echo "Using system SampleICC, nothing to do here."
+.ELSE
+
 # --- Settings -
 
 .INCLUDE : settings.mk
@@ -49,14 +54,10 @@ CONVERTFILES= \
 Contrib$/ICC_utils$/Stubs.h \
 Contrib$/ICC_utils$/Vetters.cpp
 
-.IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile 
Contrib$/CmdLine
-BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && 
$(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
-.ELSE
-CONFIGURE_ACTION= 
-BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && 
tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf -
-.ENDIF
+CONFIGURE_ACTION=
+BUILD_ACTION=dmake
 
+.ENDIF
 
 # --- Targets --
 
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index e9bf65b..45fbe5a 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,3 +1,4 @@
 ip icc :   solenv external sal NULL
-ip icc usr1-   all ip_mkout NULL
-ip icc nmake   -   all ip_icc  NULL
+ip icc usr1-   all ip_mkout
NULL
+ip icc nmake   -   all ip_icc  
NULL
+ip  icc/source/create_sRGB_profile nmake   -   all ip_profile 
ip_icc   NULL 
diff --git a/icc/prj/d.lst b/icc/prj/d.lst
index 553de38..e01dc0a 100644
--- a/icc/prj/d.lst
+++ b/icc/prj/d.lst
@@ -1,5 +1,3 @@
 mkdir: %_DEST%\inc\icc
-mkdir: %_DEST%\inc\external\icc
-
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx 
%_DEST%\inc\icc\sRGB*.hxx
 
+..\%__SRC%\bin\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
diff --git a/icc/source/create_sRGB_profile/Makefile.am 
b/icc/source/create_sRGB_profile/Makefile.am
deleted file mode 100644

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

2011-11-23 Thread Caolán McNamara 
 sw/inc/swcrsr.hxx |4 ++--
 sw/source/core/crsr/swcrsr.cxx|9 +
 sw/source/core/fields/cellfml.cxx |4 ++--
 unusedcode.easy   |7 ---
 4 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit b2e84f9a40fda7821d4e658f9102bcbc783a1ba3
Author: Caolán McNamara 
Date:   Wed Nov 23 15:32:43 2011 +

std::map::erase takes a nonconst iterator

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index f7bb248..9bb433a 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -283,8 +283,8 @@ public:
 virtual sal_Bool GotoTable( const String& rName );
 
 void InsertBox( const SwTableBox& rTblBox );
-void DeleteBox( SwSelBoxes::const_iterator it ) { aSelBoxes.erase( it ); 
bChg = sal_True; }
-void DeleteBox( SwSelBoxes::const_iterator itFirst, 
SwSelBoxes::const_iterator itLast ) { aSelBoxes.erase( itFirst, itLast ); bChg 
= sal_True; }
+void DeleteBox( SwSelBoxes::iterator it ) { aSelBoxes.erase( it ); bChg = 
sal_True; }
+void DeleteBox( SwSelBoxes::iterator itFirst, SwSelBoxes::iterator itLast 
) { aSelBoxes.erase( itFirst, itLast ); bChg = sal_True; }
 void DeleteAllBoxes() { DeleteBox(aSelBoxes.begin(), aSelBoxes.end()); }
 sal_uInt16 GetBoxesCount() const { return aSelBoxes.size(); }
 const SwSelBoxes& GetBoxes() const { return aSelBoxes; }
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 8b4fab8..650b01d 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2165,8 +2165,9 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
 
 else
 {
-SwSelBoxes::const_iterator it = aTmp.find(pSttNd->GetIndex());
-if( it != aTmp.end() ) {
+SwSelBoxes::iterator it = aTmp.find(pSttNd->GetIndex());
+if( it != aTmp.end() )
+{
 SwNodeIndex aIdx( *pSttNd, 1 );
 const SwNode* pNd = &aIdx.GetNode();
 if( !pNd->IsCntntNode() )
@@ -2272,7 +2273,7 @@ bool SwTableCursor::NewTableSelection()
 
 void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
 {
-SwSelBoxes::const_iterator itOld = aSelBoxes.begin();
+SwSelBoxes::iterator itOld = aSelBoxes.begin();
 SwSelBoxes::const_iterator itNew = rNew.begin();
 while ( itOld != aSelBoxes.end() && itNew != rNew.end() )
 {
@@ -2285,7 +2286,7 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes 
&rNew )
 }
 else if( pPOld->GetSttIdx() < pPNew->GetSttIdx() )
 {
-SwSelBoxes::const_iterator it = itOld;
+SwSelBoxes::iterator it = itOld;
 ++itOld;
 DeleteBox( it ); // this box has to go
 }
diff --git a/sw/source/core/fields/cellfml.cxx 
b/sw/source/core/fields/cellfml.cxx
index 5e7c1e4..17d3db2 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -349,7 +349,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, 
String& rNewStr,
 
 rNewStr += '(';
 bool bDelim = false;
-for( SwSelBoxes::const_iterator it = aBoxes.begin();
+for( SwSelBoxes::iterator it = aBoxes.begin();
  it != aBoxes.end() && !pCalcPara->rCalc.IsCalcError();
  ++it )
 {
@@ -960,7 +960,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
 break;
 
 // dann mal die Tabellenkoepfe raus:
-for( SwSelBoxes::const_iterator it = rBoxes.begin(); it != 
rBoxes.end(); ++it )
+for( SwSelBoxes::iterator it = rBoxes.begin(); it != rBoxes.end(); 
++it )
 {
 pLine = it->second->GetUpper();
 while( pLine->GetUpper() )
commit 7434fa5bbd051dc4842bc76d33f27e07f10e0053
Author: Caolán McNamara 
Date:   Wed Nov 23 15:21:13 2011 +

update list post SwSelBoxes conversion

diff --git a/unusedcode.easy b/unusedcode.easy
index 6bb28a2..77d915b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -387,6 +387,7 @@ ScDPItemData::GetNumFormat() const
 
ScDPSaveData::Refresh(com::sun::star::uno::Reference
 const&)
 ScDdeLink::ResetValue()
 ScDocRowHeightUpdater::TabRanges::TabRanges()
+ScDocument::SetAllTabRangeNames(std::__debug::map, std::allocator > > 
const&)
 ScDocument::ValidNewTabName(std::__debug::vector > const&) const
 
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference
 const&)
 ScFormulaCell::IsRangeNameInUse(unsigned short) const
@@ -408,7 +409,9 @@ ScMultiTextWnd::GetLineCount()
 ScMyCellInfo::ScMyCellInfo()
 ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, 
rtl::OUString const*, ScXMLImport&)
 ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, 
short, rtl::OUString const*, ScXMLImport&)
+ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
 ScNameDlg::CalcCurTableAssign(String&, ScRangeData*)
+ScNameDlg::Update

[Libreoffice-commits] .: sal/osl

2011-11-23 Thread Michael Meeks 
 sal/osl/unx/system.c |4 
 1 file changed, 4 insertions(+)

New commits:
commit f1ef1ed6900fa2caf7c5997e8b764c3f82c0a125
Author: Michael Meeks 
Date:   Wed Nov 23 15:30:06 2011 +

version information from Arnaud on deprecating the getpid workaround.

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 4041edb..478fdaf 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -205,6 +205,10 @@ int macxp_resolveAlias(char *path, int buflen)
 /* The linux kernel thread implemention, always return the pid of the
thread subprocess and not of the main process. So we save the main
pid at startup
+   FIXME: when our Linux base-line is above:
++ Linux kernel version 2.6.18 or higher; -> clone() for NTPL
++ glibc2 version 2.5 or higher; -> NPTL
+   Then we get a working getpid() and can remove this hack.
 */
 
 // Directly from libc.so.6, obviously missing from some unistd.h:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/Library_dbu.mk dbaccess/Library_dbui.mk dbaccess/source

2011-11-23 Thread Lionel Elie Mamane 
 dbaccess/Library_dbu.mk |6 --
 dbaccess/Library_dbui.mk|   17 -
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |4 
 3 files changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 538190e0ea142d0a7da244809c66241379d4d91b
Author: Lionel Elie Mamane 
Date:   Wed Nov 23 14:34:24 2011 +0100

fdo#32347: reenable ADO URL helper UI

cleanup obsolete DISABLE_ADO/WINDOWS_VISTA_PSDK logic

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 0419c29..6c645c9 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -50,12 +50,6 @@ $(eval $(call gb_Library_add_defs,dbu,\
 $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
 ))
 
-ifeq (,$(strip $(PROF_EDITION)))
-$(eval $(call gb_Library_add_defs,dbu,\
--DWINDOWS_VISTA_PSDK \
-))
-endif
-
 ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
 $(eval $(call gb_Library_add_cxxflags,dbu,\
 -fpermissive \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 3c6bfb2..0808896 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -51,34 +51,17 @@ $(eval $(call gb_Library_add_cflags,dbui,\
 ))
 endif
 
-ifneq ($(WINDOWS_VISTA_PSDK),)
-ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_add_defs,dbui,\
-   -DDBACCESS_DLLIMPLEMENTATION\
-   -DWINDOWS_VISTA_PSDK \
-))
-endif
-endif
-
 ifeq ($(GUI)$(COM),WNTGCC)
 $(eval $(call gb_Library_add_cflags,dbui,\
-fpermissive \
 ))
 endif
 
-ifeq ($(PROF_EDITION),)
-ifneq ($(WINDOWS_VISTA_PSDK),)
-DISABLE_ADO=TRUE
-endif
-endif
-
 ifeq ($(OS),WNT)
-ifeq ($(DISABLE_ADO),)
 $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/dlg/adodatalinks \
 ))
 endif
-endif
 
 $(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index bc03951..7ec94ad 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -71,6 +71,10 @@
 #include 
 #include 
 
+#if defined(WNT)
+#define _ADO_DATALINK_BROWSE_
+#endif
+
 #ifdef _ADO_DATALINK_BROWSE_
 #include 
 #include "adodatalinks.hxx"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

2011-11-23 Thread Michael Meeks 
 vcl/source/window/decoview.cxx |  369 -
 1 file changed, 149 insertions(+), 220 deletions(-)

New commits:
commit e5b5d6dc5bf39ad042dcc717ea4bec4bfc4993fb
Author: Matteo Casalin 
Date:   Wed Nov 23 14:59:55 2011 +

Decoview code cleanup

Cleaned up many ImplDrawSymbol cases, reducing number of calls to drawing 
functions
Removed unused local variables in ImplDrawSymbol
Translated some comments from German to English

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index e275551..d991a16 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -50,10 +50,6 @@ static void ImplDrawSymbol( OutputDevice* pDev, const 
Rectangle& rRect,
 {
 // Groessen vorberechnen
 longnMin= Min( rRect.GetWidth(), rRect.GetHeight() );
-longnSize   = nMin;
-
-if ( nMin & 0x01 )
-nMin--;
 Point   aCenter = rRect.Center();
 longnCenterX = aCenter.X();
 longnCenterY = aCenter.Y();
@@ -63,149 +59,107 @@ static void ImplDrawSymbol( OutputDevice* pDev, const 
Rectangle& rRect,
 longnTop;
 longnRight;
 longnBottom;
-longnTemp;
-longi;
+
+const bool bMinSideIsOdd = nMin & 1;
 
 switch ( eType )
 {
 case SYMBOL_ARROW_UP:
+if ( bMinSideIsOdd )
 {
-if ( !(nMin & 0x01) )
-{
-n2--;
-n4--;
+// Make odd size for spearhead
+n4 = --n2 / 2;
 }
 nTop = nCenterY-n2;
-nBottom = nCenterY;
-pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
-i = 1;
-while ( i <= n2 )
+pDev->DrawPixel( Point( nCenterX, nTop ) );
+for ( long i = 1; i <= n2; ++i )
 {
 nTop++;
-nTemp = nCenterX-i;
-pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
-nTemp = nCenterX+i;
-pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
-i++;
-}
-pDev->DrawRect( Rectangle( nCenterX-n4, nBottom,
-   nCenterX+n4, nBottom+n2 ) );
+pDev->DrawRect( Rectangle (Point( nCenterX-i, nTop ),
+Point( nCenterX+i, nTop ) ) );
 }
+pDev->DrawRect( Rectangle( nCenterX-n4, nCenterY,
+   nCenterX+n4, nCenterY+n2 ) );
 break;
 
 case SYMBOL_ARROW_DOWN:
+if ( bMinSideIsOdd )
 {
-if ( !(nMin & 0x01) )
-{
-n2--;
-n4--;
+// Make odd size for spearhead
+n4 = --n2 / 2;
 }
-nTop = nCenterY;
 nBottom = nCenterY+n2;
-pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
-i = 1;
-while ( i <= n2 )
+pDev->DrawPixel( Point( nCenterX, nBottom ) );
+for ( long i = 1; i <= n2; ++i )
 {
 nBottom--;
-nTemp = nCenterX-i;
-pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
-nTemp = nCenterX+i;
-pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
-i++;
-}
-pDev->DrawRect( Rectangle( nCenterX-n4, nTop-n2,
-   nCenterX+n4, nTop ) );
+pDev->DrawLine( Point( nCenterX-i, nBottom ),
+Point( nCenterX+i, nBottom ) );
 }
+pDev->DrawRect( Rectangle( nCenterX-n4, nCenterY-n2,
+   nCenterX+n4, nCenterY ) );
 break;
 
 case SYMBOL_ARROW_LEFT:
+if ( bMinSideIsOdd )
 {
-if ( !(nMin & 0x01) )
-{
-n2--;
-n4--;
+// Make odd size for spearhead
+n4 = --n2 / 2;
 }
 nLeft = nCenterX-n2;
-nRight = nCenterX;
-pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
-i = 1;
-while ( i <= n2 )
+pDev->DrawPixel( Point( nLeft, nCenterY ) );
+for ( long i = 1; i <= n2; ++i )
 {
 nLeft++;
-nTemp = nCenterY-i;
-pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
-nTemp = nCenterY+i;
-pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
-i++;
-}
-pDev->DrawRect( Rectangle( nRight, nCenterY-n4,
-   nRight+n2, nCenterY+n4 ) );
+pDev->DrawLine( Point( nLeft, nCenterY-i ),
+

[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_svtools binfilter/legacysmgr

2011-11-23 Thread Stephan Bergmann 
 binfilter/bf_basic/source/sbx/sbxbase.cxx |4 +-
 binfilter/bf_svtools/source/items1/svt_poolio.cxx |6 +--
 binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx |   20 --
 3 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 74de99e98d3b5ef5df0717debc70e2b33da43ea9
Author: Stephan Bergmann 
Date:   Wed Nov 23 15:50:07 2011 +0100

Changed sal/log.h -> sal/log.hxx, drop _S from C++ streaming log macros.

A compile time check ensures the common case of streaming just a plain
C-style string literal still produces reasonably compact call-site code.
The format-string variants are still available in sal/detail/log.h, but
only to be used in obsolete osl/diagnose.h etc., and going to be removed
again eventually.

diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx 
b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index 691030b..2a380c1 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -27,7 +27,7 @@
  /
 
 #include 
-#include 
+#include 
 #include 
 
 #include "sbx.hxx"
@@ -214,7 +214,7 @@ SbxObject* SbxBase::CreateObject( const rtl::OUString& 
rClass )
 if( pNew )
 break;
 }
-SAL_WARN_IF_S(!pNew, "binfilter", "No factory for object class " << 
rClass);
+SAL_WARN_IF(!pNew, "binfilter", "No factory for object class " << rClass);
 return pNew;
 }
 
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx 
b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index cd2426e..712846d 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include "whassert.hxx"
@@ -669,11 +669,11 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
 delete rpNewItem;
 rpNewItem = pOldItem;
 bFound = TRUE;
-SAL_INFO_S(
+SAL_INFO(
 "binfilter", "reusing item" << pOldItem);
 }
 }
-SAL_INFO_IF_S(
+SAL_INFO_IF(
 !bFound, "binfilter",
 "item not found: " << pOldItem);
 }
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx 
b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index e4ade6f..bde5994 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -40,7 +40,7 @@
 #include "rtl/oustringostreaminserter.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/unload.h"
-#include "sal/log.h"
+#include "sal/log.hxx"
 
 #include "uno/dispatcher.h"
 
@@ -491,12 +491,12 @@ void OServiceManager_Listener::disposing(const 
EventObject & rEvt )
 }
 catch( const IllegalArgumentException & e )
 {
-SAL_WARN_S(
+SAL_WARN(
 "binfilter", "IllegalArgumentException caught: " << e.Message);
 }
 catch( const NoSuchElementException & e )
 {
-SAL_WARN_S(
+SAL_WARN(
 "binfilter", "NoSuchElementException caught: " << e.Message);
 }
 }
@@ -804,7 +804,7 @@ void OServiceManager::disposing()
 }
 catch (const RuntimeException & e)
 {
-SAL_WARN_S(
+SAL_WARN(
 "binfilter",
 "RuntimeException occurred upon disposing factory: "
 << e.Message);
@@ -1003,7 +1003,7 @@ Reference< XInterface > 
OServiceManager::createInstanceWithContext(
 Reference< XSingleServiceFactory > xFac2( xFactory, 
UNO_QUERY );
 if (xFac2.is())
 {
-SAL_INFO_S(
+SAL_INFO(
 "binfilter",
 "ignoring given context raising service "
 << rServiceSpecifier);
@@ -1014,8 +1014,7 @@ Reference< XInterface > 
OServiceManager::createInstanceWithContext(
 }
 catch (const lang::DisposedException & e)
 {
-SAL_WARN_S(
-"binfilter", "DisposedException occurred: " << e.Message);
+SAL_WARN("binfilter", "DisposedException occurred: " << e.Message);
 }
 }
 
@@ -1050,7 +1049,7 @@ Reference< XInterface > 
OServiceManager::createInstanceWithArgumentsAndContext(
 Reference< XSingleServiceFactory > xFac2( xFactory, 
UNO_QUERY );
 if (xFac2.is())
 {
-S

[Libreoffice-commits] .: solenv/bin

2011-11-23 Thread Michael Meeks 
 solenv/bin/build.pl |   86 +---
 1 file changed, 42 insertions(+), 44 deletions(-)

New commits:
commit f4573ceb2965ccc8abc1f5165b0fa63f5d63649f
Author: Daisuke Nishino 
Date:   Sun Nov 13 17:19:30 2011 +0900

Fix bug in build.pl option parser

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index d402092..4957627 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1342,51 +1342,49 @@ sub usage {
 sub get_options {
 my $arg;
 while ($arg = shift @ARGV) {
-$arg =~ /^-P$/and $processes_to_run = shift @ARGV and 
next;
-$arg =~ /^-P(\d+)$/and $processes_to_run = $1 and next;
-$arg =~ /^--all$/and $build_all_parents = 1 and 
next;
-$arg =~ /^-a$/and $build_all_parents = 1 and next;
-$arg =~ /^--show$/and $show = 1 and 
next;
-$arg =~ /^--checkmodules$/   and $checkparents = 1 and $ignore = 1 
and next;
-$arg =~ /^-s$/and $show = 1 and next;
-$arg =~ /^--deliver$/and $deliver = 1 and next;
-$arg =~ /^(--job=)/   and $custom_job = $' and next;
-$arg =~ /^(--pre_job=)/   and $pre_custom_job = $' and next;
-$arg =~ /^(--post_job=)/   and $post_custom_job = $' and next; #'
-$arg =~ /^-d$/and $deliver = 1 and next;
-$arg =~ /^--dlv_switch$/and $dlv_switch = shift @ARGVand next;
-$arg =~ /^--file$/and $cmd_file = shift @ARGV and 
next;
-$arg =~ /^-F$/and $cmd_file = shift @ARGV and next;
-$arg =~ /^--skip$/and get_modules_passed(\%skip_modules)  and 
next;
-
-$arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
-and $build_all_cont = $1and next;
-$arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
-and $build_all_cont = $1and next;
+if ($arg =~ /^-P$/)  { $processes_to_run = shift @ARGV;
 next; }
+if ($arg =~ /^-P(\d+)$/) { $processes_to_run = $1; 
 next; }
+if ($arg =~ /^--all$/)   { $build_all_parents = 1; 
 next; }
+if ($arg =~ /^-a$/)  { $build_all_parents = 1; 
 next; }
+if ($arg =~ /^--show$/)  { $show = 1;  
 next; }
+if ($arg =~ /^--checkmodules$/)  { $checkparents = 1; $ignore = 1; 
 next; }
+if ($arg =~ /^-s$/)  { $show = 1;  
 next; }
+if ($arg =~ /^--deliver$/)   { $deliver = 1;   
 next; }
+if ($arg =~ /^(--job=)/) { $custom_job = $';   
 next; }
+if ($arg =~ /^(--pre_job=)/) { $pre_custom_job = $';   
 next; }
+if ($arg =~ /^(--post_job=)/){ $post_custom_job = $';  
 next; } #'
+if ($arg =~ /^-d$/)  { $deliver = 1;   
 next; }
+if ($arg =~ /^--dlv_switch$/){ $dlv_switch = shift @ARGV;  
 next; }
+if ($arg =~ /^--file$/)  { $cmd_file = shift @ARGV;
 next; }
+if ($arg =~ /^-F$/)  { $cmd_file = shift @ARGV;
 next; }
+if ($arg =~ /^--skip$/)  { get_modules_passed(\%skip_modules); 
 next; }
+
+if ($arg =~ /^--all:(\S+)$/) { $build_all_parents = 1;
+   $build_all_cont = $1;   
 next; }
+if ($arg =~ /^-a:(\S+)$/){ $build_all_parents = 1;
+   $build_all_cont = $1;   
 next; }
 if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
-$build_all_parents = 1;
-get_modules_passed(\%incompatibles);
-next;
-};
-$arg =~ /^--since$/and $build_all_parents = 1
-and $build_since = shift @ARGV and 
next;
-$arg =~ /^-c$/and $build_all_parents = 1
-and $build_since = shift @ARGV and 
next;
-$arg =~ /^-s$/and $build_all_parents = 1
-and $build_since = shift @ARGV and 
next;
-$arg =~ /^--help$/and usage()and 
do_exit(0);
-$arg =~ /^-h$/and usage()and 
do_exit(0);
-$arg =~ /^--ignore$/and $ignore = 1
and next;
-$arg =~ /^--html$/and $html = 1and 
next;
-$arg =~ /^--html_path$/ and $html_path = shift @ARGV  and next;
-$arg =~ /^-i$/

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

2011-11-23 Thread Michael Meeks 
 sfx2/inc/sfx2/htmlmode.hxx|1 -
 sw/source/filter/html/css1atr.cxx |6 ++
 sw/source/filter/html/htmlatr.cxx |2 +-
 sw/source/ui/config/viewopt.cxx   |1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 98761e3680bcb2268efd679330fa034e21ff2b9e
Author: Harri Pitkänen 
Date:   Tue Nov 22 20:24:52 2011 +0200

Enable :first-letter CSS pseudo-class for all browsers in HTML export

Previously when drop caps were specified in a paragraph style (not
as direct formatting) export to HTML was implemented with :first-letter
pseudo-class for "LibreOffice Writer" and through styling individual
characters for other browsers. Since all browsers used these days (even
obsolete ones like IE 5.5) support :first-letter there seems to be no
reason to maintain this difference. This patch unifies all export
modes to use :first-letter in such cases.

diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index 65e41f6..63b0bfe 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -35,7 +35,6 @@
 #define HTMLMODE_SOME_STYLES0x0020 /* mind. MS IE */
 #define HTMLMODE_FULL_STYLES0x0040 /* == SW */
 #define HTMLMODE_PARA_BLOCK 0x0100
-#define HTMLMODE_DROPCAPS   0x0200
 #define HTMLMODE_FIRSTLINE  0x0400 /* First-line intent with Spacer == 
NS 3.0 */
 #define HTMLMODE_SOME_ABS_POS   0x2000
 #define HTMLMODE_RESERVED1  0x4000
diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 69efd26..d3d8174 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1381,8 +1381,7 @@ static sal_Bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, 
const String& rSelector,
  sal_Bool bCheckForPseudo  )
 {
 sal_Bool bScriptDependent = sal_False;
-if( SwHTMLWriter::HasScriptDependentItems( rItemSet,
-rHTMLWrt.IsHTMLMode(HTMLMODE_DROPCAPS) && bHasClass ) )
+if( SwHTMLWriter::HasScriptDependentItems( rItemSet, bHasClass ) )
 {
 bScriptDependent = sal_True;
 String aSelector( rSelector );
@@ -1778,8 +1777,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& 
rFmt,
 
 // Drop-Caps ausgeben
 const SfxPoolItem *pItem;
-if( rHTMLWrt.IsHTMLMode(HTMLMODE_DROPCAPS) &&
-SFX_ITEM_SET==aItemSet.GetItemState( RES_PARATR_DROP, sal_False, 
&pItem ))
+if( SFX_ITEM_SET==aItemSet.GetItemState( RES_PARATR_DROP, sal_False, 
&pItem ))
 {
 String sOut( aSelector );
 sOut.Append( ':');
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index c7d2847..3259cc0 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -648,7 +648,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 pFmtInfo = new SwHTMLFmtInfo( &rFmt, rWrt.pDoc, rHWrt.pTemplate,
   rHWrt.bCfgOutStyles, rHWrt.eLang,
   rHWrt.nCSS1Script,
-  !rHWrt.IsHTMLMode(HTMLMODE_DROPCAPS) );
+  false );
 rHWrt.aTxtCollInfos.C40_PTR_INSERT( SwHTMLFmtInfo, pFmtInfo );
 String aName( rFmt.GetName() );
 if( 0 != rHWrt.aScriptParaStyles.count( aName ) )
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 0ac6f96..5524fe2 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -348,7 +348,6 @@ sal_uInt16  GetHtmlMode(const SwDocShell* pShell)
 break;
 case HTML_CFG_WRITER:
 nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES|
-HTMLMODE_DROPCAPS|
 HTMLMODE_SOME_ABS_POS;
 break;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-23 Thread Andras Timar 
 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff1b70c92aed555ecdbe424aac29373142c8fcb6
Author: Andras Timar 
Date:   Wed Nov 23 15:11:31 2011 +0100

don't enable java extensions without java - fixup

diff --git a/configure.in b/configure.in
index 0d1ca1b..6abcc22 100644
--- a/configure.in
+++ b/configure.in
@@ -8196,7 +8196,7 @@ dnl 
===
 dnl Test whether to include NLPSolver extension
 dnl ===
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno" -a "x$with_java" != "no"; then
+if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno" -a "x$with_java" != "xno"; then
 BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-23 Thread Andras Timar 
 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06fe563b1a9a38b9c0057e90f934435125b89605
Author: Andras Timar 
Date:   Wed Nov 23 15:09:18 2011 +0100

don't enable java extensions without java

diff --git a/configure.in b/configure.in
index eebcc78..0d1ca1b 100644
--- a/configure.in
+++ b/configure.in
@@ -7565,7 +7565,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
 
 # scripting provider for BeanShell extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in 
BeanShell])
-if test "x$enable_ext_scripting_beanshell" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
+if test "x$enable_ext_scripting_beanshell" = "xyes" -a 
"x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_BEANSHELL=YES
 else
@@ -7577,7 +7577,7 @@ AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
 
 # scripting provider for JavaScript extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in 
JavaScript])
-if test "x$enable_ext_scripting_javascript" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
+if test "x$enable_ext_scripting_javascript" = "xyes" -a 
"x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_JAVASCRIPT=YES
 else
@@ -8196,7 +8196,7 @@ dnl 
===
 dnl Test whether to include NLPSolver extension
 dnl ===
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno"; then
+if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno" -a "x$with_java" != "no"; then
 BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-23 Thread Jan Holesovsky 
 sc/source/ui/namedlg/namemgrtable.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 039cbb09351c133df81c4303ce30b327e07ff40a
Author: Jan Holesovsky 
Date:   Wed Nov 23 14:44:11 2011 +0100

'const_iterator' instead of 'iterator' to fix Windows build.

diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index dc894a0..ad9ca9a 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -125,7 +125,7 @@ void ScRangeManagerTable::Init(const 
boost::ptr_map&
 aLine.aScope = maGlobalString;
 else
 aLine.aScope = itr->first;
-for (ScRangeName::iterator it = pLocalRangeName->begin();
+for (ScRangeName::const_iterator it = pLocalRangeName->begin();
 it != pLocalRangeName->end(); ++it)
 {
 if (!it->HasType(RT_DATABASE) && !it->HasType(RT_SHARED))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extras/source

2011-11-23 Thread Andras Timar 
 extras/source/autotext/lang/hu/acor_hu-HU.dat |binary
 1 file changed

New commits:
commit 4d5f0ecad765f17b4d0d41818290b0744b748daa
Author: Andras Timar 
Date:   Wed Nov 23 14:36:11 2011 +0100

added Creative Commons mark and (P) mark

by suggestion of David Penzes

diff --git a/extras/source/autotext/lang/hu/acor_hu-HU.dat 
b/extras/source/autotext/lang/hu/acor_hu-HU.dat
index d09f20b..46ba4d1 100644
Binary files a/extras/source/autotext/lang/hu/acor_hu-HU.dat and 
b/extras/source/autotext/lang/hu/acor_hu-HU.dat differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: embeddedobj/inc embeddedobj/source embeddedobj/test

2011-11-23 Thread Joseph Powers 
 embeddedobj/inc/pch/precompiled_embeddedobj.cxx  |   31 -
 embeddedobj/inc/pch/precompiled_embeddedobj.hxx  |   34 ---
 embeddedobj/source/commonembedding/embedobj.cxx  |2 -
 embeddedobj/source/commonembedding/inplaceobj.cxx|2 -
 embeddedobj/source/commonembedding/miscobj.cxx   |3 -
 embeddedobj/source/commonembedding/persistence.cxx   |3 -
 embeddedobj/source/commonembedding/register.cxx  |4 --
 embeddedobj/source/commonembedding/specialobject.cxx |2 -
 embeddedobj/source/commonembedding/visobj.cxx|2 -
 embeddedobj/source/commonembedding/xfactory.cxx  |2 -
 embeddedobj/source/general/docholder.cxx |2 -
 embeddedobj/source/general/dummyobject.cxx   |1 
 embeddedobj/source/general/intercept.cxx |3 -
 embeddedobj/source/general/xcreator.cxx  |2 -
 embeddedobj/source/msole/advisesink.cxx  |3 -
 embeddedobj/source/msole/closepreventer.cxx  |3 -
 embeddedobj/source/msole/graphconvert.cxx|2 -
 embeddedobj/source/msole/olecomponent.cxx|2 -
 embeddedobj/source/msole/oleembed.cxx|3 -
 embeddedobj/source/msole/olemisc.cxx |2 -
 embeddedobj/source/msole/olepersist.cxx  |3 -
 embeddedobj/source/msole/oleregister.cxx |4 --
 embeddedobj/source/msole/olevisual.cxx   |2 -
 embeddedobj/source/msole/olewrapclient.cxx   |3 -
 embeddedobj/source/msole/ownview.cxx |2 -
 embeddedobj/source/msole/xdialogcreator.cxx  |3 -
 embeddedobj/source/msole/xolefactory.cxx |2 -
 embeddedobj/test/MainThreadExecutor/register.cxx |4 --
 embeddedobj/test/MainThreadExecutor/xexecutor.cxx|3 -
 embeddedobj/test/mtexecutor/bitmapcreator.cxx|3 -
 embeddedobj/test/mtexecutor/mainthreadexecutor.cxx   |3 -
 embeddedobj/test/mtexecutor/mteregister.cxx  |4 --
 32 files changed, 144 deletions(-)

New commits:
commit 8d876c993e1f54c1a015e4a66eea47ad407bc142
Author: Joseph Powers 
Date:   Tue Nov 22 20:36:34 2011 -0800

Yet another empty pch file; in embeddedobj this time.

diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx 
b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
deleted file mode 100644
index 7b17fa7..000
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include "precompiled_embeddedobj.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx 
b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
deleted file mode 100644
index 758cd7a..000
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
+++ /dev/null
@@ -1,34 +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 c

[Libreoffice-commits] .: i18npool/source

2011-11-23 Thread Eike Rathke 
 i18npool/source/localedata/data/pt_PT.xml |  102 ++
 1 file changed, 48 insertions(+), 54 deletions(-)

New commits:
commit d3951ad0503a9d1c78570984fd8d483d8fb95a8c
Author: Olivier Hallot 
Date:   Wed Nov 23 13:52:13 2011 +0100

i18n corrections for pt-PT (dates)

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 88e8ed6..df6ce1d 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -34,7 +34,7 @@
 PM
 Metric
 
-
+
 
 DD-MM-
 
@@ -179,29 +179,23 @@
 #.###,00
 
 
-
-#.##0 [$Esc.-816];-#.##0 [$Esc.-816]
-
+
+#.##0 [CURRENCY];-#.##0 [CURRENCY]
 
-
-#.##0,00 [$Esc.-816];-#.##0,00 [$Esc.-816]
-
+
+#.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]
 
-
-#.##0 [$Esc.-816];[RED]-#.##0 [$Esc.-816]
-
+
+#.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]
 
-
-#.##0,00 [$Esc.-816];[RED]-#.##0,00 [$Esc.-816]
-
+
+#.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]
 
-
+
 #.##0,00 CCC
-
 
-
-#.##0,-- [$Esc.-816];[RED]-#.##0,-- [$Esc.-816]
-
+
+#.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]
 
 
 0%
@@ -265,75 +259,75 @@
 
 
 jan
-Jan
-Janeiro
+jan
+janeiro
 
 
 feb
-Fev
-Fevereiro
+fev
+fevereiro
 
 
 mar
-Mar
-Março
+mar
+março
 
 
 apr
-Abr
-Abril
+abr
+abril
 
 
 may
-Mai
-Maio
+mai
+maio
 
 
 jun
-Jun
-Junho
+jun
+junho
 
 
 jul
-Jul
-Julho
+jul
+julho
 
 
 aug
-Ago
-Agosto
+ago
+agosto
 
 
 sep
-Set
-Setembro
+set
+setembro
 
 
 oct
-Out
-Outubro
+out
+outubro
 
 
 nov
-Nov
-Novembro
+nov
+novembro
 
 
 dec
-Dez
-Dezembro
+dez
+dezembro
 
 
 
 
 bc
-BC
-BC
+a.c.
+a.c.
 
 
 ad
-AD
-AD
+d.c.
+d.c.
 
 
 
@@ -363,16 +357,16 @@
 
 verdadeiro
 falso
-1º trimestre
-2º trimestre
-3º trimestre
-4º trimestre
+1.º trimestre
+2.º trimestre
+3.º trimestre
+4.º trimestre
 acima
 abaixo
-T1
-T2
-T3
-T4
+1T
+2T
+3T
+4T
 
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

2011-11-23 Thread Michael Meeks 
 connectivity/source/drivers/evoab/LServices.cxx |  114 
 connectivity/source/drivers/evoab/exports.dxp   |1 
 2 files changed, 115 deletions(-)

New commits:
commit e04361c897c08374c7be54ff3ae09d789ca7627f
Author: Michael Meeks 
Date:   Wed Nov 23 12:50:45 2011 +

fully remove obsolete evolution 1.x connector

diff --git a/connectivity/source/drivers/evoab/LServices.cxx 
b/connectivity/source/drivers/evoab/LServices.cxx
deleted file mode 100644
index bd2b5f5..000
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ /dev/null
@@ -1,114 +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.
- *
- /
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-#include "LDriver.hxx"
-#include 
-
-using namespace connectivity::evoab;
-using ::rtl::OUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::lang::XSingleServiceFactory;
-using ::com::sun::star::lang::XMultiServiceFactory;
-
-typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
-(
-const Reference< XMultiServiceFactory > & rServiceManager,
-const OUString & rComponentName,
-::cppu::ComponentInstantiation pCreateFunction,
-const Sequence< OUString > & rServiceNames,
-rtl_ModuleCount* _pT
-);
-
-//---
-struct ProviderRequest
-{
-Reference< XSingleServiceFactory > xRet;
-Reference< XMultiServiceFactory > const xServiceManager;
-OUString const sImplementationName;
-
-ProviderRequest(
-void* pServiceManager,
-sal_Char const* pImplementationName
-)
-: xServiceManager(reinterpret_cast(pServiceManager))
-, sImplementationName(OUString::createFromAscii(pImplementationName))
-{
-}
-
-inline
-sal_Bool CREATE_PROVIDER(
-const OUString& Implname,
-const Sequence< OUString > & Services,
-::cppu::ComponentInstantiation Factory,
-createFactoryFunc creator
-)
-{
-if (!xRet.is() && (Implname == sImplementationName))
-try
-{
-xRet = creator( xServiceManager, sImplementationName,Factory, 
Services,0);
-}
-catch(...)
-{
-}
-return xRet.is();
-}
-
-void* getProvider() const { return xRet.get(); }
-};
-
-//---
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
-const sal_Char* pImplementationName,
-void* pServiceManager,
-void* /*pRegistryKey*/)
-{
-void* pRet = 0;
-if (pServiceManager)
-{
-ProviderRequest aReq(pServiceManager,pImplementationName);
-
-aReq.CREATE_PROVIDER(
-OEvoabDriver::getImplementationName_Static(),
-OEvoabDriver::getSupportedServiceNames_Static(),
-OEvoabDriver_CreateInstance, ::cppu::createSingleFactory)
-;
-
-if(aReq.xRet.is())
-aReq.xRet->acquire();
-
-pRet = aReq.getProvider();
-}
-
-return pRet;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab/exports.dxp 
b/connectivity/source/drivers/evoab/exports.dxp
deleted file mode 100755
index 7003307..000
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/

[Libreoffice-commits] .: scp2/source

2011-11-23 Thread Andras Timar 
 scp2/source/ooo/common_brand.scp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 92181d3e510fb0ef09d5688cc0eade4ad2743f76
Author: Andras Timar 
Date:   Wed Nov 23 13:40:17 2011 +0100

create this dir so uninstall can remove it

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7630602..791eb6d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -414,6 +414,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache
 Styles = (CREATE);
 End
 
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
+ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache;
+DosName = "uno_packages";
+Styles = (CREATE);
+End
+
 Directory gid_Brand_Dir_Share_Registry
 ParentID = gid_Brand_Dir_Share;
 DosName = "registry";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-23 Thread Eike Rathke 
 i18npool/source/localedata/data/ast_ES.xml |  150 -
 1 file changed, 106 insertions(+), 44 deletions(-)

New commits:
commit cc2ec946ef4a3d4c4e86cfb17f3a890b2b2ad077
Author: Xuacu Saturio 
Date:   Wed Nov 23 12:57:55 2011 +0100

added Asturian [ast-ES] genitive case month names

diff --git a/i18npool/source/localedata/data/ast_ES.xml 
b/i18npool/source/localedata/data/ast_ES.xml
index 05c6360..1c2b5e5 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -20,7 +20,7 @@
   ,
   ;
   , 
-  , 
+   


 
@@ -200,102 +200,164 @@
   
 
   sun
-  Dom
-  Domingu
+  dom
+  domingu
 
 
   mon
-  Llu
-  Llunes
+  llu
+  llunes
 
 
   tue
-  Mar
-  Martes
+  mar
+  martes
 
 
   wed
-  Mié
-  Miércoles
+  mié
+  miércoles
 
 
   thu
-  Xue
-  Xueves
+  xue
+  xueves
 
 
   fri
-  Vie
-  Vienres
+  vie
+  vienres
 
 
   sat
-  Sáb
-  Sábadu
+  sáb
+  sábadu
 
   
   
 
   jan
-  Xin
-  Xineru
+  xin
+  xineru
 
 
   feb
-  Feb
-  Febreru
+  feb
+  febreru
 
 
   mar
-  Mar
-  Marzu
+  mar
+  marzu
 
 
   apr
-  Abr
-  Abril
+  abr
+  abril
 
 
   may
-  May
-  Mayu
+  may
+  mayu
 
 
   jun
-  Xun
-  Xunu
+  xun
+  xunu
 
 
   jul
-  Xnt
-  Xunetu
+  xnt
+  xunetu
 
 
   aug
-  Ago
-  Agostu
+  ago
+  agostu
 
 
   sep
-  Set
-  Setiembre
+  set
+  setiembre
 
 
   oct
-  Och
-  Ochobre
+  och
+  ochobre
 
 
   nov
-  Pay
-  Payares
+  pay
+  payares
 
 
   dec
-  Avi
-  Avientu
+  avi
+  avientu
 
   
+  
+
+  jan
+  xin
+  de xineru
+
+
+  feb
+  feb
+  de febreru
+
+
+  mar
+  mar
+  de marzu
+
+
+  apr
+  abr
+  d'abril
+
+
+  may
+  may
+  de mayu
+
+
+  jun
+  xun
+  de xunu
+
+
+  jul
+  xnt
+  de xunetu
+
+
+  aug
+  ago
+  d'agostu
+
+
+  sep
+  set
+  de setiembre
+
+
+  oct
+  och
+  d'ochobre
+
+
+  nov
+  pay
+  de payares
+
+
+  dec
+  avi
+  d'avientu
+
+  
   
 
   bc
@@ -332,10 +394,10 @@
 
   Braero
   Falso
-  1er Trimestre
-  2u Trimestre
-  3er Trimestre
-  4u Trimestre
+  1er trimestre
+  2u trimestre
+  3er trimestre
+  4u trimestre
   arriba
   abaxo
   T1
@@ -356,4 +418,4 @@
   
   
 
-
+
\ No newline at end of file
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-23 Thread Eike Rathke 
 i18npool/source/localedata/data/gd_GB.xml |  274 +-
 1 file changed, 194 insertions(+), 80 deletions(-)

New commits:
commit d197a4d99ccdc2e7971363b6c5a7004f714a6238
Author: Michael Bauer 
Date:   Wed Nov 23 12:47:40 2011 +0100

added Gaelic (Scotland) [gd-GB] genitive case month names

diff --git a/i18npool/source/localedata/data/gd_GB.xml 
b/i18npool/source/localedata/data/gd_GB.xml
index 0a1c64a..b08f61e 100644
--- a/i18npool/source/localedata/data/gd_GB.xml
+++ b/i18npool/source/localedata/data/gd_GB.xml
@@ -19,8 +19,8 @@
 :
 .
 ;
-, 
-, 
+ 
+ 
  
  
 
@@ -32,148 +32,200 @@
 
 m
 f
-metric
+Metric
 
 
-
+
 General
+
 
-
+
 0
+
 
-
+
 0.00
+
 
-
+
 #,##0
+
 
-
+
 #,##0.00
+
 
-
+
 #,###.00
-
-
-0.00E+00
-
-
-0.00E+000
-
-
-0%
-
-
-0.00%
-
-
+
+
+ 
+ #,##0_);(#,##0)
+ 
+ 
+ 
+ #,##0.00_);(#,##0.00)
+ 
+ 
+
 [CURRENCY]#,##0;-[CURRENCY]#,##0
+
 
-
+
 [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
+
 
-
+
 [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
+
 
-
+
 [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
+
 
-
-CCC#,##0.00
+
+#,##0.00 CCC
+
 
-
+
 [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
+
+
+
+0%
+
 
-
-D/MM/YY
+
+0.00%
+
 
-
-DD,  
+
+0.00E+000
+
+
+
+0.00E+00
+
 
-
+
 DD/MM/YY
+
+
+
+NN DD/MMM YY
+
+
+
+MM/YY
+
+
+
+DD/MMM
+
+
+
+
+
+
+
+QQ YY
+
 
-
+
 DD/MM/
+
+
+
+DD/MM/YY
+
 
-
-D, MMM YY
+
+DD  
+
 
-
-D, MMM 
+
+D MMM YY
+
 
-
-D, MMM 
+
+D MMM 
+
 
-
-D,  
+
+D  
+
 
-
-D,  YY
+
+NN D MMM YY
+
 
-
-NN, DD/MMM/YY
+
+NN D  
+
 
-
-NN, D, MMM YY
+
+D  
+
 
-
-NN, D,  
+
+D. MMM. 
+
 
-
-D,  
+
+D.  
+
 
-
-MM/DD
+
+MM-DD
+
 
-
+
 YY-MM-DD
 ISO 8601
 
-
+
 -MM-DD
 ISO 8601
 
-
-MM/YY
-
-
-MMM/DD
-
-
-
-
-
-QQ YY
-
-
+
 WW
+
 
-
+
 HH:MM
+
 
-
+
 HH:MM:SS
+
 
-
+
 HH:MM AM/PM
+
 
-
+
 HH:MM:SS AM/PM
+
 
-
+
 [HH]:MM:SS
+
 
-
+
 MM:SS.00
+
 
-
+
 [HH]:MM:SS.00
+
 
-
+
 DD/MM/YY HH:MM
+
 
-
-DD/MM/ HH:MM:SS AM/PM
+
+DD/MM/ HH:MM:SS
+
 
 
 
@@ -295,6 +347,68 @@
 Dùbhlachd
 
 
+
+
+jan
+Faoi
+dhen Fhaoilleach
+
+
+feb
+Gearr
+dhen Ghearran
+
+
+mar
+Màrt
+dhen Mhàrt
+
+
+apr
+Gibl
+dhen Ghiblean
+
+
+may
+Cèit
+dhen Chèitean
+
+
+jun
+Ògmh
+dhen Ògmhios
+
+
+jul
+Iuch
+dhen Iuchar
+
+
+aug
+Lùna
+dhen Lùnastal
+
+
+sep
+Sult
+dhen t-Sultain
+
+
+oct
+Dàmh
+dhen Dàmhair
+
+
+nov
+Samh
+dhen t-Samhain
+
+
+dec
+Dùbh
+dhen Dùbhlachd
+
+
 
 
 bc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-23 Thread Eike Rathke 
 i18npool/source/localedata/data/be_BY.xml |   62 ++
 svl/source/numbers/zformat.cxx|   43 
 2 files changed, 97 insertions(+), 8 deletions(-)

New commits:
commit e9f303624c26d548fa4581ffe87d3ffec3bf6c26
Author: Eike Rathke 
Date:   Wed Nov 23 12:28:11 2011 +0100

use cased month names only if no hard coded literal string follows

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index e4c347b..5ab0175 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2948,37 +2948,64 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 /** If a day of month occurs within the format, the month name is in 
possessive 
 genitive case if the day follows the month, and partitive case if the day 
 precedes the month. If there is no day of month the nominative case (noun) 
-is returned.
+is returned. Also if the month is immediately preceded or followed by a 
+literal string other than space the nominative name is used, this prevents 
+duplicated casing for \t\a and such in documents imported from (e.g. 
+Finnish) Excel or older LibO/OOo releases.
  */
+
+// IDEA: instead of eCodeType pass the index to nTypeArray and restrict 
+// inspection of month name around that one, that would enable different month 
+// cases in one format. Though probably the most rare use case ever..
+
 sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& 
rNumFor, NfKeywordIndex eCodeType ) const
 {
 using namespace ::com::sun::star::i18n;
 if (!io_nState)
 {
-io_nState = 1;
 bool bMonthSeen = false;
+bool bDaySeen = false;
 const ImpSvNumberformatInfo& rInfo = rNumFor.Info();
 const sal_uInt16 nCount = rNumFor.GetCount();
-for ( sal_uInt16 i = 0; i < nCount && io_nState == 1; ++i )
+for (sal_uInt16 i = 0; i < nCount && io_nState == 0; ++i)
 {
-switch ( rInfo.nTypeArray[i] )
+switch (rInfo.nTypeArray[i])
 {
 case NF_KEY_D :
 case NF_KEY_DD :
-io_nState = (bMonthSeen ? 2 : 3);   // and end loop
+if (bMonthSeen)
+io_nState = 2;
+else
+bDaySeen = true;
 break;
 case NF_KEY_MMM:
 case NF_KEY_:
 case NF_KEY_M:
-bMonthSeen = true;
+{
+xub_StrLen nLen;
+if ((i < nCount-1 &&
+rInfo.nTypeArray[i+1] == 
NF_SYMBOLTYPE_STRING &&
+rInfo.sStrArray[i+1].GetChar(0) != ' ') ||
+(i > 0 &&
+ rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING 
&&
+ ((nLen = rInfo.sStrArray[i-1].Len()) > 0) &&
+ rInfo.sStrArray[i-1].GetChar(nLen-1) != ' '))
+io_nState = 1;
+else if (bDaySeen)
+io_nState = 3;
+else
+bMonthSeen = true;
+}
 break;
 }
 }
+if (io_nState == 0)
+io_nState = 1;  // no day of month
 }
 switch (io_nState)
 {
 case 1:
-// no day of month
+// no day of month or forced nominative
 switch (eCodeType)
 {
 case NF_KEY_MMM:
@@ -3017,7 +3044,7 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & 
io_nState, const ImpSvNumFor& r
 ;   // nothing
 }
 }
-OSL_FAIL( "ImpUseMonthCase: should not be reached");
+OSL_FAIL( "ImpUseMonthCase: unhandled keyword index eCodeType");
 return CalendarDisplayCode::LONG_MONTH_NAME;
 }
 
commit 75a49370e6abef09d0e174dc87af33d2a29165be
Author: Yury Tarasievich 
Date:   Wed Nov 23 12:00:58 2011 +0100

added Belarusian [be-BY] genitive case month names

diff --git a/i18npool/source/localedata/data/be_BY.xml 
b/i18npool/source/localedata/data/be_BY.xml
index 70a2ed1..f866f46 100644
--- a/i18npool/source/localedata/data/be_BY.xml
+++ b/i18npool/source/localedata/data/be_BY.xml
@@ -285,6 +285,68 @@
   Снежань
 
   
+  
+
+  jan
+  сту
+  студзеня
+
+
+  feb
+  лют
+  лютага
+
+
+  mar
+  сак
+  сакавіка
+
+
+  apr
+  кра
+  красавіка
+
+
+  may
+  тра
+  траўня
+
+
+  jun
+  чэр
+  чэрвеня
+
+

[Libreoffice-commits] .: autodoc/source rdbmaker/source registry/tools sal/inc sal/osl solenv/gbuild solenv/inc

2011-11-23 Thread Jan Holesovsky 
 autodoc/source/exes/adc_uni/main.cxx|2 +-
 rdbmaker/source/rdbmaker/rdbmaker.cxx   |2 +-
 registry/tools/regmerge.cxx |2 +-
 registry/tools/regview.cxx  |2 +-
 sal/inc/sal/mathconf.h  |8 +++-
 sal/osl/w32/module.cxx  |2 +-
 sal/osl/w32/procimpl.cxx|8 
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 +
 solenv/inc/wntgcci.mk   |5 +
 9 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit 832e6d22935040fe61504c90838415fa55feb24d
Author: Jan Holesovsky 
Date:   Wed Nov 23 11:27:05 2011 +0100

Some trivial fixes for MinGW with -std=c++0x enabled; not finished.

diff --git a/autodoc/source/exes/adc_uni/main.cxx 
b/autodoc/source/exes/adc_uni/main.cxx
index 6e5a11a..c119bb6 100644
--- a/autodoc/source/exes/adc_uni/main.cxx
+++ b/autodoc/source/exes/adc_uni/main.cxx
@@ -37,7 +37,7 @@
 
 int
 #ifdef WNT
-_cdecl
+__cdecl
 #endif
 main( intargc,
   char * argv[] )
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx 
b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index b20043e..fba8469 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -300,7 +300,7 @@ sal_Bool produceAllTypes(const OString& typeName,
 #if (defined UNX)
 int main( int argc, char * argv[] )
 #else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
 #endif
 {
 RdbOptions options;
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 193209b..7b5997d 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -95,7 +95,7 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string 
> & rArgs)
 #if (defined UNX)
 int main( int argc, char * argv[] )
 #else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
 #endif
 {
 Options_Impl options(argv[0]);
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 2cb11b8..57ebcea 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -43,7 +43,7 @@ using namespace registry::tools;
 #if (defined UNX)
 int main( int argc, char * argv[] )
 #else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
 #endif
 {
 RegHandle   hReg;
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index d673f34..1e4b11b 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -37,6 +37,10 @@
 #include 
 #endif /* SOLARIS */
 
+#if defined(__cplusplus) && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || 
__cplusplus >= 201103L )
+#include 
+#endif
+
 #if defined __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -59,7 +63,9 @@ extern "C" {
 
 
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined( WNT)
+#if defined(__cplusplus) && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || 
__cplusplus >= 201103L )
+#define SAL_MATH_FINITE(d) std::isfinite(d)
+#elif defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
 #elif defined IOS
 /* C++ is so nice. This is the only way I could come up with making
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 07f750e..026cf51 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -79,7 +79,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, 
sal_Int32 /*nRtldM
 //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
 if (hInstance == NULL && Module->length > 260)
 {
-std::vector > 
vec(Module->length + 1);
+std::vector vec(Module->length + 1);
 DWORD len = 
GetShortPathNameW(reinterpret_cast(Module->buffer),
   reinterpret_cast(&vec[0]), 
Module->length + 1);
 if (len )
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 7ef6fb6..676c0e8 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -68,11 +68,11 @@ const rtl::OUString 
QUOTE(RTL_CONSTASCII_USTRINGPARAM("\""));
 namespace /* private */
 {
 //#
-typedef std::list > 
string_container_t;
+typedef std::list string_container_t;
 typedef string_container_t::iterator string_container_iterator_t;
 typedef string_container_t::const_iterator 
string_container_const_iterator_t;
 typedef std::pair iterator_pair_t;
-typedef std::vector > 
environment_container_t;
+typedef std::vector environment_container_t;
 
 //#
 /* Function object that compares two strings that are
@@ -312,7 +312,7 @@ namespace /* private */
 rtl::OUString ret(path);
 if (path.getLength() > 260)
 {
-std::vector > 
vec(path.getLength() + 1);
+std::vector vec(path.getLength() + 1);
 //GetShortPathNameW only works if the file can be found!
 const DWORD len

[Libreoffice-commits] .: svx/source

2011-11-23 Thread Stephan Bergmann 
 svx/source/unodraw/unoshape.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6cdbf1cc9bc3fd97acdba981bad04d552dafc627
Author: Stephan Bergmann 
Date:   Wed Nov 23 11:44:55 2011 +0100

No more OSL_FORMAT.

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index b676551..eef6c80 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1720,10 +1720,12 @@ void SAL_CALL SvxShape::_setPropertyValue( const 
OUString& rPropertyName, const
 throw beans::UnknownPropertyException();
 
 if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 )
-throw beans::PropertyVetoException( rtl::OUString::createFromAscii(
-OSL_FORMAT( "Readonly property can't be set: %s",
-rtl::OUStringToOString( rPropertyName, 
RTL_TEXTENCODING_UTF8 ).getStr() ) ),
-uno::Reference< drawing::XShape >( this ) );
+throw beans::PropertyVetoException(
+( rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM(
+"Readonly property can't be set: " ) )
+  + rPropertyName ),
+uno::Reference< drawing::XShape >( this ) );
 
 mpModel->SetChanged();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-23 Thread Caolán McNamara 
 connectivity/source/drivers/ado/Aservices.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da6cd222d3c72b102cead739686fd5ca71a84861
Author: Lionel Elie Mamane 
Date:   Tue Nov 22 14:25:10 2011 +0100

fdo#36555: pImplementationName is not a compile-time constant

Signed-off-by: Caolán McNamara 

diff --git a/connectivity/source/drivers/ado/Aservices.cxx 
b/connectivity/source/drivers/ado/Aservices.cxx
index 68600ba..69bd7c6 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -59,7 +59,7 @@ struct ProviderRequest
 sal_Char const* pImplementationName
 )
 : xServiceManager(reinterpret_cast(pServiceManager))
-, 
sImplementationName(OUString(RTL_CONSTASCII_USTRINGPARAM(pImplementationName)))
+, sImplementationName(OUString::createFromAscii(pImplementationName))
 {
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - svx/source writerfilter/source

2011-11-23 Thread Cédric Bosdonnat 
 svx/source/unodraw/unoshape.cxx|5 -
 writerfilter/source/filter/RtfFilter.cxx   |7 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit e846db644868651556b38f91737b81c43f3c4f3c
Author: Cédric Bosdonnat 
Date:   Wed Nov 23 11:22:28 2011 +0100

RTF: OLE object import with graphic result fixed, the file can now be opened

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2a46fb0..2e31bc7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -597,7 +597,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 m_xContext),
 uno::UNO_QUERY_THROW);
 uno::Reference xGraphic = 
xGraphicProvider->queryGraphic(aMediaProperties);
-
xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap")),
 uno::Any(xGraphic));
+
xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")),
 uno::Any(xGraphic));
 
 RTFValue::Pointer_t pShapeValue(new RTFValue(xShape));
 m_aObjectAttributes->push_back(make_pair(NS_ooxml::LN_shape, 
pShapeValue));
commit a45c82f930c1224928fd0a8f9ca3690ddd162366
Author: Cédric Bosdonnat 
Date:   Tue Nov 22 18:01:32 2011 +0100

Show some exception message when getting one in RtfFilter

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index e3bfaf3..b676551 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1720,7 +1720,10 @@ void SAL_CALL SvxShape::_setPropertyValue( const 
OUString& rPropertyName, const
 throw beans::UnknownPropertyException();
 
 if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 )
-throw beans::PropertyVetoException();
+throw beans::PropertyVetoException( rtl::OUString::createFromAscii(
+OSL_FORMAT( "Readonly property can't be set: %s",
+rtl::OUStringToOString( rPropertyName, 
RTL_TEXTENCODING_UTF8 ).getStr() ) ),
+uno::Reference< drawing::XShape >( this ) );
 
 mpModel->SetChanged();
 
diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index 4b214ab..8786539 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -99,8 +99,13 @@ sal_Bool RtfFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDescri
 #endif
 return sal_True;
 }
-catch (const uno::Exception&)
+catch (const uno::Exception& e)
 {
+#if OSL_DEBUG_LEVEL > 1
+OSL_TRACE( "Exception caught: %s",
+rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 
).getStr() );
+#endif
+(void)e;
 return sal_False;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - binfilter/bf_starmath binfilter/bf_sw

2011-11-23 Thread Caolán McNamara 
 binfilter/bf_starmath/source/starmath_mathml.cxx  |3 ++-
 binfilter/bf_starmath/source/starmath_utility.cxx |3 ++-
 binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx   |   19 ++-
 3 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 8e457595bea4ebccafc71c8ce71bc19696d70c40
Author: Caolán McNamara 
Date:   Tue Nov 22 23:40:45 2011 +

use stripStart

diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx 
b/binfilter/bf_starmath/source/starmath_mathml.cxx
index e81a8f2..dd64eb9 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -76,6 +76,7 @@ one go*/
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -630,7 +631,7 @@ void SmXMLImport::endDocument(void)
 //Make up some editable text
 aText = pDocShell->GetText();
 pTree->CreateTextFromNode(aText);
-aText.EraseTrailingChars();
+aText = comphelper::string::stripEnd(aText, ' ');
 if((aText.GetChar(0) == '{') &&
 (aText.GetChar(aText.Len()-1) == '}'))
 {
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx 
b/binfilter/bf_starmath/source/starmath_utility.cxx
index 735b22a..68aa269 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include 
 #include 
 #include 
 
@@ -217,7 +218,7 @@ int GetTextEncodingTabIndex( const String &rTxt, xub_StrLen 
nPos )
 /*N*/ // in old 2.0 or 3.0 formulas the strings to be imported do have an
 /*N*/ // additional '\0' character at the end that gets removed here.
 /*N*/ if (aString.Len())
-/*N*/ aString.EraseTrailingChars( '\0' );
+/*N*/ aString = comphelper::string::stripEnd(aString, '\0');
 /*N*/
 /*N*/   aString.ConvertLineEnd();
 /*N*/ return aString;
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx 
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index dcb93f6..99b2e9d 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -3366,7 +3366,7 @@ void Sw6Layout::AddXForm(sal_Char cLead, ByteString 
&rTmp, String &rStr)
 // Kurzform, wird oefter benoetigt
 {
 rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
 rTmp.Insert((sal_Char)rTmp.Len(),0);
 rTmp.Insert(cLead,0);
 AddHForm(rTmp.GetBuffer(),rStr.Len(),rTmp.Len(),1);
@@ -3498,7 +3498,7 @@ size_t Sw6Layout::PutRest(String &rStr,sal_Char *pCtrl)
 rtl::OStringToOUString(aTmp, RTL_TEXTENCODING_IBM_850),
 osl_getThreadTextEncoding());
 aTmp = comphelper::string::stripStart(aTmp, ' ');
-aTmp.EraseTrailingChars();
+aTmp = comphelper::string::stripEnd(aTmp, ' ');
 aTmp.Insert('}');// Mache versteckten Text
 aTmp.Insert('{',0);
 AddXForm('-',aTmp,rStr);
@@ -5320,7 +5320,7 @@ BOOL SwSw6Parser::ReadDocInfo(void)
 if (ReadLn(rTmp))
 {
 rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
 }
 else
 break;
@@ -5331,7 +5331,7 @@ BOOL SwSw6Parser::ReadDocInfo(void)
 if (ReadLn(rTmp))
 {
 rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
 }
 else
 break;
commit 1318e3ab271d62a2dc1ff2691b836c3b6da9a2de
Author: Caolán McNamara 
Date:   Tue Nov 22 17:18:15 2011 +

use stripStart

diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx 
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 73b6671..dcb93f6 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 #include 
@@ -3361,10 +3362,10 @@ BOOL Sw6Layout::TextBefehl(const sal_Char *pPatt,const 
sal_Char *pOrig)
 return !*pPatt && (!cLen || *pOrig<'A' || *pOrig>'Z');
 }
 
-void Sw6Layout::AddXForm(sal_Char cLead,ByteString &rTmp,String &rStr)
+void Sw6Layout::AddXForm(sal_Char cLead, ByteString &rTmp, String &rStr)
 // Kurzform, wird oefter benoetigt
 {
-rTmp.EraseLeadingChars();
+rTmp = comphelper::string::stripStart(rTmp, ' ');
 rTmp.EraseTrailingChars();
 rTmp.Insert((sal_Char)rTmp.Len(),0);
 rTmp.Insert(cLead,0);
@@ -3496,7 +3497,7 @@ size_t Sw6Layout::PutRest(String &rStr,sal_Char *pCtrl)

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

2011-11-23 Thread Markus Mohrhard 
 sc/source/ui/inc/namedlg.hrc  |1 
 sc/source/ui/inc/namedlg.hxx  |3 ++
 sc/source/ui/namedlg/namedlg.cxx  |   53 +++---
 sc/source/ui/namedlg/namepast.cxx |6 
 sc/source/ui/src/namedlg.src  |4 ++
 5 files changed, 64 insertions(+), 3 deletions(-)

New commits:
commit a22ce3e4483f6fe462eaba8826a91355957e3676
Author: Markus Mohrhard 
Date:   Wed Nov 23 09:00:19 2011 +0100

ManageNames: only update the range names if we really changed data

diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index fc2fc0f..c6f4f4a 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -96,6 +96,7 @@ private:
 Selection   maCurSel;
 
 bool mbNeedUpdate;
+bool mbDataChanged;
 
 typedef boost::ptr_map RangeNameContainer;
 
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index d21355c..c273894 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -111,7 +111,8 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, 
Window* pParent,
 mpViewData   ( ptrViewData ),
 mpDoc( ptrViewData->GetDocument() ),
 maCursorPos  ( aCursorPos ),
-mbNeedUpdate ( true )
+mbNeedUpdate ( true ),
+mbDataChanged( false )
 {
 Init();
 FreeResource();
@@ -213,8 +214,11 @@ void ScNameDlg::SetReference( const ScRange& rRef, 
ScDocument* pDocP )
 
 sal_Bool ScNameDlg::Close()
 {
-ScDocFunc aFunc(*mpViewData->GetDocShell());
-aFunc.ModifyAllRangeNames(maRangeMap);
+if (mbDataChanged)
+{
+ScDocFunc aFunc(*mpViewData->GetDocShell());
+aFunc.ModifyAllRangeNames(maRangeMap);
+}
 return DoClose( ScNameDlgWrapper::GetChildWindowId() );
 }
 
@@ -376,6 +380,8 @@ void ScNameDlg::RemovePushed()
 // be safe and check for possible problems
 if (pData)
 pRangeName->erase(*pData);
+
+mbDataChanged = true;
 }
 CheckForEmptyTable();
 }
@@ -430,6 +436,7 @@ void ScNameDlg::NameModified()
 aLine.aScope = aNewScope;
 mpRangeManagerTable->addEntry(aLine);
 mbNeedUpdate = true;
+mbDataChanged = true;
 }
 }
 
commit 68c591429fd0fc6189d53d4f718fb3edf9038dfb
Author: Markus Mohrhard 
Date:   Wed Nov 23 08:49:37 2011 +0100

ManageNames: set correct text for multiselection

diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index db5c08c..37212c6 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -56,5 +56,6 @@
 #define STR_ERR_NAME_EXISTS 73
 #define STR_ERR_NAME_INVALID 74
 #define STR_DEFAULT_INFO75
+#define STR_MULTI_SELECT76
 
 #define FT_INFO 72
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index ed72e65..fc2fc0f 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -88,6 +88,7 @@ private:
 const rtl::OUString maErrInvalidNameStr;
 const rtl::OUString maErrNameInUse;
 const rtl::OUString maStrInfoDefault;
+const rtl::OUString maStrMultiSelect;
 
 ScViewData* mpViewData;
 ScDocument* mpDoc;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index f0c3b3f..d21355c 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -106,6 +106,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, 
Window* pParent,
 maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))),
 maErrNameInUse   ( ResId::toString(ScResId(STR_ERR_NAME_EXISTS))),
 maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
+maStrMultiSelect ( ResId::toString(ScResId(STR_MULTI_SELECT))),
 //
 mpViewData   ( ptrViewData ),
 mpDoc( ptrViewData->GetDocument() ),
@@ -444,6 +445,9 @@ void ScNameDlg::SelectionChanged()
 
 if (mpRangeManagerTable->IsMultiSelection())
 {
+maEdName.SetText(maStrMultiSelect);
+maEdAssign.SetText(maStrMultiSelect);
+
 maEdName.Disable();
 maEdAssign.Disable();
 maLbScope.Disable();
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 71225ca..66977f7 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -212,4 +212,8 @@ ModelessDialog RID_SCDLG_NAMES
 {
 Text [en-US] = "Select cells in the document to update the range.";
 };
+String STR_MULTI_SELECT
+{
+Text [en-US] = "(multiple)";
+};
 };
commit 6a56210854bc6600f559589531617fb65e250870
Author: Markus Mohrhard 
Date:   Wed Nov 23 08:22:02 2011 +0100

ManageNames: disable some elements if table is empty

diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 6a9523f..ed72e65 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -109,6 +109,7 @@ private:
 
 bool IsNameValid();
 bool IsFormulaV