[Libreoffice-commits] core.git: setup_native/source

[Andras Timar]

 setup_native/source/packinfo/spellchecker_selection.txt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09fa9ff842544f68f874e5b505b3e797c3767156
Author: Andras Timar 
Date:   Mon Mar 11 08:46:04 2013 +0100

fdo#62103 only dict of the first lang code is packed into langpack

Therefore we packed Aragonese dictionary into Spanish and Catalan
langpacks, instead of Spanish and Catalan dictionaries.

Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f

diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 0876bc0..6593a64 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -33,7 +33,7 @@ bg = "bg"
 bn = "bn"
 br = "br,fr"
 bs = "bs"
-ca = "an,ca,es,fr,it,oc"
+ca = "ca,an,es,fr,it,oc"
 cs = "cs"
 da = "da,de"
 de = "de,fr,it"
@@ -41,7 +41,7 @@ el = "el"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 en-ZA = "en,es,fr"
-es = "an,ca,es,fr,gl,oc,pt-PT"
+es = "es,an,ca,fr,gl,oc,pt-PT"
 et = "et"
 fr = "fr,es"
 gd = "gd"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - writerperfect/source

[Laurent Alonso]

 writerperfect/source/filter/ListStyle.cxx|8 +
 writerperfect/source/filter/OdtGenerator.cxx |  110 +++
 writerperfect/source/filter/TableStyle.cxx   |6 +
 writerperfect/source/filter/TextRunStyle.cxx |8 +
 4 files changed, 115 insertions(+), 17 deletions(-)

New commits:
commit 6874c25f98dcfe5116d96a1282c4231c3f2d623a
Author: Laurent Alonso 
Date:   Mon Mar 11 08:33:17 2013 +0100

Improve lists generation

Change-Id: Ie910ecb8db1d33c41f450e6c9f297138aa821eee

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index 92ec8cc..ba14e92 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -61,6 +61,8 @@ struct _WriterListState
 bool mbListContinueNumbering;
 bool mbListElementParagraphOpened;
 std::stack mbListElementOpened;
+// a map id -> last list style defined with such id
+std::map mIdListStyleMap;
 };
 
 enum WriterListType { unordered, ordered };
@@ -85,7 +87,8 @@ _WriterListState::_WriterListState() :
 miLastListNumber(0),
 mbListContinueNumbering(false),
 mbListElementParagraphOpened(false),
-mbListElementOpened()
+mbListElementOpened(),
+mIdListStyleMap()
 {
 }
 
@@ -102,6 +105,14 @@ public:
 void _openListLevel(TagOpenElement *pListLevelOpenElement);
 void _closeListLevel();
 
+/** stores a list style: update mListStyles,
+mWriterListStates.top().mpCurrentListStyle and the different
+maps
+ */
+void _storeListStyle(ListStyle *listStyle);
+/** retrieves the list style corresponding to a given id. */
+void _retrieveListStyle(int id);
+
 OdfEmbeddedObject _findEmbeddedObjectHandler(const WPXString &mimeType);
 OdfEmbeddedImage _findEmbeddedImageHandler(const WPXString &mimeType);
 
@@ -154,6 +165,8 @@ public:
 
 // list styles
 std::vector mListStyles;
+// a map id -> last list style defined with id
+std::map mIdListStyleMap;
 
 // object state
 unsigned miObjectNumber;
@@ -182,6 +195,7 @@ OdtGeneratorPrivate::OdtGeneratorPrivate(OdfDocumentHandler 
*pHandler, const Odf
 mpCurrentPageSpan(0),
 miNumPageStyles(0),
 mListStyles(),
+mIdListStyleMap(),
 miObjectNumber(0),
 mpCurrentTableStyle(0),
 mxStreamType(streamType),
@@ -634,6 +648,47 @@ void OdtGenerator::closeSpan()
 mpImpl->mpCurrentContentElements->push_back(new 
TagCloseElement("text:span"));
 }
 
+void OdtGeneratorPrivate::_storeListStyle(ListStyle *listStyle)
+{
+if (!listStyle || listStyle == mWriterListStates.top().mpCurrentListStyle)
+{
+return;
+}
+mListStyles.push_back(listStyle);
+mWriterListStates.top().mpCurrentListStyle = listStyle;
+mWriterListStates.top().mIdListStyleMap[listStyle->getListID()]=listStyle;
+mIdListStyleMap[listStyle->getListID()]=listStyle;
+}
+
+void OdtGeneratorPrivate::_retrieveListStyle(int id)
+{
+// first look if the current style is ok
+if (mWriterListStates.top().mpCurrentListStyle &&
+id == mWriterListStates.top().mpCurrentListStyle->getListID())
+{
+return;
+}
+
+// use the current map
+if (mWriterListStates.top().mIdListStyleMap.find(id) !=
+mWriterListStates.top().mIdListStyleMap.end())
+{
+mWriterListStates.top().mpCurrentListStyle =
+mWriterListStates.top().mIdListStyleMap.find(id)->second;
+return;
+}
+
+// use the global map
+if (mIdListStyleMap.find(id) != mIdListStyleMap.end())
+{
+mWriterListStates.top().mpCurrentListStyle =
+mIdListStyleMap.find(id)->second;
+return;
+}
+
+WRITER_DEBUG_MSG(("impossible to find a list with id=%d\n",id));
+}
+
 void OdtGenerator::defineOrderedListLevel(const WPXPropertyList &propList)
 {
 int id = 0;
@@ -644,11 +699,12 @@ void OdtGenerator::defineOrderedListLevel(const 
WPXPropertyList &propList)
 if (mpImpl->mWriterListStates.top().mpCurrentListStyle && 
mpImpl->mWriterListStates.top().mpCurrentListStyle->getListID() == id)
 pListStyle = mpImpl->mWriterListStates.top().mpCurrentListStyle;
 
-// this rather appalling conditional makes sure we only start a new list 
(rather than continue an old
-// one) if: (1) we have no prior list OR (2) the prior list is actually 
definitively different
-// from the list that is just being defined (listIDs differ) OR (3) we can 
tell that the user actually
-// is starting a new list at level 1 (and only level 1)
-if (pListStyle == 0 || pListStyle->getListID() != id  ||
+// this rather appalling conditional makes sure we only start a
+// new list (rather than continue an old one) if: (1) we have no
+// prior list or the prior list has another listId OR (2) we can
+// tell that the user actually is starting a new list at level 1
+// (and only level 1)
+if (pListStyle == 0 ||
 (

[Libreoffice-commits] core.git: editeng/inc editeng/source svx/inc svx/source

[Armin Le Grand]

 editeng/inc/editeng/editview.hxx   |3 
 editeng/inc/editeng/outliner.hxx   |2 
 editeng/source/editeng/editview.cxx|4 
 editeng/source/editeng/impedit.cxx |   45 ---
 editeng/source/editeng/impedit.hxx |6 
 editeng/source/editeng/impedit3.cxx|   48 ---
 editeng/source/editeng/impedit4.cxx|2 
 editeng/source/outliner/outlvw.cxx |4 
 svx/inc/svx/sdr/overlay/overlaymanager.hxx |   10 -
 svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx |8 -
 svx/inc/svx/sdrpaintwindow.hxx |   15 --
 svx/inc/svx/svdedxv.hxx|7 -
 svx/inc/svx/svdpagv.hxx|2 
 svx/inc/svx/svdpntv.hxx|5 
 svx/source/sdr/overlay/overlaymanager.cxx  |   34 -
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx  |6 
 svx/source/svdraw/sdrpaintwindow.cxx   |   28 +---
 svx/source/svdraw/svdedxv.cxx  |  129 -
 svx/source/svdraw/svdpagv.cxx  |   15 --
 svx/source/svdraw/svdpntv.cxx  |   51 +---
 20 files changed, 175 insertions(+), 249 deletions(-)

New commits:
commit 3137258e346a9c16b2e61747fd926a1e7d358d02
Author: Armin Le Grand 
Date:   Thu May 3 10:59:32 2012 +

Resolves: #i118905# Changed EditEngine to be able to paint to overlay 
directly

i.e. paint to VirtualDevice as well, not only to Window.
Removed the no longer needed switch between buffered and unbuffered overlay,
this removes the flickering white block.

(cherry picked from commit 5ab32faf2426fa60f975d0b544cfd671cdc7983b)

Conflicts:
editeng/inc/editeng/outliner.hxx
editeng/source/editeng/impedit.hxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
svx/inc/svx/sdr/overlay/overlaymanager.hxx
svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
svx/inc/svx/sdrpaintwindow.hxx
svx/inc/svx/svdpagv.hxx
svx/source/sdr/overlay/overlaymanager.cxx
svx/source/svdraw/sdrpaintwindow.cxx
svx/source/svdraw/svdedxv.cxx
svx/source/svdraw/svdpagv.cxx

Change-Id: Ibf4fcba77b120187fbae2454d136d2acd74be119

diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index aea70fd..9a2fa85 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -49,6 +49,7 @@ class SvKeyValueIterator;
 class SfxStyleSheet;
 class Font;
 class FontList;
+class OutputDevice;
 
 #include 
 #include 
@@ -88,7 +89,7 @@ public:
 voidSetWindow( Window* pWin );
 Window* GetWindow() const;
 
-voidPaint( const Rectangle& rRect );
+voidPaint( const Rectangle& rRect, OutputDevice* pTargetDevice 
= 0 );
 voidInvalidate();
 PairScroll( long nHorzScroll, long nVertScroll, sal_uInt8 
nRangeCheck = RGCHK_NEG );
 
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 70531b0..1bb0296 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -240,7 +240,7 @@ public:
 
 voidScroll( long nHorzScroll, long nVertScroll );
 
-voidPaint( const Rectangle& rRect );
+voidPaint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 
);
 sal_BoolPostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = 
NULL );
 sal_BoolMouseButtonDown( const MouseEvent& );
 sal_BoolMouseButtonUp( const MouseEvent& );
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 14b24f4..283b30a 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -290,11 +290,11 @@ sal_uInt16 EditView::GetSelectedScriptType() const
 return PIMPE->GetScriptType( pImpEditView->GetEditSelection() );
 }
 
-void EditView::Paint( const Rectangle& rRect )
+void EditView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
 {
 DBG_CHKTHIS( EditView, 0 );
 DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-PIMPEE->Paint( pImpEditView, rRect );
+PIMPEE->Paint( pImpEditView, rRect, pTargetDevice );
 }
 
 void EditView::SetEditEngine( EditEngine* pEditEng )
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index c97aec1..bc7e5e6 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -126,7 +126,7 @@ void ImpEditView::SetEditSelection( const EditSelection& 
rEditSelection )
 }
 
 
-void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
+void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, 
OutputDevice* pTargetDevice )
 {
 if ( GetSelectionMode() == EE_

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5a/b32faf2426fa60f975d0b544cfd671cdc7983b

[Caolán McNamara]

 5a/b32faf2426fa60f975d0b544cfd671cdc7983b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4cfb0995c9ddf1072491a1c5d577700914ce0bb8
Author: Caolán McNamara 
Date:   Mon Mar 11 07:51:23 2013 +

Notes added by 'git notes add'

diff --git a/5a/b32faf2426fa60f975d0b544cfd671cdc7983b 
b/5a/b32faf2426fa60f975d0b544cfd671cdc7983b
new file mode 100644
index 000..4fedad7
--- /dev/null
+++ b/5a/b32faf2426fa60f975d0b544cfd671cdc7983b
@@ -0,0 +1 @@
+merged as: 3137258e346a9c16b2e61747fd926a1e7d358d02
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - extras/source sw/uiconfig vcl/source

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml |3 
 sw/uiconfig/swriter/ui/converttexttable.ui  |   23 +++---
 sw/uiconfig/swriter/ui/indexentry.ui|  103 +---
 sw/uiconfig/swriter/ui/insertfootnote.ui|9 +-
 sw/uiconfig/swriter/ui/tableproperties.ui   |4 -
 vcl/source/control/combobox.cxx |2 
 vcl/source/control/field2.cxx   |4 -
 7 files changed, 77 insertions(+), 71 deletions(-)

New commits:
commit ab8f432b3382967f87967495b0b0e4c17f082da5
Author: Caolán McNamara 
Date:   Sat Mar 9 23:31:46 2013 +

use approximate_char_width instead of GetTextWidth('X')

Change-Id: I4c25b07c1c5d80b70b801fd61b711a00d5194c04

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index e561768..1c99ac2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1131,7 +1131,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 
nLines ) const
 
 // width
 if ( nColumns )
-aSz.Width() = nColumns * 
GetTextWidth(rtl::OUString(static_cast('X')));
+aSz.Width() = nColumns * approximate_char_width();
 else
 aSz.Width() = aMinSz.Width();
 
commit 6f780d35330ac59cfd8fac5a48a3eeaa60e03a0a
Author: Caolán McNamara 
Date:   Sat Mar 9 23:14:58 2013 +

various efforts to consistently apply HIG rules

Change-Id: I780c83e28a6a2318ae5892e603aa8e5126deb926

diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui 
b/sw/uiconfig/swriter/ui/converttexttable.ui
index 8426f7c..f4bca7d 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -10,13 +10,13 @@
   
   
 False
-5
+6
 Convert Table to Text
 dialog
 
   
 False
-2
+12
 
   
 False
@@ -78,6 +78,7 @@
 True
 False
 vertical
+12
 
   
 True
@@ -90,6 +91,7 @@
 False
 start
 start
+6
 12
 
   
@@ -97,9 +99,8 @@
 False
 start
 start
-10
-18
-10
+12
+12
 
   
 True
@@ -249,13 +250,14 @@
   
 True
 False
+6
 12
 
   
 True
 False
-5
-5
+6
+12
 
   
 Heading
@@ -278,7 +280,7 @@
 True
 True
 False
-25
+12
 0
 True
 True
@@ -328,7 +330,8 @@
 True
 False
 start
-50
+24
+12
 
   
 True
@@ -401,7 +404,7 @@
   
 
 
-  
+  
 True
 False
 Options
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui 
b/sw/uiconfig/swriter/ui/indexentry.ui
index 69a91e2..37e4e0b 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -8,22 +8,6 @@
 1
 10
   
-  
-True
-False
-start
-gtk-index
-  
-  
-True
-False
-gtk-go-back
-  
-  
-True
-False
-gtk-go-forward
-  
   
 True
 False
@@ -36,13 +20,13 @@
   
   
 False
-5
+6
 Insert Index Entry
 dialog
 
   
 False
-2
+12
 
   
 False
@@ -51,13 +35,11 @@
 
   
 Insert
-False
 True
 True
 True
 True
 True
-False
   
   
 False
@@ -68,13 +50,11 @@
 
   
 gtk-ok
-False
 True
 True
 True
 True
 True
-False
 True
   
   
@@ -86,11 +66,9 @@
 
 

[PATCH libreoffice-4-0] fdo#62103 only dict of the first lang code is packed into la...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2656

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/2656/1

fdo#62103 only dict of the first lang code is packed into langpack

Therefore we packed Aragonese dictionary into Spanish and Catalan
langpacks, instead of Spanish and Catalan dictionaries.

Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
---
M setup_native/source/packinfo/spellchecker_selection.txt
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 0876bc0..6593a64 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -33,7 +33,7 @@
 bn = "bn"
 br = "br,fr"
 bs = "bs"
-ca = "an,ca,es,fr,it,oc"
+ca = "ca,an,es,fr,it,oc"
 cs = "cs"
 da = "da,de"
 de = "de,fr,it"
@@ -41,7 +41,7 @@
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 en-ZA = "en,es,fr"
-es = "an,ca,es,fr,gl,oc,pt-PT"
+es = "es,an,ca,fr,gl,oc,pt-PT"
 et = "et"
 fr = "fr,es"
 gd = "gd"

-- 
To view, visit https://gerrit.libreoffice.org/2656
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerperfect/source

[Laurent Alonso]

 writerperfect/source/filter/ListStyle.cxx|8 
 writerperfect/source/filter/OdtGenerator.cxx |   14 --
 writerperfect/source/filter/TableStyle.cxx   |6 +-
 writerperfect/source/filter/TextRunStyle.cxx |8 
 4 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit b6a761a124c36ca97187c95526e7c1a1979454b5
Author: Laurent Alonso 
Date:   Mon Mar 11 08:29:17 2013 +0100

Support some new parameters

Change-Id: I22857f57822bff39ef5fcd576bd29e374f1aa819
(cherry picked from commit d242c4a441964837e6a68343dfef9eb530fb41f7)

Signed-off-by: Fridrich Å trba 

diff --git a/writerperfect/source/filter/ListStyle.cxx 
b/writerperfect/source/filter/ListStyle.cxx
index e1e5144..cf5900a 100644
--- a/writerperfect/source/filter/ListStyle.cxx
+++ b/writerperfect/source/filter/ListStyle.cxx
@@ -55,6 +55,8 @@ void OrderedListLevelStyle::write(OdfDocumentHandler 
*pHandler, int iLevel) cons
 else
 listLevelStyleOpen.addAttribute("text:start-value", "1");
 }
+if (mPropList["text:display-levels"])
+listLevelStyleOpen.addAttribute("text:display-levels", 
mPropList["text:display-levels"]->getStr());
 listLevelStyleOpen.write(pHandler);
 
 TagOpenElement stylePropertiesOpen("style:list-level-properties");
@@ -64,6 +66,8 @@ void OrderedListLevelStyle::write(OdfDocumentHandler 
*pHandler, int iLevel) cons
 stylePropertiesOpen.addAttribute("text:min-label-width", 
mPropList["text:min-label-width"]->getStr());
 if (mPropList["text:min-label-distance"] && 
mPropList["text:min-label-distance"]->getDouble() > 0.0)
 stylePropertiesOpen.addAttribute("text:min-label-distance", 
mPropList["text:min-label-distance"]->getStr());
+if (mPropList["fo:text-align"])
+stylePropertiesOpen.addAttribute("fo:text-align", 
mPropList["fo:text-align"]->getStr());
 stylePropertiesOpen.write(pHandler);
 
 pHandler->endElement("style:list-level-properties");
@@ -103,6 +107,8 @@ void UnorderedListLevelStyle::write(OdfDocumentHandler 
*pHandler, int iLevel) co
 }
 else
 listLevelStyleOpen.addAttribute("text:bullet-char", ".");
+if (mPropList["text:display-levels"])
+listLevelStyleOpen.addAttribute("text:display-levels", 
mPropList["text:display-levels"]->getStr());
 listLevelStyleOpen.write(pHandler);
 
 TagOpenElement stylePropertiesOpen("style:list-level-properties");
@@ -112,6 +118,8 @@ void UnorderedListLevelStyle::write(OdfDocumentHandler 
*pHandler, int iLevel) co
 stylePropertiesOpen.addAttribute("text:min-label-width", 
mPropList["text:min-label-width"]->getStr());
 if (mPropList["text:min-label-distance"] && 
mPropList["text:min-label-distance"]->getDouble() > 0.0)
 stylePropertiesOpen.addAttribute("text:min-label-distance", 
mPropList["text:min-label-distance"]->getStr());
+if (mPropList["fo:text-align"])
+stylePropertiesOpen.addAttribute("fo:text-align", 
mPropList["fo:text-align"]->getStr());
 stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol");
 stylePropertiesOpen.write(pHandler);
 
diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index fc4ccbb..9ee2f67 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1196,12 +1196,22 @@ void OdtGenerator::openFrame(const WPXPropertyList 
&propList)
 frameAutomaticStylePropertiesElement->addAttribute("fo:max-height", 
propList["fo:max-height"]->getStr());
 
 // check if the frame has border, background attributes
-if (propList["fo:border"])
-frameAutomaticStylePropertiesElement->addAttribute("fo:border", 
propList["fo:border"]->getStr());
+static char const *(bordersString[])=
+
{"fo:border","fo:border-top","fo:border-left","fo:border-bottom","fo:border-right"};
+for (int b = 0; b < 5; b++)
+{
+if (propList[bordersString[b]])
+
frameAutomaticStylePropertiesElement->addAttribute(bordersString[b], 
propList[bordersString[b]]->getStr());
+}
 if (propList["style:border-line-width"])
 
frameAutomaticStylePropertiesElement->addAttribute("style:border-line-width", 
propList["style:border-line-width"]->getStr());
 if (propList["fo:background-color"])
 
frameAutomaticStylePropertiesElement->addAttribute("fo:background-color", 
propList["fo:background-color"]->getStr());
+if (propList["style:background-transparency"])
+
frameAutomaticStylePropertiesElement->addAttribute("style:background-transparency",
 propList["style:background-transparency"]->getStr());
+
+if (propList["fo:clip"])
+frameAutomaticStylePropertiesElement->addAttribute("fo:clip", 
propList["fo:clip"]->getStr());
 
 frameAutomaticStylePropertiesElement->addAttribute("draw:ole-draw-aspect", 
"1");
 
diff --git a/writerperfect/source/filter/TableStyle.cxx 
b/writerperfect/source/

[PATCH libreoffice-3-6] fdo#62103 only dict of the first lang code is packed into la...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2657

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/2657/1

fdo#62103 only dict of the first lang code is packed into langpack

Therefore we packed Aragonese dictionary into Spanish and Catalan
langpacks, instead of Spanish and Catalan dictionaries.

Conflicts:
setup_native/source/packinfo/spellchecker_selection.txt

Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
---
M setup_native/source/packinfo/spellchecker_selection.txt
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index f80e5d5..4844129 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -14,7 +14,7 @@
 bg = "bg"
 bn = "bn"
 br = "br,fr"
-ca = "ca,es,fr"
+ca = "ca,an,es,fr,it,oc"
 cs = "cs"
 da = "da,de"
 de = "de,fr,it"
@@ -22,7 +22,7 @@
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 en-ZA = "en,es,fr"
-es = "an,es,fr,pt-PT"
+es = "es,an,ca,fr,gl,oc,pt-PT"
 et = "et"
 fr = "fr,es"
 gd = "gd"

-- 
To view, visit https://gerrit.libreoffice.org/2657
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: scalc UNO api compilation question about header files

[Stephan Bergmann]

On 03/09/2013 04:17 AM, Neeraj Rai wrote:

One last question - can I generate the system UNO types once per box,
may be after SDK installation?


Not sure what exactly you mean with that question.  Sure it is possible 
to generate them once (per given LO version, at least) and re-use them. 
 But there is no mechanism to automate that for you (apart from the 
SDK's stdtarget.mk), if that was your question.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] build concat-deps as ordinary executable

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2659

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/2659/1

build concat-deps as ordinary executable

Change-Id: I6404472040f38c14ec7ca4a2c51be0d2f7f8199a
---
M Repository.mk
D solenv/CustomTarget_concat-deps.mk
A solenv/Executable_concat-deps.mk
M solenv/Module_solenv.mk
D solenv/Package_concat-deps.mk
M solenv/bin/concat-deps.c
6 files changed, 22 insertions(+), 44 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 95a69db..77fe0e1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -33,6 +33,7 @@
 bmp \
 bmpsum \
 cfgex \
+   concat-deps \
 cpp \
 cppunit/cppunittester \
 $(call gb_Helper_optional,CRASHREP,crashrep) \
diff --git a/solenv/CustomTarget_concat-deps.mk 
b/solenv/CustomTarget_concat-deps.mk
deleted file mode 100644
index 6e8d56a..000
--- a/solenv/CustomTarget_concat-deps.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,solenv/concat-deps))
-
-$(eval $(call gb_CustomTarget_register_targets,solenv/concat-deps,\
-   concat-deps$(gb_Executable_EXT_for_build) \
-))
-
-$(call 
gb_CustomTarget_get_workdir,solenv/concat-deps)/concat-deps$(gb_Executable_EXT_for_build)
 : \
-   $(SRCDIR)/solenv/bin/concat-deps.c
-   $(call gb_Output_announce,solenv/concat-deps,$(true),C,1)
-ifeq ($(COM_FOR_BUILD),MSC)
-   LIB="$(ILIB)" $(CC_FOR_BUILD) -nologo $(SOLARINC) -O2 $< -Fo$(dir $@) 
-Fe$(dir $@)
-else
-   $(CC_FOR_BUILD) -O2 $< -o $@
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/Executable_concat-deps.mk b/solenv/Executable_concat-deps.mk
new file mode 100644
index 000..a69b757
--- /dev/null
+++ b/solenv/Executable_concat-deps.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,concat-deps))
+
+$(eval $(call gb_Executable_add_cobjects,concat-deps,\
+   solenv/bin/concat-deps, $(gb_COMPILEROPTFLAGS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 538b4e8..c34dc46 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -34,8 +34,7 @@
 
 ifeq ($(CROSS_COMPILING),$(false))
 $(eval $(call gb_Module_add_targets,solenv,\
-   CustomTarget_concat-deps \
-   Package_concat-deps \
+   Executable_concat-deps \
 ))
 endif
 
diff --git a/solenv/Package_concat-deps.mk b/solenv/Package_concat-deps.mk
deleted file mode 100644
index 9ede386..000
--- a/solenv/Package_concat-deps.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,solenv_concat-deps,$(call 
gb_CustomTarget_get_workdir,solenv/concat-deps)))
-
-$(eval $(call 
gb_Package_add_file,solenv_concat-deps,bin/concat-deps$(gb_Executable_EXT_for_build),concat-deps$(gb_Executable_EXT_for_build)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 5550897..575ad78 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -209,7 +209,7 @@
  * this is a simplified implementation that
  * is _not_ thread safe.
  */
-struct pool* pool_create(int size_elem, int flags, int primary, int secondary)
+struct pool* pool_create(int size_elem, int primary, int secondary)
 {
 struct pool* pool;
 
@@ -482,7 +482,7 @@
 if(hash)
 {
 hash->elems_pool = pool_create(sizeof(struct hash_elem),
-   0, size, size << 1);
+   size, size << 1);
 if(!hash->elems_pool)
 {
 hash_destroy(hash);
@@ -499,7 +499,7 @@
 struct hash_elem* hash_elem;
 struct hash_elem* next;
 struct hash_elem** array;
-int i;
+unsigned int i;
 
 hash->size = (old_size << 1) + 1;
 /* we really should avoid to get there... so print a message to alert of 
the condition */
@@ -556,6 +556,7 @@
 struct hash_elem* hash_elem;
 int cost = 0;
 
+(void) cost;
 hashed = hash_compute(hash, key, key_len);
 #ifdef HASH_STAT
 hash-

REMINDER: Release 4.0.2.1 from libreoffice-4-0 branch

[Petr Mladek]

Hi,

please note that the commit deadline for 4.0.2.1, aka rc1, is on today,
March 11, 2013.

The tag and branch libreoffice-4-0-2 is going to be created tomorrow.
Only commits with 3 reviewers will be allowed for that branch.

See also
http://wiki.documentfoundation.org/ReleasePlan#4.0_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches


Best Regards,
Petr

PS: Please, help with reviewing pending commits.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 3 commits - writerperfect/source

[Laurent Alonso]

 writerperfect/source/filter/ListStyle.cxx|   29 ++---
 writerperfect/source/filter/ListStyle.hxx|   15 --
 writerperfect/source/filter/OdgGenerator.cxx |8 +
 writerperfect/source/filter/OdtGenerator.cxx |  142 ---
 4 files changed, 129 insertions(+), 65 deletions(-)

New commits:
commit 37d536b26710c7518d6d4358a395d73e11e773f4
Author: Laurent Alonso 
Date:   Mon Mar 11 08:33:17 2013 +0100

Improve lists generation

Change-Id: Ie910ecb8db1d33c41f450e6c9f297138aa821eee
(cherry picked from commit 6874c25f98dcfe5116d96a1282c4231c3f2d623a)

Signed-off-by: Fridrich Å trba 

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index 92ec8cc..ba14e92 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -61,6 +61,8 @@ struct _WriterListState
 bool mbListContinueNumbering;
 bool mbListElementParagraphOpened;
 std::stack mbListElementOpened;
+// a map id -> last list style defined with such id
+std::map mIdListStyleMap;
 };
 
 enum WriterListType { unordered, ordered };
@@ -85,7 +87,8 @@ _WriterListState::_WriterListState() :
 miLastListNumber(0),
 mbListContinueNumbering(false),
 mbListElementParagraphOpened(false),
-mbListElementOpened()
+mbListElementOpened(),
+mIdListStyleMap()
 {
 }
 
@@ -102,6 +105,14 @@ public:
 void _openListLevel(TagOpenElement *pListLevelOpenElement);
 void _closeListLevel();
 
+/** stores a list style: update mListStyles,
+mWriterListStates.top().mpCurrentListStyle and the different
+maps
+ */
+void _storeListStyle(ListStyle *listStyle);
+/** retrieves the list style corresponding to a given id. */
+void _retrieveListStyle(int id);
+
 OdfEmbeddedObject _findEmbeddedObjectHandler(const WPXString &mimeType);
 OdfEmbeddedImage _findEmbeddedImageHandler(const WPXString &mimeType);
 
@@ -154,6 +165,8 @@ public:
 
 // list styles
 std::vector mListStyles;
+// a map id -> last list style defined with id
+std::map mIdListStyleMap;
 
 // object state
 unsigned miObjectNumber;
@@ -182,6 +195,7 @@ OdtGeneratorPrivate::OdtGeneratorPrivate(OdfDocumentHandler 
*pHandler, const Odf
 mpCurrentPageSpan(0),
 miNumPageStyles(0),
 mListStyles(),
+mIdListStyleMap(),
 miObjectNumber(0),
 mpCurrentTableStyle(0),
 mxStreamType(streamType),
@@ -634,6 +648,47 @@ void OdtGenerator::closeSpan()
 mpImpl->mpCurrentContentElements->push_back(new 
TagCloseElement("text:span"));
 }
 
+void OdtGeneratorPrivate::_storeListStyle(ListStyle *listStyle)
+{
+if (!listStyle || listStyle == mWriterListStates.top().mpCurrentListStyle)
+{
+return;
+}
+mListStyles.push_back(listStyle);
+mWriterListStates.top().mpCurrentListStyle = listStyle;
+mWriterListStates.top().mIdListStyleMap[listStyle->getListID()]=listStyle;
+mIdListStyleMap[listStyle->getListID()]=listStyle;
+}
+
+void OdtGeneratorPrivate::_retrieveListStyle(int id)
+{
+// first look if the current style is ok
+if (mWriterListStates.top().mpCurrentListStyle &&
+id == mWriterListStates.top().mpCurrentListStyle->getListID())
+{
+return;
+}
+
+// use the current map
+if (mWriterListStates.top().mIdListStyleMap.find(id) !=
+mWriterListStates.top().mIdListStyleMap.end())
+{
+mWriterListStates.top().mpCurrentListStyle =
+mWriterListStates.top().mIdListStyleMap.find(id)->second;
+return;
+}
+
+// use the global map
+if (mIdListStyleMap.find(id) != mIdListStyleMap.end())
+{
+mWriterListStates.top().mpCurrentListStyle =
+mIdListStyleMap.find(id)->second;
+return;
+}
+
+WRITER_DEBUG_MSG(("impossible to find a list with id=%d\n",id));
+}
+
 void OdtGenerator::defineOrderedListLevel(const WPXPropertyList &propList)
 {
 int id = 0;
@@ -644,11 +699,12 @@ void OdtGenerator::defineOrderedListLevel(const 
WPXPropertyList &propList)
 if (mpImpl->mWriterListStates.top().mpCurrentListStyle && 
mpImpl->mWriterListStates.top().mpCurrentListStyle->getListID() == id)
 pListStyle = mpImpl->mWriterListStates.top().mpCurrentListStyle;
 
-// this rather appalling conditional makes sure we only start a new list 
(rather than continue an old
-// one) if: (1) we have no prior list OR (2) the prior list is actually 
definitively different
-// from the list that is just being defined (listIDs differ) OR (3) we can 
tell that the user actually
-// is starting a new list at level 1 (and only level 1)
-if (pListStyle == 0 || pListStyle->getListID() != id  ||
+// this rather appalling conditional makes sure we only start a
+// new list (rather than continue an old one) if: (1) we have no
+// prior list or the prior list has another listId OR (2) we can
+// tell that th

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - setup_native/source

[Andras Timar]

 setup_native/source/packinfo/spellchecker_selection.txt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1493c5750c73a202281bf73f7748c249cb3fafa3
Author: Andras Timar 
Date:   Mon Mar 11 08:46:04 2013 +0100

fdo#62103 only dict of the first lang code is packed into langpack

Therefore we packed Aragonese dictionary into Spanish and Catalan
langpacks, instead of Spanish and Catalan dictionaries.

Conflicts:
setup_native/source/packinfo/spellchecker_selection.txt

Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
Reviewed-on: https://gerrit.libreoffice.org/2657
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index f80e5d5..4844129 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -14,7 +14,7 @@ be = "be"
 bg = "bg"
 bn = "bn"
 br = "br,fr"
-ca = "ca,es,fr"
+ca = "ca,an,es,fr,it,oc"
 cs = "cs"
 da = "da,de"
 de = "de,fr,it"
@@ -22,7 +22,7 @@ el = "el"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 en-ZA = "en,es,fr"
-es = "an,es,fr,pt-PT"
+es = "es,an,ca,fr,gl,oc,pt-PT"
 et = "et"
 fr = "fr,es"
 gd = "gd"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - setup_native/source

[Andras Timar]

 setup_native/source/packinfo/spellchecker_selection.txt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca65d42e9587845118aee848939fe70791d0452e
Author: Andras Timar 
Date:   Mon Mar 11 08:46:04 2013 +0100

fdo#62103 only dict of the first lang code is packed into langpack

Therefore we packed Aragonese dictionary into Spanish and Catalan
langpacks, instead of Spanish and Catalan dictionaries.

Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
Reviewed-on: https://gerrit.libreoffice.org/2656
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 0876bc0..6593a64 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -33,7 +33,7 @@ bg = "bg"
 bn = "bn"
 br = "br,fr"
 bs = "bs"
-ca = "an,ca,es,fr,it,oc"
+ca = "ca,an,es,fr,it,oc"
 cs = "cs"
 da = "da,de"
 de = "de,fr,it"
@@ -41,7 +41,7 @@ el = "el"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 en-ZA = "en,es,fr"
-es = "an,ca,es,fr,gl,oc,pt-PT"
+es = "es,an,ca,fr,gl,oc,pt-PT"
 et = "et"
 fr = "fr,es"
 gd = "gd"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

 sc/source/filter/xml/XMLExportIterator.cxx |   40 ++---
 sc/source/filter/xml/xmlexprt.cxx  |   15 ++
 2 files changed, 23 insertions(+), 32 deletions(-)

New commits:
commit 4428c7e9d73fd6a9722b262f2aab36c6fb8fd859
Author: Markus Mohrhard 
Date:   Sun Mar 10 00:25:29 2013 +0100

handle note export correctly, fdo#61165

This code was horribly over-optimized and that actually with an error.
There is a nasty corner cases that has been left out in the code. Note
captions are actually normally not deleted from the document even if the
note is deleted. So we had now wrong note captions in the list that we
should not process but they were screwing up the export code that only
exports captions for existing notes.

When we only add the caption data for existing notes the code becomes so
much cleaner and the bug is immediately gone.

Change-Id: I51f1e9042f88f3f1b2d7aae75942629771d39012
(cherry picked from commit c7937e2a38501266ed658553c19db5b4a2237864)
Reviewed-on: https://gerrit.libreoffice.org/2629
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sc/source/filter/xml/XMLExportIterator.cxx 
b/sc/source/filter/xml/XMLExportIterator.cxx
index cfbbe54..1662db7 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -861,33 +861,21 @@ bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, 
ScFormatRangeStyles* pC
 table::CellAddress  aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 );
 
 UpdateAddress( aAddress );
-if( (maNoteExportListItr != maNoteExportList.end()) && 
IsNoteBeforeNextCell(maNoteExportListItr->nCol, maNoteExportListItr->nRow, 
aAddress) )
-{
-//we have a note before the new cell
-aAddress.Column = maNoteExportListItr->nCol;
-aAddress.Row = maNoteExportListItr->nRow;
-++maNoteExportListItr;
-}
-else
-{
-if(maNoteExportListItr != maNoteExportList.end() && 
maNoteExportListItr->nCol == aAddress.Column && maNoteExportListItr->nRow == 
aAddress.Row)
-++maNoteExportListItr;
 
-if( pShapes )
-pShapes->UpdateAddress( aAddress );
-if( pNoteShapes )
-pNoteShapes->UpdateAddress( aAddress );
-if( pEmptyDatabaseRanges )
-pEmptyDatabaseRanges->UpdateAddress( aAddress );
-if( pMergedRanges )
-pMergedRanges->UpdateAddress( aAddress );
-if( pAreaLinks )
-pAreaLinks->UpdateAddress( aAddress );
-if( pDetectiveObj )
-pDetectiveObj->UpdateAddress( aAddress );
-if( pDetectiveOp )
-pDetectiveOp->UpdateAddress( aAddress );
-}
+if( pShapes )
+pShapes->UpdateAddress( aAddress );
+if( pNoteShapes )
+pNoteShapes->UpdateAddress( aAddress );
+if( pEmptyDatabaseRanges )
+pEmptyDatabaseRanges->UpdateAddress( aAddress );
+if( pMergedRanges )
+pMergedRanges->UpdateAddress( aAddress );
+if( pAreaLinks )
+pAreaLinks->UpdateAddress( aAddress );
+if( pDetectiveObj )
+pDetectiveObj->UpdateAddress( aAddress );
+if( pDetectiveOp )
+pDetectiveOp->UpdateAddress( aAddress );
 
 bool bFoundCell((aAddress.Column <= MAXCOL) && (aAddress.Row <= MAXROW));
 if( bFoundCell )
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index b599e6e..3882e2f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2531,13 +2531,16 @@ void ScXMLExport::CollectInternalShape( uno::Reference< 
drawing::XShape > xShape
 // collect note caption objects from all layers (internal or 
hidden)
 if( ScDrawObjData* pCaptData = ScDrawLayer::GetNoteCaptionData( 
pObject, static_cast< SCTAB >( nCurrentTable ) ) )
 {
-pSharedData->AddNoteObj( xShape, pCaptData->maStart );
+
if(pDoc->GetNotes(nCurrentTable)->findByAddress(pCaptData->maStart))
+{
+pSharedData->AddNoteObj( xShape, pCaptData->maStart );
 
-// #i60851# When the file is saved while editing a new note,
-// the cell is still empty -> last column/row must be updated
-OSL_ENSURE( pCaptData->maStart.Tab() == nCurrentTable, 
"invalid table in object data" );
-pSharedData->SetLastColumn( nCurrentTable, 
pCaptData->maStart.Col() );
-pSharedData->SetLastRow( nCurrentTable, 
pCaptData->maStart.Row() );
+// #i60851# When the file is saved while editing a new 
note,
+// the cell is still empty -> last column/row must be 
updated
+OSL_ENSURE( pCaptData->maStart.Tab() == nCurrentTable, 
"invalid table in object data" );
+pSharedData->SetLastColumn( nCurrentTable, 
pCaptData->maStart.Col() );
+pS

[PUSHED libreoffice-3-6] fdo#62103 only dict of the first lang code is packed into la...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2657

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2657
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Andras Timar 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#62103 only dict of the first lang code is packed into la...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2656

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2656
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] handle note export correctly, fdo#61165

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2629

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2629
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I51f1e9042f88f3f1b2d7aae75942629771d39012
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

 sc/source/filter/oox/worksheethelper.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 146352a3dcb65c99ec1b1b83f7be04231a32b21d
Author: Markus Mohrhard 
Date:   Sat Mar 9 14:21:16 2013 +0100

use direct calls to set row height, fdo#61721

Change-Id: I3c19e00b8ad2bc649b8e499cc869e3a4c488c343
(cherry picked from commit e1c281c6c1a2bd55d99e1af2023444c960cf02a3)
Reviewed-on: https://gerrit.libreoffice.org/2615
Tested-by: Fridrich Strba 
Reviewed-by: Fridrich Strba 

diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 4d29ad3..f736393 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1216,20 +1216,23 @@ void WorksheetGlobals::convertRows( OutlineLevelVec& 
orRowLevels,
 // row height: convert points to row height in 1/100 mm
 double fHeight = (rModel.mfHeight >= 0.0) ? rModel.mfHeight : fDefHeight;
 sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT );
+SCROW nStartRow = rRowRange.mnFirst;
+SCROW nEndRow = rRowRange.mnLast;
+SCTAB nTab = getSheetIndex();
 if( nHeight > 0 )
 {
 /* always import the row height, ensures better layout */
-PropertySet aPropSet( getRows( rRowRange ) );
-aPropSet.setProperty( PROP_Height, nHeight );
+ScDocument& rDoc = getScDocument();
+rDoc.SetRowHeightOnly( nStartRow, nEndRow, nTab, 
(sal_uInt16)sc::HMMToTwips(nHeight) );
+if(rModel.mbCustomHeight)
+rDoc.SetManualHeight( nStartRow, nEndRow, nTab, true );
 }
 
 // hidden rows: TODO: #108683# hide rows later?
 if( rModel.mbHidden )
 {
-PropertySet aPropSet( getRows( rRowRange ) );
-// #i116460# Use VisibleFlag instead of IsVisible: directly set the 
flag,
-// without drawing layer update etc. (only possible before shapes are 
inserted)
-aPropSet.setProperty( PROP_VisibleFlag, false );
+ScDocument& rDoc = getScDocument();
+rDoc.SetRowHidden( nStartRow, nEndRow, nTab, true );
 }
 
 // outline settings for this row range
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7eb431731761e72a343c29276cfbbea0e6f01ec
Author: Markus Mohrhard 
Date:   Tue Feb 19 20:11:28 2013 +0100

respect nDelFlags, fdo#57661

Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894
(cherry picked from commit 41095e934bcd83e08a472c8fb53743cd3f8e926c)
Reviewed-on: https://gerrit.libreoffice.org/2616
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 936e597..47cd340 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -567,7 +567,7 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const 
ScMarkData& rMark )
 if (nDelFlag & IDF_NOTE && pRange)
 maNotes.erase(pRange->aStart.Col(), pRange->aStart.Row(), 
pRange->aEnd.Col(), pRange->aEnd.Row(), true);
 
-if(pRange && pRange->aStart.Tab() == nTab)
+if((nDelFlag & IDF_ATTRIB) && pRange && pRange->aStart.Tab() == nTab)
 mpCondFormatList->DeleteArea( pRange->aStart.Col(), 
pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] use direct calls to set row height, fdo#61721

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2615

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2615
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c19e00b8ad2bc649b8e499cc869e3a4c488c343
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] respect nDelFlags, fdo#57661

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2616

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2616
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

[Joren De Cuyper]

 sfx2/source/dialog/templdlg.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a9e2b90fd4458852e745ec5eca127549452617b7
Author: Joren De Cuyper 
Date:   Sun Mar 10 12:48:30 2013 +0100

fdo#62075 Hierarchical filter hard to find

See UX-advice 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-March/001898.html
and comment on bug for approval of ux-advice.

Change-Id: Ie5af5ec141b148e6253d0ffa9b546d30994c6dd6
Reviewed-on: https://gerrit.libreoffice.org/2639
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 0af6d77..a81c27d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -83,8 +83,8 @@ using namespace ::com::sun::star::uno;
 
 static sal_uInt16 nLastItemId = USHRT_MAX;
 
-// filter box has maximum 12 entries visible
-#define MAX_FILTER_ENTRIES  12
+// filter box has maximum 14 entries visible
+#define MAX_FILTER_ENTRIES  14
 
 //=
 
@@ -1281,7 +1281,7 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 if(pTreeBox)
 
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
 
-// show maximum 12 entries
+// show maximum 14 entries
 aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
 aFilterLb.SetUpdateMode(sal_True);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#62075 Hierarchical filter hard to find

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2639

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2639
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5af5ec141b148e6253d0ffa9b546d30994c6dd6
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#61726: rename report-builder package to org.libreoffice....

[David Ostrovsky (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2578

Approvals:
  David Ostrovsky: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2578
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia06cb7ad8c1528c1d5b5eeb70f1e4b2aa854b70f
Gerrit-PatchSet: 8
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: David Ostrovsky 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Stephan Bergmann 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk mysqlc/source

[Fridrich Štrba]

 mysqlc/Library_mysqlc.mk|2 +-
 mysqlc/source/mysqlc_connection.cxx |   35 +--
 2 files changed, 2 insertions(+), 35 deletions(-)

New commits:
commit 730df392f5c5424a46fcb360c21d34a04622eb9f
Author: Fridrich Å trba 
Date:   Mon Mar 11 10:09:39 2013 +0100

Do not try to dlopen a static internal libmariadb

Change-Id: Ib624089418e22c050e951acc4c487572c7e0ea25

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index ad8bc8d..d67d314 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
 
 $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \
-   -DCPPCON_LIB_BUILD \
+   -DCPPCONN_LIB_BUILD \
-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
diff --git a/mysqlc/source/mysqlc_connection.cxx 
b/mysqlc/source/mysqlc_connection.cxx
index fe93623..b4ebe77 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -99,10 +99,6 @@ void SAL_CALL OConnection::release()
 }
 /* }}} */
 
-#ifndef SYSTEM_MARIADB
-extern "C" { void SAL_CALL thisModule() {} }
-#endif
-
 /* {{{ OConnection::construct() -I- */
 void OConnection::construct(const OUString& url, const Sequence< PropertyValue 
>& info)
 throw(SQLException)
@@ -194,35 +190,6 @@ void OConnection::construct(const OUString& url, const 
Sequence< PropertyValue >
 connProps["socket"] = pipe_str;
 }
 
-#ifndef SYSTEM_MARIADB
-::rtl::OUString sMySQLClientLib( "libmariadb" SAL_DLLEXTENSION );
-
-::rtl::OUString moduleBase;
-OSL_VERIFY( ::osl::Module::getUrlFromAddress( &thisModule, 
moduleBase ) );
-::rtl::OUString sMySQLClientLibURL;
-try
-{
-sMySQLClientLibURL = ::rtl::Uri::convertRelToAbs( moduleBase, 
sMySQLClientLib.pData );
-}
-catch ( const ::rtl::MalformedUriException& e )
-{
-(void)e; // silence compiler
-#if OSL_DEBUG_LEVEL > 0
-::rtl::OString sMessage( "OConnection::construct: malformed 
URI: " );
-sMessage += ::rtl::OUStringToOString( e.getMessage(), 
osl_getThreadTextEncoding() );
-OSL_FAIL( sMessage.getStr() );
-#endif
-}
-
-::rtl::OUString sMySQLClientLibPath;
-osl_getSystemPathFromFileURL( sMySQLClientLibURL.pData, 
&sMySQLClientLibPath.pData );
-
-sql::SQLString mysqlLib = ::rtl::OUStringToOString( 
sMySQLClientLibPath, osl_getThreadTextEncoding() ).getStr();
-connProps["clientlib"] = mysqlLib;
-
-OSL_TRACE("clientlib=%s", mysqlLib.c_str());
-#endif
-
 OSL_TRACE("hostName=%s", host_str.c_str());
 OSL_TRACE("port=%i", int(nPort));
 OSL_TRACE("userName=%s", user_str.c_str());
@@ -243,7 +210,7 @@ void OConnection::construct(const OUString& url, const 
Sequence< PropertyValue >
 // Check if the server is 4.1 or above
 if (this->getMysqlVersion() < 40100) {
 throw SQLException(
-::rtl::OUString( "MySQL Connector/OO.org requires MySQL Server 4.1 
or above"  ),
+::rtl::OUString( "MariaDB LibreOffice Connector requires MySQL 
Server 4.1 or above"  ),
 *this,
 ::rtl::OUString(),
 0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svtools/inc svtools/source svx/inc svx/source sw/AllLangResTarget_sw.mk sw/Library_sw.mk sw/source

[Rodolfo Ribeiro Gomes]

 svtools/inc/svtools/ruler.hxx|4 
 svtools/source/control/ruler.cxx |8 -
 svx/inc/svx/ruler.hxx|7 -
 svx/source/dialog/svxruler.cxx   |5 
 sw/AllLangResTarget_sw.mk|1 
 sw/Library_sw.mk |1 
 sw/source/core/doc/doctxm.cxx|   28 
 sw/source/ui/inc/misc.hrc|6 
 sw/source/ui/inc/swruler.hxx |  105 +++
 sw/source/ui/misc/swruler.cxx|  263 +++
 sw/source/ui/misc/swruler.src|   25 +++
 sw/source/ui/uiview/view.cxx |   18 +-
 12 files changed, 454 insertions(+), 17 deletions(-)

New commits:
commit e047a967b0db8c61dc977b52f3876fc4e385ad77
Author: Rodolfo Ribeiro Gomes 
Date:   Sat Mar 9 14:08:21 2013 -0300

fdo#38246 Comment control on Writer ruler feature

It follows the directions from design team available at

https://wiki.documentfoundation.org/Design/Whiteboards/Comments_Ruler_Control.
It misses some fancy stuff though (like animated/delayed highlight and 
fading border).
Some work should be done with (svtools) Ruler also for a cleaner 
implementation.

Change-Id: Ib065043d05fe56fbfe6d00e0bb654966f046129b
Signed-off-by: Rodolfo Ribeiro Gomes 

diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx
index 864ebf9..a06109b 100644
--- a/svtools/inc/svtools/ruler.hxx
+++ b/svtools/inc/svtools/ruler.hxx
@@ -681,6 +681,9 @@ private:
 Ruler (const Ruler &);
 Ruler & operator= (const Ruler &);
 
+protected:
+long GetRulerVirHeight() const;
+
 public:
 Ruler( Window* pParent, WinBits nWinStyle = 
WB_STDRULER );
 virtual ~Ruler();
@@ -709,6 +712,7 @@ public:
 longGetWinWidth() const { return mnWinWidth; }
 voidSetPagePos( long nOff = 0, long nWidth = 0 );
 longGetPageOffset() const;
+longGetPageWidth() const;
 voidSetBorderPos( long nOff = 0 );
 longGetBorderOffset() const { return mnBorderOff; }
 Rectangle   GetExtraRect() const { return maExtraRect; }
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index fcc2037..5e19a66 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2775,9 +2775,11 @@ void Ruler::SetTextRTL(sal_Bool bRTL)
 
 }
 long Ruler::GetPageOffset() const { return mpData->nPageOff; }
-longRuler::GetNullOffset() const { return mpData->nNullOff; }
-longRuler::GetMargin1() const { return mpData->nMargin1; }
-longRuler::GetMargin2() const { return mpData->nMargin2; }
+long Ruler::GetPageWidth() const { return mpData->nPageWidth; }
+long Ruler::GetNullOffset() const { return mpData->nNullOff; }
+longRuler::GetMargin1() const { return mpData->nMargin1; }
+longRuler::GetMargin2() const { return mpData->nMargin2; }
+long Ruler::GetRulerVirHeight() const { return mnVirHeight; }
 
 void Ruler::DrawTicks()
 {
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index e39ccde..aa18893 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -148,7 +148,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public 
SfxListener
 long GetLeftIndent() const;
 long GetRightIndent() const;
 long GetLogicRightIndent() const;
-long GetPageWidth() const;
 
 inline long GetLeftFrameMargin() const;
 long GetRightFrameMargin() const;
@@ -184,14 +183,13 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public 
SfxListener
 sal_uInt16 GetNextVisible(sal_uInt16 nColumn);
 sal_uInt16 GetPrevVisible(sal_uInt16 nColumn);
 
-void Update();
-
 enum UpdateType {
 MOVE_ALL,
 MOVE_LEFT,
 MOVE_RIGHT
 };
 void UpdateParaContents_Impl(long lDiff, UpdateType = MOVE_ALL);
+
 protected:
 virtual voidCommand( const CommandEvent& rCEvt );
 virtual voidClick();
@@ -203,6 +201,8 @@ protected:
 
 virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
+virtual voidUpdate();
+
 // calculation of boundary values for object borders
 // values refer to the page
 virtual sal_BoolCalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) 
const;
@@ -215,6 +215,7 @@ protected:
 sal_uInt16 GetActRightColumn (
 sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 
nAct=USHRT_MAX ) const;
 long CalcPropMaxRight(sal_uInt16 nCol=USHRT_MAX) const;
+long GetPageWidth() const;
 
 public:
 #define SVXRULER_SUPPORT_TABS   0x0001
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 117642e..24f856f 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1340,10 +1340,11 @@ void SvxRuler::Update()
 }
 
 
-inline long SvxRuler::GetPageWidth() const
+long SvxRuler::GetPageWidth() const
 {
+if ( !pPagePosItem )
+return 0;
 return bHo

need help with debugging

[Matúš Kukan]

Hi,

I am quite ashamed I still have no idea how to debug properly.
Maybe someone here could teach me a bit.

I've this cross-compiled --enable-mergelibs backtrace and no idea what
to learn from it.
It does not happen without --enable-mergelibs.

Thanks,
Matus

Program received signal SIGSEGV, Segmentation fault.
0x44c76644 in (anonymous namespace)::newTypeDescription
(ppRet=0xbeffeb74, eTypeClass=typelib_TypeClass_STRUCT,
pTypeName=0x47c90f18, pType=0x0, nMembers=4, pCompoundMembers=0x0,
pStructMembers=0xbeffeb34)
at /home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx:862
862 /home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx: No
such file or directory.
(gdb) bt
#0  0x44c76644 in (anonymous namespace)::newTypeDescription
(ppRet=0xbeffeb74, eTypeClass=typelib_TypeClass_STRUCT,
pTypeName=0x47c90f18, pType=0x0, nMembers=4, pCompoundMembers=0x0,
pStructMembers=0xbeffeb34)
at /home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx:862
#1  0x44c76908 in typelib_typedescription_newStruct (ppRet=0xbeffeb74,
pTypeName=0x47c90f18, pType=0x0, nMembers=4, pMembers=0xbeffeb34) at
/home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx:919
#2  0x407877d4 in
com::sun::star::beans::detail::thePropertyValueType::operator()
(this=0xbeffebec) at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/udkapi/com/sun/star/beans/PropertyValue.hpp:62
#3  0x40787a34 in rtl::StaticWithInit::get ()
at /home/matus/git/libo-cross/solver/unxlngr.pro/inc/rtl/instance.hxx:603
#4  0x407878c0 in com::sun::star::beans::cppu_detail_getUnoType () at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/udkapi/com/sun/star/beans/PropertyValue.hpp:73
#5  0x40787a90 in
cppu::UnoType::get () at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/cppu/unotype.hxx:267
#6  0x40787e68 in
cppu::getTypeFavourUnsigned ()
at /home/matus/git/libo-cross/solver/unxlngr.pro/inc/cppu/unotype.hxx:288
#7  0x4086ed94 in
com::sun::star::uno::operator<<=
(rAny=..., value=...) at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/com/sun/star/uno/Any.hxx:203
#8  0x4212c868 in
utl::DefaultFontConfiguration::DefaultFontConfiguration
(this=0x43c43740) at
/home/matus/git/libo-cross/unotools/source/config/fontcfg.cxx:116
#9  0x42130780 in rtl::Static::get(void) () at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/rtl/instance.hxx:395
#10 0x4212c6e0 in utl::DefaultFontConfiguration::get () at
/home/matus/git/libo-cross/unotools/source/config/fontcfg.cxx:99
#11 0x421f2b70 in ImplStyleData::SetStandardStyles (this=0xbe828) at
/home/matus/git/libo-cross/vcl/source/app/settings.cxx:357
#12 0x421f209c in ImplStyleData::ImplStyleData (this=0xbe828) at
/home/matus/git/libo-cross/vcl/source/app/settings.cxx:237
#13 0x421f34c4 in StyleSettings::StyleSettings (this=0xbe738) at
/home/matus/git/libo-cross/vcl/source/app/settings.cxx:444
#14 0x421f6b48 in ImplAllSettingsData::ImplAllSettingsData
(this=0xbe730) at
/home/matus/git/libo-cross/vcl/source/app/settings.cxx:1291
#15 0x421f7064 in AllSettings::AllSettings (this=0xbddb8) at
/home/matus/git/libo-cross/vcl/source/app/settings.cxx:1343
#16 0x421fad98 in Application::GetSettings () at
/home/matus/git/libo-cross/vcl/source/app/svapp.cxx:719
#17 0x4244488c in OutputDevice::OutputDevice (this=0x473a5924) at
/home/matus/git/libo-cross/vcl/source/gdi/outdev.cxx:336
#18 0x426702f4 in Window::Window (this=0x473a5924, nType=382) at
/home/matus/git/libo-cross/vcl/source/window/window.cxx:4178
#19 0x42629438 in SystemWindow::SystemWindow (this=0x473a5924,
nType=382) at /home/matus/git/libo-cross/vcl/source/window/syswin.cxx:67
#20 0x42692f90 in WorkWindow::WorkWindow (this=0x473a5924, nType=382)
at /home/matus/git/libo-cross/vcl/source/window/wrkwin.cxx:96
#21 0x425c5268 in IntroWindow::IntroWindow (this=0x473a5924) at
/home/matus/git/libo-cross/vcl/source/window/introwin.cxx:42
#22 0x4144c9f4 in (anonymous namespace)::SplashScreen::SplashScreen
(this=0x473a5908) at
/home/matus/git/libo-cross/desktop/source/splash/splash.cxx:134
#23 0x4144f51c in desktop::splash::create () at
/home/matus/git/libo-cross/desktop/source/splash/splash.cxx:633
#24 0x44d0bff0 in cppu::OSingleFactoryHelper::createInstanceEveryTime
(this=0x47c99a4c, xContext=...) at
/home/matus/git/libo-cross/cppuhelper/source/factory.cxx:162
#25 0x44d0c284 in
cppu::OSingleFactoryHelper::createInstanceWithContext
(this=0x47c99a4c, xContext=...) at
/home/matus/git/libo-cross/cppuhelper/source/factory.cxx:203
#26 0x44d0ccb4 in
cppu::OFactoryComponentHelper::createInstanceWithContext
(this=0x47c99a18, xContext=...) at
/home/matus/git/libo-cross/cppuhelper/source/factory.cxx:473
#27 0x44d0c2e0 in
cppu::OSingleFactoryHelper::createInstanceWithArgumentsAndContext
(this=0x47c99a4c, rArguments=..., xContext=...) at
/home/matus/git/libo-cross/cppuhelper/source/factory.cxx:211
#28 0x44d0ce1c in
cppu::OFactoryComponentHelper::createInstanceWithArgumentsAndContext
(this=0x47c99a18, rArguments=..., xContext=...) at
/home/matus/git/libo-cross/cppuhelper/source/facto

[Libreoffice-commits] core.git: sfx2/source

[Joren De Cuyper]

 sfx2/source/dialog/dialog.src   |8 +--
 sfx2/source/dialog/templdlg.cxx |   86 
 2 files changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 31d1748d6db7ca4da6302f3b09d2586ee2192d05
Author: Joren De Cuyper 
Date:   Sat Mar 9 20:30:30 2013 +0100

Minor improvements and UX-advice related to fdo#46718 delete multi style

UX advice see: 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-February/001816.html

Summary: only show a dialog when the user is trying to delete an used
style. Also warn him this change can only be partly undone (for now).

Change-Id: Ib95143fcd4c7543f518e0d7fd4ff46a127efca2a
Reviewed-on: https://gerrit.libreoffice.org/2618
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index f23deb1..92b30f7 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -56,13 +56,13 @@ InfoBox MSG_POOL_STYLE_NAME
 {
 Message [ en-US ] = "Name already exists as a default Style.\nPlease 
choose another name." ;
 };
-String STR_DELETE_STYLE
+String STR_DELETE_STYLE_USED
 {
-Text [ en-US ] = "Do you really want to delete Style $1?" ;
+Text [ en-US ] = "One or more of the selected styles is in use in this 
document.\nIf you delete these styles, text will revert to the parent style.\n" 
;
 };
-String STR_DELETE_STYLE_USED
+String STR_DELETE_STYLE
 {
-Text [ en-US ] = "You are deleting an applied Style!\n" ;
+Text [ en-US ] = "Styles in use: " ;
 };
 Menu MN_CONTEXT_TEMPLDLG
 {
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 404f0c9..b3032bc 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1970,67 +1970,68 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
 {
 if ( IsInitialized() && HasSelectedStyle() )
 {
-sal_uLong SelectionCount = 0;
-sal_Bool bChecked = 0;
+bool bUsedStyle = 0; // one of the selected styles are used in the 
document?
 String aRet;
 
-SelectionCount = aFmtLb.GetSelectionCount();
 std::vector aList;
-
 SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
+const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
+
+String aMsg = SfxResId(STR_DELETE_STYLE_USED).toString();
+aMsg += SfxResId(STR_DELETE_STYLE).toString();
 
 while (pEntry)
 {
 aList.push_back( pEntry );
-pEntry = aFmtLb.NextSelected( pEntry );
-SelectionCount++;
-}
-
-std::vector::const_iterator it = aList.begin(), 
itEnd = aList.end();
-
-for (; it != itEnd; ++it)
-{
+// check the style is used or not
 if (pTreeBox)
-aRet = pTreeBox->GetEntryText( *it );
+aRet = pTreeBox->GetEntryText( pEntry );
 else
-aRet = aFmtLb.GetEntryText( *it );
-const String aTemplName( aRet );
+aRet = aFmtLb.GetEntryText( pEntry );
 
-const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
+const String aTemplName( aRet );
 
 SfxStyleSheetBase* pStyle = pStyleSheetPool->Find( aTemplName, 
pItem->GetFamily(), SFXSTYLEBIT_ALL );
 
-bool bUsedStyle = pStyle->IsUsed();
-bool approve;
-
-if ( bChecked == 0 )
+if ( pStyle->IsUsed() )  // pStyle is in use in the document?
 {
-String aMsg;
-if ( bUsedStyle )
-aMsg = SfxResId(STR_DELETE_STYLE_USED).toString();
-aMsg += SfxResId(STR_DELETE_STYLE).toString();
-aMsg.SearchAndReplaceAscii( "$1", aTemplName );
-#if defined UNX
+if (bUsedStyle) // add a seperator for the second and later 
styles
+aMsg += ", ";
+aMsg += aTemplName;
+bUsedStyle = 1;
+}
+
+pEntry = aFmtLb.NextSelected( pEntry );
+}
+
+bool aApproved = 0;
+
+// we only want to show the dialog once and if we want to delete a 
style in use (UX-advice)
+if ( bUsedStyle )
+{
+#if defined UNX
 QueryBox aBox( SFX_APP()->GetTopWindow(), WB_YES_NO | 
WB_DEF_NO, aMsg );
-#else
+#else
 QueryBox aBox( GetWindow(), WB_YES_NO | WB_DEF_NO , aMsg );
-#endif
-if (SelectionCount > 1) //show only when there are multiple 
styles selected/to be deleted
-aBox.SetDefaultCheckBoxText();
-approve = aBox.Execute() == RET_YES;
-bChecked = aBox.GetCheckBoxState();
-if ( approve == 0 && bChecked == 1)
-break;
-}
-else //if checkbox was selected previous time, don't ask again
-

[PUSHED] fdo#38246 Comment control on Writer ruler feature

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/1785


-- 
To view, visit https://gerrit.libreoffice.org/1785
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib065043d05fe56fbfe6d00e0bb654966f046129b
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rodolfo Ribeiro Gomes 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Rodolfo Ribeiro Gomes 
Gerrit-Reviewer: Tor Lillqvist 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#61458, index should be "flat"

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2603


-- 
To view, visit https://gerrit.libreoffice.org/2603
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I46db120fc5e7d616cd4c9eadee7fc4c502569e86
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ádám Király 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Minor improvements and UX-advice related to fdo#46718 delete...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2618

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2618
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib95143fcd4c7543f518e0d7fd4ff46a127efca2a
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Joren De Cuyper 
Gerrit-Reviewer: Samuel Mehrbrodt 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/source

[Rafael Dominguez]

 sfx2/source/dialog/inputdlg.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fe8c0140743d1f50c54e2898627608f6383ccf2
Author: Rafael Dominguez 
Date:   Sun Mar 10 09:05:51 2013 -0430

fdo#61394 Change Template Manager Accept button label to OK.

Change-Id: Iffc0e55343f6da8acd921b944fcabdcaf6380dad
Reviewed-on: https://gerrit.libreoffice.org/2655
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sfx2/source/dialog/inputdlg.src b/sfx2/source/dialog/inputdlg.src
index f0b04b6..ab6caa1 100644
--- a/sfx2/source/dialog/inputdlg.src
+++ b/sfx2/source/dialog/inputdlg.src
@@ -36,7 +36,7 @@ ModalDialog DLG_INPUT_BOX
 Size = MAP_APPFONT(40,15);
 TabStop = TRUE;
 DefButton = TRUE;
-Text [en-US] = "Accept";
+Text [en-US] = "OK";
 };
 
 PushButton BTN_INPUT_CANCEL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#61394 Change Template Manager Accept button label to OK.

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2655

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2655
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffc0e55343f6da8acd921b944fcabdcaf6380dad
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rafael Dominguez 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] use system python for building if possible

[via Code Review]

Hello LibreOffice gerrit bot, David Ostrovsky,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2563

to look at the new patch set (#6).

Change subject: use system python for building if possible
..

use system python for building if possible

Also simplifies configure, hopefully without any mistake;)

Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1
---
M RepositoryExternal.mk
M config_host.mk.in
M configure.ac
M nss/ExternalProject_nss.mk
M solenv/gbuild/ExternalExecutable.mk
5 files changed, 81 insertions(+), 136 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2563/6
-- 
To view, visit https://gerrit.libreoffice.org/2563
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 
Gerrit-Reviewer: David Ostrovsky 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Matúš Kukan 
Gerrit-Reviewer: Tomáš Chvátal 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Christopher Copits]

 sw/source/ui/docvw/HeaderFooterWin.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 38a022ce8b2698ef4535d3487326307928c5208b
Author: Christopher Copits 
Date:   Sun Mar 10 18:11:24 2013 -0400

fdo#57362 Cannot save document after editing footer background and border

In HeaderFooterWin.cxx's SwHeaderFooterWin::ExecuteCommand(): after changes 
are made to the header's background, box, or shadow, I call SetModified(true) 
to signal that the document was modified.

Change-Id: I2be5710dde9d7a6f5d4373484d52ece71c91cdd4
Reviewed-on: https://gerrit.libreoffice.org/2654
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 25e2913..7b0f5bf 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -465,14 +465,20 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot )
 if ( svx::ShowBorderBackgroundDlg( this, &aSet, true ) )
 {
 const SfxPoolItem* pItem;
-if ( SFX_ITEM_SET == aSet.GetItemState( RES_BACKGROUND, 
sal_False, &pItem ) )
+if ( SFX_ITEM_SET == aSet.GetItemState( RES_BACKGROUND, 
sal_False, &pItem ) ) {
 pHFFmt->SetFmtAttr( *pItem );
+rView.GetDocShell()->SetModified(true);
+}
 
-if ( SFX_ITEM_SET == aSet.GetItemState( RES_BOX, 
sal_False, &pItem ) )
+if ( SFX_ITEM_SET == aSet.GetItemState( RES_BOX, 
sal_False, &pItem ) ) {
 pHFFmt->SetFmtAttr( *pItem );
+rView.GetDocShell()->SetModified(true);
+}
 
-if ( SFX_ITEM_SET == aSet.GetItemState( RES_SHADOW, 
sal_False, &pItem ) )
+if ( SFX_ITEM_SET == aSet.GetItemState( RES_SHADOW, 
sal_False, &pItem ) ) {
 pHFFmt->SetFmtAttr( *pItem );
+rView.GetDocShell()->SetModified(true);
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1e/80ed2aecc9210729e2aa5a9d682563cb9d1a0b

[Caolán McNamara]

 1e/80ed2aecc9210729e2aa5a9d682563cb9d1a0b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b5b01974c576df5dbe2cad862a5f610df0d96b01
Author: Caolán McNamara 
Date:   Mon Mar 11 09:20:47 2013 +

Notes added by 'git notes add'

diff --git a/1e/80ed2aecc9210729e2aa5a9d682563cb9d1a0b 
b/1e/80ed2aecc9210729e2aa5a9d682563cb9d1a0b
new file mode 100644
index 000..153b0fc
--- /dev/null
+++ b/1e/80ed2aecc9210729e2aa5a9d682563cb9d1a0b
@@ -0,0 +1 @@
+prefer: 4dd7a3f12e81e3db272bc3049c6c33661d81678c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Joren De Cuyper]

 sfx2/source/dialog/templdlg.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1272688c6001e160018dc2f64a0767730b18aca4
Author: Joren De Cuyper 
Date:   Sun Mar 10 12:37:12 2013 +0100

fdo#62075 Hierarchical filter hard to find

See UX-advice 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-March/001898.html
and comment on bug for approval of ux-advice.

Change-Id: I0e3eb178eb74476edad6aad724e1ccc2a05662da
Reviewed-on: https://gerrit.libreoffice.org/2638
Reviewed-by: Thomas Arnhold 
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b3032bc..d6d1af3 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -83,8 +83,8 @@ using namespace ::com::sun::star::uno;
 
 static sal_uInt16 nLastItemId = USHRT_MAX;
 
-// filter box has maximum 12 entries visible
-#define MAX_FILTER_ENTRIES  12
+// filter box has maximum 14 entries visible
+#define MAX_FILTER_ENTRIES  14
 
 //=
 
@@ -1235,7 +1235,7 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 if(pTreeBox)
 
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
 
-// show maximum 12 entries
+// show maximum 14 entries
 aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
 aFilterLb.SetUpdateMode(sal_True);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/3b1eed0d728e5c493bc84b8a213b9703370552

[Caolán McNamara]

 bf/3b1eed0d728e5c493bc84b8a213b9703370552 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e627f148247301d36316653b6a1fb69cdac16a69
Author: Caolán McNamara 
Date:   Mon Mar 11 09:21:32 2013 +

Notes added by 'git notes add'

diff --git a/bf/3b1eed0d728e5c493bc84b8a213b9703370552 
b/bf/3b1eed0d728e5c493bc84b8a213b9703370552
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/bf/3b1eed0d728e5c493bc84b8a213b9703370552
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/sdremote

[Ondřej Smrž]

 android/sdremote/res/layout/activity_presentation.xml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b2a11dc9a1b7890d77314d0101004289088e6054
Author: Ondřej Smrž 
Date:   Sun Mar 10 13:10:37 2013 +0100

fdo#61421 Added line to prevent screenlocking during presentation

Added line to xml layout to prevent locking screen during using this
layout

Change-Id: Ia2f71e67a3d09bacf1cb7e95dd05a2008129eb24
Reviewed-on: https://gerrit.libreoffice.org/2640
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/android/sdremote/res/layout/activity_presentation.xml 
b/android/sdremote/res/layout/activity_presentation.xml
index 23b615a..1dbf5a6 100644
--- a/android/sdremote/res/layout/activity_presentation.xml
+++ b/android/sdremote/res/layout/activity_presentation.xml
@@ -2,7 +2,8 @@
 xmlns:tools="http://schemas.android.com/tools";
 android:id="@+id/framelayout"
 android:layout_width="match_parent"
-android:layout_height="match_parent" >
+android:layout_height="match_parent"
+android:keepScreenOn = "true">
 
 ___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 8d/49f42a2bb2b56b5d66f5e2c5e3ba08cf782163 a6/d948067e6115a405dbc5fe1dfdcc81abf41a1d

[Caolán McNamara]

 8d/49f42a2bb2b56b5d66f5e2c5e3ba08cf782163 |1 +
 a6/d948067e6115a405dbc5fe1dfdcc81abf41a1d |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 207d18d33517eb13c92320eb060035fb44be2a36
Author: Caolán McNamara 
Date:   Mon Mar 11 09:23:43 2013 +

Notes added by 'git notes add'

diff --git a/a6/d948067e6115a405dbc5fe1dfdcc81abf41a1d 
b/a6/d948067e6115a405dbc5fe1dfdcc81abf41a1d
new file mode 100644
index 000..2a94fa1
--- /dev/null
+++ b/a6/d948067e6115a405dbc5fe1dfdcc81abf41a1d
@@ -0,0 +1 @@
+ignore: whitespace
commit 5082a75b405e2e052637d694ec6b2f19514b6917
Author: Caolán McNamara 
Date:   Mon Mar 11 09:23:34 2013 +

Notes added by 'git notes add'

diff --git a/8d/49f42a2bb2b56b5d66f5e2c5e3ba08cf782163 
b/8d/49f42a2bb2b56b5d66f5e2c5e3ba08cf782163
new file mode 100644
index 000..2a94fa1
--- /dev/null
+++ b/8d/49f42a2bb2b56b5d66f5e2c5e3ba08cf782163
@@ -0,0 +1 @@
+ignore: whitespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d1/7d2ac96352019abc30b9f1d06ac0f9cf8f9b50

[Caolán McNamara]

 d1/7d2ac96352019abc30b9f1d06ac0f9cf8f9b50 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c9c67b61a3d015cd72c99336446afc342158b46f
Author: Caolán McNamara 
Date:   Mon Mar 11 09:23:51 2013 +

Notes added by 'git notes add'

diff --git a/d1/7d2ac96352019abc30b9f1d06ac0f9cf8f9b50 
b/d1/7d2ac96352019abc30b9f1d06ac0f9cf8f9b50
new file mode 100644
index 000..2a94fa1
--- /dev/null
+++ b/d1/7d2ac96352019abc30b9f1d06ac0f9cf8f9b50
@@ -0,0 +1 @@
+ignore: whitespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#57362 Cannot save document after editing footer backgrou...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2654

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2654
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2be5710dde9d7a6f5d4373484d52ece71c91cdd4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christopher Copits 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#62075 Hierarchical filter hard to find

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2638

Approvals:
  Thomas Arnhold: Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2638
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e3eb178eb74476edad6aad724e1ccc2a05662da
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Thomas Arnhold 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#61421 Added line to prevent screenlocking during present...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2640

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2640
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2f71e67a3d09bacf1cb7e95dd05a2008129eb24
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ondřej Smrž 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svtools/source

[Marc-André Laverdière]

 svtools/source/contnr/treelist.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 884e052395e4e28212d8f3744382713405d04eb8
Author: Marc-André Laverdière 
Date:   Fri Mar 8 19:22:58 2013 -0500

Documentation to avoid a real use-after-free bug

Change-Id: Ie8a4432b0a70703fbfe92480ad0608b659a887d0
Reviewed-on: https://gerrit.libreoffice.org/2608
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 307d861..55beae9 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1268,6 +1268,9 @@ void SvListView::ModelIsRemoving( SvTreeListEntry* )
 
 void SvListView::ModelHasRemoved( SvTreeListEntry* )
 {
+//WARNING WARNING WARNING
+//The supplied pointer should have been deleted
+//before this call. Be careful not to use it!!!
 DBG_CHKTHIS(SvListView,0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Documentation to avoid a real use-after-free bug

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2608

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2608
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8a4432b0a70703fbfe92480ad0608b659a887d0
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marc-André Laverdière 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Markus Mohrhard 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ABANDONED] fdo#57422 fixing the Listener for the buttons and scrollbar

[Faisal al-otaibi (via Code Review)]

Faisal al-otaibi has abandoned this change.

Change subject: fdo#57422 fixing the Listener for the buttons and scrollbar
..


Patch Set 1: Abandoned

-- 
To view, visit https://gerrit.libreoffice.org/2094
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ic30487fc1f4eeef447c9676b94fe6b9e93de8378
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sdext/source

[Abdulaziz A Alayed]

 sdext/source/presenter/PresenterNotesView.cxx   |  134 
 sdext/source/presenter/PresenterSlideSorter.cxx |  108 ---
 2 files changed, 144 insertions(+), 98 deletions(-)

New commits:
commit b977c27383b36f511bcedc8cd48c160a1c0be514
Author: Abdulaziz A Alayed 
Date:   Sat Mar 9 15:35:45 2013 +0300

fdo#57422 fixing scroll bar and slides position

fixing scroll bar position and  slides sorter of  note view and slides if
the interface language is RTL .

Change-Id: I80b55dff621d6b994095ad7a4979bcca63371edf

diff --git a/sdext/source/presenter/PresenterNotesView.cxx 
b/sdext/source/presenter/PresenterNotesView.cxx
index deb248f..2ffb8ce 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
+#include "vcl/svapp.hxx"
 #include "PresenterNotesView.hxx"
 #include "PresenterButton.hxx"
 #include "PresenterCanvasHelper.hxx"
@@ -431,80 +431,90 @@ void PresenterNotesView::Layout (void)
 {
 if ( ! mxParentWindow.is())
 return;
-
 awt::Rectangle aWindowBox (mxParentWindow->getPosSize());
 geometry::RealRectangle2D aNewTextBoundingBox (0,0,aWindowBox.Width, 
aWindowBox.Height);
-
 // Size the tool bar and the horizontal separator above it.
 if (mxToolBarWindow.is())
-{
-const geometry::RealSize2D aToolBarSize (mpToolBar->GetMinimalSize());
-const sal_Int32 nToolBarHeight = sal_Int32(aToolBarSize.Height + 0.5);
-mxToolBarWindow->setPosSize(0, aWindowBox.Height - nToolBarHeight,
-sal_Int32(aToolBarSize.Width + 0.5), nToolBarHeight,
-awt::PosSize::POSSIZE);
-aNewTextBoundingBox.Y2 -= nToolBarHeight;
-
-mnSeparatorYLocation = aWindowBox.Height - nToolBarHeight - 
gnSpaceBelowSeparator;
-aNewTextBoundingBox.Y2 = mnSeparatorYLocation - gnSpaceAboveSeparator;
-
-// Place the close button.
-if (mpCloseButton.get() != NULL)
-mpCloseButton->SetCenter(geometry::RealPoint2D(
-(aWindowBox.Width +  aToolBarSize.Width) / 2,
-aWindowBox.Height - aToolBarSize.Height/2));
-}
-
-// Check whether the vertical scroll bar is necessary.
-if (mpScrollBar.get() != NULL)
-{
-bool bShowVerticalScrollbar (false);
-try
 {
-const double nTextBoxHeight (aNewTextBoundingBox.Y2 - 
aNewTextBoundingBox.Y1);
-const double nHeight (mpTextView->GetTotalTextHeight());
-if (nHeight > nTextBoxHeight)
-{
-bShowVerticalScrollbar = true;
-aNewTextBoundingBox.X2 -= mpScrollBar->GetSize();
-}
-mpScrollBar->SetTotalSize(nHeight);
+const geometry::RealSize2D aToolBarSize 
(mpToolBar->GetMinimalSize());
+const sal_Int32 nToolBarHeight = sal_Int32(aToolBarSize.Height + 
0.5);
+mxToolBarWindow->setPosSize(0, aWindowBox.Height - nToolBarHeight,
+sal_Int32(aToolBarSize.Width + 0.5), 
nToolBarHeight,
+awt::PosSize::POSSIZE);
+aNewTextBoundingBox.Y2 -= nToolBarHeight;
+mnSeparatorYLocation = aWindowBox.Height - nToolBarHeight - 
gnSpaceBelowSeparator;
+aNewTextBoundingBox.Y2 = mnSeparatorYLocation - 
gnSpaceAboveSeparator;
+// Place the close button.
+if (mpCloseButton.get() != NULL)
+mpCloseButton->SetCenter(geometry::RealPoint2D(
+   
(aWindowBox.Width +  aToolBarSize.Width) / 2,
+   
aWindowBox.Height - aToolBarSize.Height/2));
 }
-catch(beans::UnknownPropertyException&)
+// Check whether the vertical scroll bar is necessary.
+if (mpScrollBar.get() != NULL)
 {
-OSL_ASSERT(false);
+bool bShowVerticalScrollbar (false);
+try
+{
+const double nTextBoxHeight (aNewTextBoundingBox.Y2 - 
aNewTextBoundingBox.Y1);
+const double nHeight (mpTextView->GetTotalTextHeight());
+if (nHeight > nTextBoxHeight)
+{
+bShowVerticalScrollbar = true;
+if(!Application::GetSettings().GetLayoutRTL())
+aNewTextBoundingBox.X2 -= 
mpScrollBar->GetSize();
+else
+aNewTextBoundingBox.X1 += 
mpScrollBar->GetSize();
+}
+mpScrollBar->SetTotalSize(nHeight);
+}
+catch(beans::UnknownPropertyException&)
+{
+OSL_A

Re: [PATCH] Initial/partial implementation of comment control on Writer ...

[Michael Meeks]

On Sun, 2013-01-20 at 15:57 +, Rodolfo Ribeiro Gomes (via Code
Review) wrote:
> Initial/partial implementation of comment control on Writer ruler fdo#38246

Wow - that's really nice work :-)

> Lots of incompleted things. But I need feedback and directions.

Hopefully here or ux-advise is good - it looks like there was some
discussion in gerrit too.

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Repository.mk solenv/bin solenv/CustomTarget_concat-deps.mk solenv/Executable_concat-deps.mk solenv/Module_solenv.mk solenv/Package_concat-deps.mk

[Matúš Kukan]

 Repository.mk  |1 +
 solenv/CustomTarget_concat-deps.mk |   25 -
 solenv/Executable_concat-deps.mk   |   16 
 solenv/Module_solenv.mk|3 +--
 solenv/Package_concat-deps.mk  |   14 --
 solenv/bin/concat-deps.c   |7 ---
 6 files changed, 22 insertions(+), 44 deletions(-)

New commits:
commit 4154006248513f488b4ca27345a721b9216ae264
Author: Matúš Kukan 
Date:   Wed Mar 6 16:34:16 2013 +0100

build concat-deps as ordinary executable

Change-Id: I6404472040f38c14ec7ca4a2c51be0d2f7f8199a
Reviewed-on: https://gerrit.libreoffice.org/2659
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/Repository.mk b/Repository.mk
index d0be109..1514afd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 bmp \
 bmpsum \
 cfgex \
+   concat-deps \
 cpp \
 cppunit/cppunittester \
 $(call gb_Helper_optional,CRASHREP,crashrep) \
diff --git a/solenv/CustomTarget_concat-deps.mk 
b/solenv/CustomTarget_concat-deps.mk
deleted file mode 100644
index 6e8d56a..000
--- a/solenv/CustomTarget_concat-deps.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,solenv/concat-deps))
-
-$(eval $(call gb_CustomTarget_register_targets,solenv/concat-deps,\
-   concat-deps$(gb_Executable_EXT_for_build) \
-))
-
-$(call 
gb_CustomTarget_get_workdir,solenv/concat-deps)/concat-deps$(gb_Executable_EXT_for_build)
 : \
-   $(SRCDIR)/solenv/bin/concat-deps.c
-   $(call gb_Output_announce,solenv/concat-deps,$(true),C,1)
-ifeq ($(COM_FOR_BUILD),MSC)
-   LIB="$(ILIB)" $(CC_FOR_BUILD) -nologo $(SOLARINC) -O2 $< -Fo$(dir $@) 
-Fe$(dir $@)
-else
-   $(CC_FOR_BUILD) -O2 $< -o $@
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/Executable_concat-deps.mk b/solenv/Executable_concat-deps.mk
new file mode 100644
index 000..a69b757
--- /dev/null
+++ b/solenv/Executable_concat-deps.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,concat-deps))
+
+$(eval $(call gb_Executable_add_cobjects,concat-deps,\
+   solenv/bin/concat-deps, $(gb_COMPILEROPTFLAGS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 538b4e8..c34dc46 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_Module_add_targets,solenv,\
 
 ifeq ($(CROSS_COMPILING),$(false))
 $(eval $(call gb_Module_add_targets,solenv,\
-   CustomTarget_concat-deps \
-   Package_concat-deps \
+   Executable_concat-deps \
 ))
 endif
 
diff --git a/solenv/Package_concat-deps.mk b/solenv/Package_concat-deps.mk
deleted file mode 100644
index 9ede386..000
--- a/solenv/Package_concat-deps.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,solenv_concat-deps,$(call 
gb_CustomTarget_get_workdir,solenv/concat-deps)))
-
-$(eval $(call 
gb_Package_add_file,solenv_concat-deps,bin/concat-deps$(gb_Executable_EXT_for_build),concat-deps$(gb_Executable_EXT_for_build)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 5550897..575ad78 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -209,7 +209,7 @@ void* data = NULL;
  * this is a simplified implementation that
  * is _not_ thread safe.
  */
-struct pool* pool_create(int size_elem, int flags, int primary, int secondary)
+struct pool* pool_create(int size_elem, int primary, int secondary)
 {
 struct pool* pool;
 
@@ -482,7 +482,7 @@ struct hash* hash;
 if(hash)
 {
 hash->elems_pool = pool_create(sizeof(struct hash_elem),
-   0, size, size << 1);
+   size, size << 1);
 if(!hash->elems_pool)
 {
 hash_destroy(hash);
@@ -499,7 +499,7 @@ unsigned int hashed;
 struct hash_elem* hash_elem;

[PUSHED] build concat-deps as ordinary executable

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2659

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2659
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6404472040f38c14ec7ca4a2c51be0d2f7f8199a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac solenv/gbuild sw/source

[Peter Foley]

 configure.ac|4 +---
 solenv/gbuild/TargetLocations.mk|8 
 solenv/gbuild/platform/com_GCC_class.mk |   14 +++---
 sw/source/ui/dbui/swdbtoolsclient.cxx   |2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit bda200348566da71ae7ec346108bc6a00c22bf12
Author: Peter Foley 
Date:   Sun Mar 10 17:50:29 2013 -0400

add pch support to gcc

Change-Id: I58c11477c1ce48185528db3a8013b5dccf3947c6
Reviewed-on: https://gerrit.libreoffice.org/2653
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/configure.ac b/configure.ac
index d43892c..61eb8ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4394,9 +4394,7 @@ if test -n "$enable_pch" && test "$enable_pch" != "no"; 
then
 if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
 ENABLE_PCH="TRUE"
 AC_MSG_RESULT([yes])
-# GCC PCH support is reportedly a hack that's not very reliable,
-# so support only Clang.
-elif test "$GCC" = "yes" -a "$COM_GCC_IS_CLANG" = "TRUE"; then
+elif test "$GCC" = "yes"; then
 ENABLE_PCH="TRUE"
 AC_MSG_RESULT([yes])
 else
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 6fa782b..68a3c67 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -157,8 +157,8 @@ gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
 gb_Module_get_slowcheck_target = $(WORKDIR)/Module/slowcheck/$(1)
 gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
 gb_Module_get_target = $(WORKDIR)/Module/$(1)
-gb_NoexPrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
-gb_NoexPrecompiledHeader_get_target = 
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_NoexPrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
+gb_NoexPrecompiledHeader_get_target = 
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
 gb_NoexPrecompiledHeader_get_timestamp = 
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
 gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
@@ -167,8 +167,8 @@ gb_Package_get_preparation_target = 
$(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
 gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1)
 gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1)
-gb_PrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
-gb_PrecompiledHeader_get_target = 
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_PrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
+gb_PrecompiledHeader_get_target = 
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
 gb_PrecompiledHeader_get_timestamp = 
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
 gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
 gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index b51a723..b177dae 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -182,12 +182,16 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
 # PrecompiledHeader class
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_PrecompiledHeader_get_enableflags = -include-pch $(call 
gb_PrecompiledHeader_get_target,$(1))
+else
+gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call 
gb_PrecompiledHeader_get_target,$(1 \
+  -I $(dir $(call 
gb_PrecompiledHeader_get_target,$(1)))
+endif
 
-# Clang does not need any extra .o file for PCH
+# Clang and gcc do not need any extra .o file for PCH
 gb_PrecompiledHeader_get_objectfile =
 
 define gb_PrecompiledHeader__command
@@ -209,7 +213,12 @@ endef
 
 # NoexPrecompiledHeader class
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_NoexPrecompiledHeader_get_enableflags = -include-pch $(call 
gb_NoexPrecompiledHeader_get_target,$(1))
+else
+gb_NoexPrecompiledHeader_get_enableflags = -include $(notdir $(subst 
.gch,,$(call gb_NoexPrecompiledHeader_get_target,$(1 \
+  -I $(dir $(call 
gb_NoexPrecompiledHeader_get_target,$(1)))
+endif
 
 gb_NoexPrecompiledHeader_get_objectfile =
 
@@ -229,7 +238,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(call gb_cxx_dep_copy,$(call 
gb_NoexPrecompiledHeader_get_dep_target,$(2))) \
)
 endef
-endif
 
 # YaccTa

[PUSHED] add pch support to gcc

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2653

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2653
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I58c11477c1ce48185528db3a8013b5dccf3947c6
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Initial/partial implementation of comment control on Writer ...

[Cedric Bosdonnat]

On Mon, 2013-03-11 at 09:36 +, Michael Meeks wrote:
> On Sun, 2013-01-20 at 15:57 +, Rodolfo Ribeiro Gomes (via Code
> Review) wrote:
> > Initial/partial implementation of comment control on Writer ruler fdo#38246
> 
>   Wow - that's really nice work :-)
> 
> > Lots of incompleted things. But I need feedback and directions.
> 
>   Hopefully here or ux-advise is good - it looks like there was some
> discussion in gerrit too.

the whole discussion happened on gerrit. Looks good now, but of course
UX and QA feedback is more than welcomed on this new feature.

--
Cedric

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Zolnai Tamás]

 vcl/source/control/combobox.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3a31375528ad3d9fc49f5ab3982e96c9e46fa7af
Author: Zolnai Tamás 
Date:   Sat Mar 9 10:43:40 2013 +0100

Make ComboBox::CalcSize to return the right width

Change-Id: I83f5075281b2edd3f7a5e94709f0529d0c744ff8
Reviewed-on: https://gerrit.libreoffice.org/2612
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 1c99ac2..cc82820 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1146,6 +1146,8 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 
nLines ) const
 aSz.Width() += GetSettings().GetStyleSettings().GetScrollBarSize();
 }
 
+aSz.Width() += ImplGetExtraOffset() * 2;
+
 aSz = CalcWindowSize( aSz );
 return aSz;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Make ComboBox::CalcSize to return the right width

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2612

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved
  Fridrich Strba: 


-- 
To view, visit https://gerrit.libreoffice.org/2612
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I83f5075281b2edd3f7a5e94709f0529d0c744ff8
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: shell/source

[Stephan Bergmann]

 shell/source/unix/misc/senddoc.sh |   37 ++---
 1 file changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 5c32ac5104e9cade52c8a373033644282de9ceff
Author: Stephan Bergmann 
Date:   Mon Mar 11 11:00:49 2013 +0100

fdo#60701: Properly quote shell parameter expansions

...and revert bogus c1f02657ccece20a1e5843c78115ffcb193eb459 "Fixes 
fdo#60701 by
escaping uri-encode path correctly" again.

Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index d953741..2002c3d 100644
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -17,8 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-URI_ENCODE="`dirname $0`/uri-encode"
-URI_ENCODE=`printf "%b" "$URI_ENCODE"`
+URI_ENCODE=`dirname "$0"`/uri-encode
 FOPTS=""
 sd_platform=`uname -s`
 
@@ -106,7 +105,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --attach)
-ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | 
${URI_ENCODE}`
+ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -240,23 +239,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --subject)
-MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --body)
-MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --attach)
-MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -282,23 +281,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --subject)
-MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --body)
-MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --attach)
-MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo 
"file://$2" | ${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo 
"file://$2" | "${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -359,7 +358,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 case $1 in
 --attach)
 #i95688# fix filenames containing accented chars, whatever 
alien
-ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | 
${URI_ENCODE}`
+ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -401,23 +400,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
   

[Libreoffice-commits] core.git: connectivity/source dbaccess/source extensions/source forms/source framework/inc oox/source package/source padmin/source scaddins/source sdext/source sfx2/source store/

[Thomas Arnhold]

 connectivity/source/commontools/AutoRetrievingBase.cxx |2 +-
 connectivity/source/drivers/ado/AConnection.cxx|2 +-
 connectivity/source/drivers/hsqldb/HDriver.cxx |2 +-
 dbaccess/source/core/dataaccess/ModelImpl.hxx  |2 +-
 extensions/source/plugin/base/context.cxx  |2 +-
 extensions/source/plugin/base/manager.cxx  |2 +-
 extensions/source/plugin/base/xplugin.cxx  |4 ++--
 forms/source/xforms/model_ui.cxx   |2 +-
 framework/inc/queries.h|4 ++--
 oox/source/drawingml/textfield.cxx |2 +-
 package/source/manifest/ManifestImport.cxx |2 +-
 padmin/source/cmddlg.cxx   |   16 
 padmin/source/padialog.cxx |4 ++--
 padmin/source/prtsetup.cxx |2 +-
 scaddins/source/pricing/pricing.cxx|   16 
 sdext/source/pdfimport/filterdet.cxx   |2 +-
 sfx2/source/appl/appuno.cxx|2 +-
 sfx2/source/doc/docfile.cxx|6 +++---
 sfx2/source/doc/graphhelp.cxx  |2 +-
 sfx2/source/doc/sfxbasemodel.cxx   |4 ++--
 store/source/lockbyte.cxx  |2 +-
 svgio/source/svgreader/svgtoken.cxx|2 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx  |2 +-
 svx/source/xml/xmleohlp.cxx|2 +-
 svx/workben/msview/xmlconfig.cxx   |2 +-
 sw/source/filter/xml/xmlimpit.cxx  |2 +-
 sw/source/ui/uno/unotxdoc.cxx  |2 +-
 ucb/source/ucp/file/bc.cxx |2 +-
 ucb/source/ucp/webdav/SerfSession.cxx  |4 ++--
 vcl/aqua/source/dtrans/DataFlavorMapping.cxx   |2 +-
 vcl/aqua/source/dtrans/OSXTransferable.cxx |2 +-
 vcl/generic/fontmanager/helper.cxx |6 +++---
 vcl/generic/print/genprnpsp.cxx|   10 +-
 vcl/headless/svpprn.cxx|2 +-
 vcl/source/gdi/pdfwriter_impl.cxx  |2 +-
 vcl/unx/generic/dtrans/X11_selection.cxx   |4 ++--
 vcl/unx/generic/printer/cupsmgr.cxx|6 +++---
 vcl/unx/generic/printer/printerinfomanager.cxx |4 ++--
 vcl/unx/gtk/app/gtkinst.cxx|2 +-
 xmlhelp/source/cxxhelp/provider/databases.cxx  |   14 +++---
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx   |2 +-
 xmloff/source/draw/eventimp.cxx|2 +-
 xmloff/source/style/shadwhdl.cxx   |2 +-
 xmloff/source/transform/StyleOASISTContext.cxx |2 +-
 xmloff/source/transform/TransformerBase.cxx|2 +-
 45 files changed, 82 insertions(+), 82 deletions(-)

New commits:
commit 937b63af3322f7f8b5e869b2c7431a2deaec3113
Author: Thomas Arnhold 
Date:   Sat Mar 9 22:47:20 2013 +0100

use startsWith() instead of compareToAscii()

brain damage...

Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff

diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx 
b/connectivity/source/commontools/AutoRetrievingBase.cxx
index e88fe41..6e39c85 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -27,7 +27,7 @@ namespace connectivity
 OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. 
isAutoRetrievingEnabled is false!");
 sStmt = sStmt.toAsciiUpperCase();
 ::rtl::OUString sStatement;
-if ( sStmt.compareToAscii("INSERT",6) == 0 )
+if ( sStmt.startsWith("INSERT") )
 {
 sStatement = m_sGeneratedValueStatement;
 static const ::rtl::OUString 
sColumn(RTL_CONSTASCII_USTRINGPARAM("$column"));
diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index 2b24b24..9ffc553 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -106,7 +106,7 @@ void OConnection::construct(const ::rtl::OUString& 
url,const Sequence< PropertyV
 sal_Int32 nLen = url.indexOf(':');
 nLen = url.indexOf(':',nLen+1);
 ::rtl::OUString aDSN(url.copy(nLen+1)),aUID,aPWD;
-if ( aDSN.compareToAscii("access:",7) == 0 )
+if ( aDSN.startsWith("access:") )
 aDSN = aDSN.copy(7);
 
 sal_Int32 nTimeout = 20;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 3f2a96b..d58c8f5 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@

[Libreoffice-commits] core.git:

[Abdulaziz A Alayed]

 0 files changed

New commits:
commit 32e593dc2da4266567cf80ee6bea7917e56572c7
Author: Abdulaziz A Alayed 
Date:   Sat Mar 9 15:35:45 2013 +0300

fdo#57422 fixing scroll bar and slides position

fixing scroll bar position and  slides sorter of  note view and slides if
the interface language is RTL .

Change-Id: I80b55dff621d6b994095ad7a4979bcca63371edf
Change-Id: Ibc7c8992b8f177742dc52df2615a2d32a2a22713
Reviewed-on: https://gerrit.libreoffice.org/2614
Reviewed-by: Faisal al-otaibi 
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] use startsWith() instead of compareToAscii()

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2621


-- 
To view, visit https://gerrit.libreoffice.org/2621
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Chris Sherlock 
Gerrit-Reviewer: Thomas Arnhold 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#57422 fixing scroll bar and slides position

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2614

Approvals:
  Faisal al-otaibi: Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2614
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc7c8992b8f177742dc52df2615a2d32a2a22713
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulaziz A Alayed 
Gerrit-Reviewer: Faisal al-otaibi 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LOADays 2013 CFP

[Florian Effenberger]

Hello,

I received this invitation, but I can't make it. If someone of you wants 
to take it, feel free to do so!


Florian


 Original Message 
Subject: LOADays 2013 CFP
Date: Mon, 25 Feb 2013 11:06:47 +0100
To: Florian Effenberger 

Dear,

As a potential speaker for LOADays, we would like to invite you again to
submit a presentation for LOADays 2013.
LOADays 2013 takes place on 6/04/2013 and 7/04/2013 in Antwerp.
To submit a Call-for-Presenation please follow one of the two following
posibilities :
- Email : Send your proposal to c...@loadays.org with following info :
* title of your talk
* abstract
* some info about yourself
- Send a Github Pull Request : Fork the pelican-site repo at
https://github.com/loadays/pelican-site and add your proposal to the
content/proposals dir. Send us a Pull Request.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: [Libreoffice-ux-advise] [libreoffice-accessibility] keyboard accessibility of new template manager - fdo#61390

[V Stuart Foote]

From: Markus Mohrhard [markus.mohrh...@googlemail.com]
Sent: Friday, March 08, 2013 3:13 AM

>Thanks a lot for your effort rising awareness of these problems. If
>you think it is a general problem that we are not paying enough
>attention on accessibility support in new dialogs it would be nice if
>you could give us some examples so that we can discuss how we can
>improve our workflow in the future.

Markus,

I will try to do exactly that and find an appropriate spot on the Wiki to 
clarify design and development requirements for support of Assistive 
Technologies and accessibility, probably with some linkage to standards work of 
the cognizant organizations.

In the meanwhile, testing and understanding requirements for including 
accessibility is well within the grasp of ANY developer or user of 
LibreOffice--we just don't think about it.

Here is my simple guide--and I am not being flippant--this is a reasonable 
demonstration.
 
So, if on a GNOME Linux, activate ORCA, on Windows JAWS or NVDA, on OSX 
VoiceOver--then launch LibreOffice.

Now close your eyes (or put on a blind fold) and try to write a document--I 
won't suggest a spreadsheet, or presentation, or even an illustration although 
why not?

How does that work for you? Is the new Template Manager effective?

If we are meeting our responsibilities as supporters of 
LibreOffice--developers, designers, QA, even users--we should be equally 
effective working with the Assistive Technologies support exposed with UNO 
Accessibility API as with moving a cursor with a mouse.  Anything less and we 
are not meeting our responsibilities. If the GUI can not be made to talk, and 
does not follow reasonable hierarchical structures AT support falters. 

Put another way, if we can not drive the interface without peeking, how is 
someone who does not have that option to cope?  

Additionally, think of the challenge if you can not point with a mouse or type 
on the keyboard, are we helping those users.

Stuart

Cross posting to the devs, and accessibility lists, so apologize now to all who 
receive multiple copies of this post. And again this is not intended to be 
flippant response, I am simply asking folks to consider accessibility aspect of 
their individual design and development efforts.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

XSLX import/export filter funding

[Runar Ingebrigtsen]

Hi everyone,

I am having the pleasure of deploying LibreOffice to 50 employees at a
local business.

Unfortunately, this is hampered by the performance of the xlsx
import/export filters.
Meaning that there are some files, even simple ones, that takes
extremely long time to open.
The same files opens just fine and in seconds in Calligra, for instance.

There are several bugs describing this issue or similar ones:
https://bugs.freedesktop.org/show_bug.cgi?id=30770
https://bugs.freedesktop.org/show_bug.cgi?id=56259
https://bugs.freedesktop.org/show_bug.cgi?id=56394
https://bugs.freedesktop.org/show_bug.cgi?id=61721

I have started a sponsoring offer for this, and am looking for participants:
http://www.freedomsponsors.org/core/offer/221

Besides, I am trying to get the local business to join the sponsoring.

I can provide more test cases with real world documents, but not in public.

--
Best Regards
Runar Ingebrigtsen

http://rin.no/


signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Google; OOXML and ODF support wrt XSLX import/export filter funding

[Tom Davies]

Hi :)
Moving away from MS formats seems a pretty smart move around now.  There are so 
many different versions of XlsX (2007's version, 2010's and now presumably 
2013's).  


I thought Keith's post was interesting because it seems people have spent some 
serious money just to find out what we already felt was the case.  I think 
Google still are a supporter of TDF but seem to have lost their way a bit.  

Regards from
Tom :)  





>
> From: Keith Curtis 
>To: Zeki Bildirici  
>Cc: market...@global.libreoffice.org 
>Sent: Tuesday, 5 March 2013, 22:50
>Subject: Re: [libreoffice-marketing] Google and ODF support!
> 
>That is amazing. Google wrote this in their analysis of OpenXML:
>(https://forums.scc.ca/forums/scc/dispatch.cgi/public/showFile/100294/d20070705225348/No/objections%20by%20Google.pdf)
>-
>"Although OOXML may formally comply with Ecma, it was clearly not
>designed with an “open” spirit. Comparing the current with the future
>situation, interoperability is likely to become more difficult instead
>of easier. The implementation of a fully compatible ODF importer (the
>current efforts regarding .doc and .xls) is not an easy task, but it
>is dwarfed by the implementation of a fully compatible OOXML importer,
>which we estimate to take something between 50 – 500 person years, or
>even longer. Therefore, although it is theoretically possible to
>generate an OOXML document, this document will probably only use a
>very small subset of the standard.
>In sum, OOXML can be compared to Microsoft giving access to a
>labyrinth to which it alone owns a map; moreover, certain tunnels
>within this labyrinth are not accessible without a key that only
>Microsoft has, and that third parties would need to replicate first.
>(And, in doing so, these third parties would not know whether they
>would violate any rights that exposes them to litigation)."
>-
>
>It is sort of sad Google would reverse course and act against their
>own interests. Also, I wonder why they didn't help to port LibreOffice
>rather than buying QuickOffice. The current Android efforts in
>LibreOffice are less than one person I believe. Imagine what Google
>could have done with 5-10, let alone buying the proprietary
>QuickOffice which employed 400 people.
>(http://seattletimes.com/html/localnews/2018361838_apustecgoogleofficeapps1stldwritethru.html)
>I suspect part of their decision was that they didn't want to take a
>risk on "LibreOffice", but it does seem they have too much money.
>
>-Keith
>
>On Tue, Mar 5, 2013 at 1:38 PM, Zeki Bildirici  wrote:
>> Hi,
>>
>> As you know Google currently is not supporting Open Document Format
>> native in its services. Today i saw this article
>> http://www.muktware.com/4529/why-google-killing-open-document-formats#.UTYr7U44lHE.twitter
>> and remembered this issue.
>>
>> This article explains the situation quite well. I don't know the
>> reason why Google does not support ODF, maybe it was discussed here
>> before. But i think we may try to push Google to support ODF.
>>
>> I don't think there is a reasonable explanation for ignoring ODF and
>> supporting MS Office formats and forcing people to convert their ODF
>> to Google Docs format.
>>
>> Btw for comparasion, -yes not Skydrive of course- Yandex company with
>> growing popularity in Turkey and Russia supports ODF in its Disk
>> service. It may be an example for good aproach to ODF.
>>
>> What do you think about Google's positioning for ODF? Can we manage to
>> force/attract Google to support ODF? I've mentioned and asked
>> htps://twitter.com/cdibona about this matter but no replies yet
>>
>> Best regards,
>> Zeki
>>
>>
>> - http://support.google.com/drive/bin/answer.py?hl=en&answer=2423485
>>
>> --
>> Unsubscribe instructions: E-mail to marketing+h...@global.libreoffice.org
>> Problems? 
>> http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
>> Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
>> List archive: http://listarchives.libreoffice.org/global/marketing/
>> All messages sent to this list will be publicly archived and cannot be 
>> deleted
>>
>
>-- 
>Unsubscribe instructions: E-mail to marketing+h...@global.libreoffice.org
>Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
>Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
>List archive: http://listarchives.libreoffice.org/global/marketing/
>All messages sent to this list will be publicly archived and cannot be deleted
>
>
>___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: --enable-pch option is broken?

[Peter Foley]

David,

Should be fixed now.
you can just run ./solenv/bin/update_pch.sh to auto-regenerate all the pch
files.
Maybe a note should be added somewhere to run it whenever header files are
moved around?

Thanks,

Peter


On Sat, Mar 9, 2013 at 4:20 PM, David Ostrovsky wrote:

>  Hi,
>
> on 2013-03-02 06:59:39 that commit
> d221ae0092568e096f3850344a59ec27b4ea8efa
> moved "svtools/fltcall.hxx" from svtools to
> vcl/inc/vcl/fltcall.hxx
>
> on 2013-03-07 this gerrit change was (twice) failing to build on Windows
> only
> https://gerrit.libreoffice.org/#/c/2578/u
> with the error:
>
> c:\lo\gerrit_core\svx\inc\pch\precompiled_svxcore.hxx(510) : fatal error
> C1083: Cannot open include file: 'svtools/fltcall.hxx': No such file or
> directory
>  make[1]: *** 
> [C:/lo/gerrit_core/workdir/wntmsci13.pro/PrecompiledHeader/nodebug/precompiled_svxcore.hxx.pch]
> Error 2
>
> Looking for that moved svtools/fltcall.hxx in the old location.
>
> If cou check the corresponding log you can see, that '--enable-pch'
> option is enabled on that TB:
> https://ci.libreoffice.org/job/buildbot/339/?
>
> Can we please somehow fix that or remove that option from tinderbox?
> In the end nothing is more annoying then a broken tool chain.
>
> Thanks
> David
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: editeng/source

[Tor Lillqvist]

 editeng/source/editeng/impedit3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 494f9304086de829b0ab372b35c337bc50236f33
Author: Tor Lillqvist 
Date:   Mon Mar 11 11:47:25 2013 +0200

Fix fallout from 3137258e346a9c16b2e61747fd926a1e7d358d02

WaE: expression which evaluates to zero treated as a null pointer
constant of type 'OutputDevice *'.

In this case, I think the code would have worked despite the scary
warning. (By luck, as the sal_False got passed as a NULL OutputDevice
pointer, and the following sal_Boolean parameter, which the sal_False
presumably was intended to mean, has the default value of sal_False.)
But better to make it more explicit which overload of Paint() is
intended.

But seriously, what good is supposed to come from the overloading of
the function name Paint() here? Would it really be so horribly
old-fashioned and C-like to use two different function names for the
slightly different use cases?

Change-Id: Ib397c8c1785320d3a9c0579a24f2c28ee4d22796

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index dbc6910..fd88e88 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3722,7 +3722,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const 
Rectangle& rRec, OutputDevi
 DBG_ASSERT( bVDevValid, "VDef could not be enlarged!" );
 if ( !bVDevValid )
 {
-Paint( pView, rRec, sal_False /* ohne VDev */ );
+Paint( pView, rRec, 0, sal_False /* ohne VDev */ );
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/uiconfig extensions/test liborcus/vsprojects officecfg/registry oox/source

[Borim]

 basctl/uiconfig/basicide/toolbar/dialogbar.xml  |2 
+-
 basctl/uiconfig/basicide/toolbar/macrobar.xml   |2 
+-
 extensions/test/ole/EventListenerSample/EventListener/EventListener.sln |1 
-
 extensions/test/ole/VisualBasic/Project1.sln|1 
-
 extensions/test/ole/VisualBasic/Project1.vbproj |2 
+-
 liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj |2 
+-
 liborcus/vsprojects/liborcus/DefaultConfig.props|2 
+-
 liborcus/vsprojects/liborcus/zLib.props |2 
+-
 officecfg/registry/data/org/openoffice/Office/Compatibility.xcu |2 
+-
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu   |2 
+-
 oox/source/drawingml/customshapes/presetShapeDefinitions.xml|2 
+-
 11 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit b3c81cb3aa81fe00be78ee5c247e0addd3635fa7
Author: Borim 
Date:   Sun Mar 10 17:15:49 2013 +0100

remove remaining UTF bom

Change-Id: I3a24a7af782f538cdfad4cc58328c5ab7412c2cc
Reviewed-on: https://gerrit.libreoffice.org/2644
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/basctl/uiconfig/basicide/toolbar/dialogbar.xml 
b/basctl/uiconfig/basicide/toolbar/dialogbar.xml
index 850e74a..b6bd33b 100644
--- a/basctl/uiconfig/basicide/toolbar/dialogbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/dialogbar.xml
@@ -1,4 +1,4 @@
-
+
 
 

[PUSHED] remove remaining UTF bom

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2644

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2644
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a24a7af782f538cdfad4cc58328c5ab7412c2cc
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Borim 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Google; OOXML and ODF support wrt XSLX import/export filter funding

[Tor Lillqvist]

No technical content, take this to the "discuss" list please.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: android/sdremote

[Michael Meeks]

 android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 
   6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b5e6c7d278abd618ce79a7e0a37bda176bd65619
Author: Michael Meeks 
Date:   Mon Mar 11 10:28:51 2013 +

fdo#60604 - tag notes text as UTF-8.

Change-Id: I535cdae8c742e5b260d73bd000f9354cfe04b854

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index bb24d40a7..60e16a3 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
 mNotes = (WebView) v.findViewById(R.id.presentation_notes);
 
 String summary = "This is just a testAnd 
itemAnd againMore 
textBlablaBlablablablaBlabla";
-mNotes.loadData(summary, "text/html", null);
+mNotes.loadData(summary, "text/html", "UTF-8");
 mNotes.setBackgroundColor(Color.TRANSPARENT);
 
 mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -157,7 +157,7 @@ public class PresentationFragment extends SherlockFragment {
 mNumberText.setText((aPosition + 1) + "/"
 + mCommunicationService.getSlideShow().getSize());
 mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), "text/html", null);
+.getNotes(aPosition), "text/html", "UTF-8");
 }
 
 // -- RESIZING LISTENER 

@@ -282,7 +282,7 @@ public class PresentationFragment extends SherlockFragment {
 int aPosition = aIntent.getExtras().getInt("slide_number");
 if ( aPosition == mTopView.getSelectedItemPosition() ) {
 mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), "text/html", null);
+.getNotes(aPosition), "text/html", 
"UTF-8");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sfx2/inc sfx2/source sw/source sw/uiconfig sw/UI_swriter.mk

[Caolán McNamara]

 sfx2/inc/sfx2/tabdlg.hxx  |1 
 sfx2/source/dialog/tabdlg.cxx |9 -
 sw/UI_swriter.mk  |1 
 sw/source/ui/config/optpage.cxx   |  135 +++--
 sw/source/ui/inc/optpage.hxx  |   21 +--
 sw/uiconfig/swriter/ui/opttestpage.ui |  212 ++
 6 files changed, 269 insertions(+), 110 deletions(-)

New commits:
commit 8e0053560a92b5d96b3d896f680b0ef3ad647812
Author: Caolán McNamara 
Date:   Mon Mar 11 09:57:15 2013 +

post writer test page conversion, remove unused ctor

Change-Id: I67bce02ad32e9e35bbd94458a922352567af2ba5

diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index d25a72c..e637187 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -252,7 +252,6 @@ private:
 protected:
 SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
 SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& 
rUIXMLDescription, const SfxItemSet &rAttrSet);
-SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet );
 
 sal_uInt16  GetSlot( sal_uInt16 nWhich ) const
 { return pSet->GetPool()->GetSlotId( nWhich ); }
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index adb3e68..b17b038 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -239,15 +239,6 @@ SfxTabPage::SfxTabPage(Window *pParent, const 
rtl::OString& rID, const rtl::OUSt
 }
 
 // ---
-SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet 
&rAttrSet ) :
-TabPage(pParent, nStyle),
-pSet( &rAttrSet ),
-bHasExchangeSupport ( sal_False ),
-pTabDlg ( NULL ),
-pImpl   ( new TabPageImpl )
-{
-}
-// ---
 
 SfxTabPage::~SfxTabPage()
 
commit c61d8227182611881171f50f112f3bc25499d0e9
Author: Caolán McNamara 
Date:   Mon Mar 11 09:44:45 2013 +

convert writer test tabpage to .ui

Change-Id: I60349c3dd74774e1c5e6fe81d5cb78cf65756f6a

diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index d410de6..060f8b9 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
+   sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
sw/uiconfig/swriter/ui/outlinepositionpage \
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index d28bd4d..e67d58d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2398,64 +2398,21 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl)
 
 #ifdef DBG_UTIL
 
-static void lcl_SetPosSize(Window& rWin, Point aPos, Size aSize)
-{
-aPos = rWin.LogicToPixel(aPos, MAP_APPFONT);
-aSize = rWin.OutputDevice::LogicToPixel(aSize, MAP_APPFONT);
-rWin.SetPosSizePixel(aPos, aSize);
-}
-
-SwTestTabPage::SwTestTabPage( Window* pParent,
-  const SfxItemSet& rCoreSet) :
-SfxTabPage( pParent, WB_HIDE, rCoreSet),
-aTestFL( this, WB_GROUP ),
-aTest1CBox  ( this, 0 ),
-aTest2CBox  ( this, 0 ),
-aTest3CBox  ( this, 0 ),
-aTest4CBox  ( this, 0 ),
-aTest5CBox  ( this, 0 ),
-aTest6CBox  ( this, 0 ),
-aTest7CBox  ( this, 0 ),
-aTest8CBox  ( this, 0 ),
-aTest9CBox  ( this, 0 ),
-aTest10CBox ( this, 0 ),
-bAttrModified( sal_False )
-{
-lcl_SetPosSize(*this,   Point(0,0), Size(260 , 135));
-lcl_SetPosSize(aTestFL,   Point(6,2), Size(209,8));
-lcl_SetPosSize(aTest1CBox  ,Point(12 , 14), Size(74 , 10));
-lcl_SetPosSize(aTest2CBox  ,Point(12 , 27), Size(74 , 10));
-lcl_SetPosSize(aTest3CBox  ,Point(12 , 40), Size(74 , 10));
-lcl_SetPosSize(aTest4CBox  ,Point(12 , 53), Size(74 , 10));
-lcl_SetPosSize(aTest5CBox  ,Point(12 , 66), Size(74 , 10));
-lcl_SetPosSize(aTest6CBox  ,Point(116, 14), Size(74 , 10));
-lcl_SetPosSize(aTest7CBox  ,Point(116, 27), Size(74 , 10));
-lcl_SetPosSize(aTest8CBox  ,Point(116, 40), Size(74 , 10));
-lcl_SetPosSize(aTest9CBox  ,Point(116, 53), Size(74 , 10));
-lcl_SetPosSize(aTest10CBox  ,   Point(116, 66), Size(74 , 10));
-
-aTestFL.SetText(rtl::OUString("Settings only for testpurposes"));
-aTest1CBox.SetText(rtl::OUString("unused"));
-aTest2CBox.SetText(rtl::OUString("dynamic"));
-aTest3CBox.SetText(rtl::OUString("No calm"));
-aTest4CBox.SetText(rtl::OUString("WYSIWYG debug"));
-aTest5CBox.SetText(rtl::OUString("N

[Libreoffice-commits] core.git: sw/source

[Marcos Paulo de Souza]

 sw/source/core/attr/format.cxx|5 -
 sw/source/core/bastyp/swcache.cxx |   69 
 sw/source/core/frmedt/fetab.cxx   |6 --
 sw/source/filter/html/css1atr.cxx |  108 +-
 sw/source/ui/envelp/envlop1.cxx   |   16 +
 sw/source/ui/envelp/label1.cxx|   16 +
 sw/source/ui/fldui/changedb.cxx   |   12 +---
 sw/source/ui/uiview/pview.cxx |6 --
 sw/source/ui/uiview/viewsrch.cxx  |5 -
 sw/source/ui/utlui/content.cxx|   13 +---
 sw/source/ui/wrtsh/wrtundo.cxx|   16 +
 11 files changed, 80 insertions(+), 192 deletions(-)

New commits:
commit 84931eb8aeeb55a2570edb24f5c2d3409f9c2398
Author: Marcos Paulo de Souza 
Date:   Sun Mar 10 11:22:28 2013 -0300

fdo#57950: Removed some chained appends from sw

Change-Id: I5b78b4a8f2fc0fb0c4a67042ac4924e375c2d63a

diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 4524937..7463ed81 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 TYPEINIT1( SwFmt, SwClient );
@@ -224,9 +223,7 @@ SwFmt::~SwFmt()
 SwFmt* pParentFmt = DerivedFrom();
 if( !pParentFmt )
 {
-OSL_FAIL(rtl::OStringBuffer(
-RTL_CONSTASCII_STRINGPARAM("~SwFmt: parent format missing 
from: ")).
-append(rtl::OUStringToOString(GetName(), 
osl_getThreadTextEncoding())).getStr());
+OSL_FAIL("~SwFmt: parent format missing from: " + GetName() );
 }
 else
 {
diff --git a/sw/source/core/bastyp/swcache.cxx 
b/sw/source/core/bastyp/swcache.cxx
index 588d2ce..7fc8909 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -100,61 +100,20 @@ SwCache::~SwCache()
 {
 #ifdef DBG_UTIL
 {
-rtl::OStringBuffer sOut(m_aName);
-
-sOut.append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of new entries: ")).
-append(static_cast(m_nAppend)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of insert on free places:   ")).
-append(static_cast(m_nInsertFree)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of replacements:")).
-append(static_cast(m_nReplace)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of successful Get's:")).
-append(static_cast(m_nGetSuccess)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of failed Get's:")).
-append(static_cast(m_nGetFail)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number or reordering (LRU):")).
-append(static_cast(m_nToTop)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of suppressions:")).
-append(static_cast(m_nDelete)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of Get's without Index: ")).
-append(static_cast(m_nGetSeek)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of Seek for Get without Index:  ")).
-append(static_cast(m_nAverageSeekCnt)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of Flush calls: " )).
-append(static_cast(m_nFlushCnt)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of flushed objects: ")).
-append(static_cast(m_nFlushedObjects)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of Cache expansions:")).
-append(static_cast(m_nIncreaseMax)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-"Number of Cache reductions:")).
-append(static_cast(m_nDecreaseMax)).
-append('\n');
+OString sOut(m_aName + "\n" +
+"Number of new entries: " + 
OString::number(m_nAppend) + "\n" +
+"Number of insert on free places:   " + 
OString::number(m_nInsertFree) + "\n" +
+"Number of replacements:" + 
OString::number(m_nReplace) + "\n" +
+"Number of successful Get's:" + 
OString::number(m_nGetSuccess) + "\n" +
+"Number of failed Get's:" + 
OString::number(m_nGetFail) + "\n" +
+"Number or reordering (LRU):" + 
OString::number(

[PUSHED] fdo#57950: Removed some chained appends from sw

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2643


-- 
To view, visit https://gerrit.libreoffice.org/2643
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b78b4a8f2fc0fb0c4a67042ac4924e375c2d63a
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Korrawit Pruegsanusak 
Gerrit-Reviewer: Thomas Arnhold 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/qa

[Noel Power]

 sc/qa/extras/macros-test.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 1a000b74be76483ec986e66d46603b693cca0927
Author: Noel Power 
Date:   Fri Mar 8 13:49:57 2013 +

now that vba import is fixed re-enable the subsequentcheck tests

Change-Id: I757e4affaece0d2dc2c1d3174669afdc27d38da3

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index a4923cd..972b009 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -116,7 +116,6 @@ void ScMacrosTest::testVba()
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")),
 },
-#if VBAIMPORTFIXED// currently master seems to fail to import vba for these 
docs
 {
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
@@ -192,7 +191,6 @@ void ScMacrosTest::testVba()
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
 },
 #endif
-#endif
 };
 
 for ( sal_uInt32  i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libmariadb/my_config.h

[Fridrich Štrba]

 libmariadb/my_config.h |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6f2b78da216dd87376e9766a3041ddbbce5bf7e9
Author: Fridrich Å trba 
Date:   Mon Mar 11 11:53:07 2013 +0100

MAC does not have ulong, so don't use it

Change-Id: I88708fdae8f0f7e26e2cc05992fa49b13ed96bd3

diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h
index 2626545..c026a27 100644
--- a/libmariadb/my_config.h
+++ b/libmariadb/my_config.h
@@ -156,7 +156,6 @@
 #define HAVE_SIGSET_T 1
 #define HAVE_SIZE_T 1
 #define HAVE_UINT 1
-#define HAVE_ULONG 1
 #define SOCKET_SIZE_TYPE socklen_t
 
 #define RETSIGTYPE void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |8 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2ef7e2fc523b1b7e2fbb129b1abaf220e01dfbeb
Author: Petr Mladek 
Date:   Mon Mar 11 11:25:41 2013 +0100

Bump for 3.6-15

Change-Id: I6bd8fce34295e49d0128cf2456d5baf2f822440f

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index fbc383e..4dbc859 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 14
+WINDOWSPATCHLEVEL 15
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-314
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-515
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-314
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-515
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-314
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-515
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 7a101e1..0ec106a 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:314)
-BUILD=314
+RSCREVISION=360m1(Build:515)
+BUILD=515
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

thank you

[Kim YongRim]

Hi
Thank you, I am sorry disturbing you.whoud you like to help me? I think you do 
so.I would like to ask you serveral questions.1. Have you LO project's 
requirement specifications?2. Have you LO project's architecture design, each 
kind of design document related with architecture design? for exmaple, class 
diagram, use-case diagram, dependency and etc.3. Now I am conding in Linux 
konsole, have you other developmet tools like MS visual studio or Eclipse and 
where do you work in ? What developmet tools do you use?4. Today, LO is very 
much large and heavy. It needs high cpu and memory.   From here, you lost lots 
of user. have you  solution it? If you have, what is it?5. In future, Offline 
Office would disappear and Web Office like google doc is used widely. I make 
WebOffice by using LO, is it possible?6. what is the difference between AOO and 
LO?I wait your kindness answer.
Bye..



  ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: use startsWith() instead of compareToAscii()

[Stephan Bergmann]

On 03/11/2013 11:10 AM, Thomas Arnhold wrote:

commit 937b63af3322f7f8b5e869b2c7431a2deaec3113
Author: Thomas Arnhold 
Date:   Sat Mar 9 22:47:20 2013 +0100

 use startsWith() instead of compareToAscii()

 brain damage...

 Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff

[...]

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 3f2a96b..d58c8f5 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -399,7 +399,7 @@ namespace connectivity
  {
  sal_Bool bEnabled = sal_False;
  OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in 
jfw_getEnabled" );
-return bEnabled  && 
url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 0;
+return bEnabled  && url.startsWith("sdbc:embedded:hsqldb");


Note that sizeof("...") == strlen("...") + 1, so the call to 
compareToAscii included the terminating NUL of the string literal in the 
comparison, so would never have returned zero (unless url contained 
embedded NUL characters, which is unlikely).


Not sure about the details of that sdbc URL scheme, whether what one 
wants there is url.startsWith("sdbc:embedded:hsqldb") or 
url.startsWith("sdbc:embedded:hsqldb:") or url=="sdbc:embedded:hsqld" 
(and, while we are at it, at least for the initial "sdbc" part, URI 
syntax would mandated case-insensitive comparison anyway, unless the 
given url is known to be normalized to lowercase), but maybe Lionel 
knows more.


Stephan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: codemaker/source

[Stephan Bergmann]

 codemaker/source/cppumaker/cpputype.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d7cc6792aa84003e5f2e09c1f1baa7657de9621
Author: Stephan Bergmann 
Date:   Mon Mar 11 12:16:37 2013 +0100

css.beans.PropertyValue references css.beans.PropertyState

...so include the latter in isBootstrapType too, see
dee53a32a9feba2021782db5762b5a9a034efae4 "Temporary hack around
cppu_detail_getCppuType variants violating ODR."

Change-Id: I613cf3d8699eccb149e0e1d31f4398a426ce0966

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index c348729..5513d24 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -73,6 +73,7 @@ rtl::OString translateSimpleUnoType(rtl::OString const & 
unoType, bool cppuUnoTy
 bool isBootstrapType(rtl::OString const & name) {
 static char const * const names[] = {
 "com/sun/star/beans/PropertyAttribute",
+"com/sun/star/beans/PropertyState",
 "com/sun/star/beans/PropertyValue",
 "com/sun/star/beans/XFastPropertySet",
 "com/sun/star/beans/XMultiPropertySet",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: need help with debugging

[Stephan Bergmann]

On 03/11/2013 10:12 AM, Matúš Kukan wrote:

I am quite ashamed I still have no idea how to debug properly.
Maybe someone here could teach me a bit.

I've this cross-compiled --enable-mergelibs backtrace and no idea what
to learn from it.
It does not happen without --enable-mergelibs.


Hard to give any better advice here than "cppu_detail_getUnoType rang a 
bell about ODR violations and 
 
'Temporary hack around cppu_detail_getCppuType variants violating ODR.'" 
 Should be fixed now with 
 
"css.beans.PropertyValue references css.beans.PropertyState."


Stephan


Program received signal SIGSEGV, Segmentation fault.
0x44c76644 in (anonymous namespace)::newTypeDescription
(ppRet=0xbeffeb74, eTypeClass=typelib_TypeClass_STRUCT,
pTypeName=0x47c90f18, pType=0x0, nMembers=4, pCompoundMembers=0x0,
pStructMembers=0xbeffeb34)
 at /home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx:862
862 /home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx: No
such file or directory.
(gdb) bt
#0  0x44c76644 in (anonymous namespace)::newTypeDescription
(ppRet=0xbeffeb74, eTypeClass=typelib_TypeClass_STRUCT,
pTypeName=0x47c90f18, pType=0x0, nMembers=4, pCompoundMembers=0x0,
pStructMembers=0xbeffeb34)
 at /home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx:862
#1  0x44c76908 in typelib_typedescription_newStruct (ppRet=0xbeffeb74,
pTypeName=0x47c90f18, pType=0x0, nMembers=4, pMembers=0xbeffeb34) at
/home/matus/git/libo-cross/cppu/source/typelib/typelib.cxx:919
#2  0x407877d4 in
com::sun::star::beans::detail::thePropertyValueType::operator()
(this=0xbeffebec) at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/udkapi/com/sun/star/beans/PropertyValue.hpp:62
#3  0x40787a34 in rtl::StaticWithInit::get ()
 at /home/matus/git/libo-cross/solver/unxlngr.pro/inc/rtl/instance.hxx:603
#4  0x407878c0 in com::sun::star::beans::cppu_detail_getUnoType () at
/home/matus/git/libo-cross/solver/unxlngr.pro/inc/udkapi/com/sun/star/beans/PropertyValue.hpp:73


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#60701: Properly quote shell parameter expansions

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2661

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/2661/1

fdo#60701: Properly quote shell parameter expansions

(cherry picked from commit 5c32ac5104e9cade52c8a373033644282de9ceff)
Conflicts:
shell/source/unix/misc/senddoc.sh

Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82
---
M shell/source/unix/misc/senddoc.sh
1 file changed, 18 insertions(+), 18 deletions(-)



diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index 0ff1594..2002c3d 100644
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -17,7 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-URI_ENCODE="`dirname $0`/uri-encode"
+URI_ENCODE=`dirname "$0"`/uri-encode
 FOPTS=""
 sd_platform=`uname -s`
 
@@ -105,7 +105,7 @@
 shift
 ;;
 --attach)
-ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | 
${URI_ENCODE}`
+ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -239,23 +239,23 @@
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --subject)
-MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --body)
-MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --attach)
-MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -281,23 +281,23 @@
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --subject)
-MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --body)
-MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --attach)
-MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo 
"file://$2" | ${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo 
"file://$2" | "${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -358,7 +358,7 @@
 case $1 in
 --attach)
 #i95688# fix filenames containing accented chars, whatever 
alien
-ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | 
${URI_ENCODE}`
+ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -400,23 +400,23 @@
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --s

Re: [PUSHED] Fixes fdo#60701 by escaping uri-encode path correctly

[Stephan Bergmann]

On 03/09/2013 12:05 PM, Stephan Bergmann wrote:

On 03/08/2013 08:47 PM, Arnaud Versini wrote:

My mistake, the good way I think is %q, not %b, is it correct or not ?


While that would solve the second part of the problem at least for Linux
(as %q is not Posix) I guess, the much simpler and more idiomatic
solution is to properly quote all uses of ${URI_ENCODE} in the script as
"${URI_ENCODE}".

And, for the first part of the problem, you still need to properly quote
the argument to dirname, as given below.


Took the liberty to do that fix myself now, 
 
"fdo#60701: Properly quote shell parameter expansions," to increase 
chances to get this little low-risk fix into LO 4.0.2 still, 
.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - shell/source

[Stephan Bergmann]

 shell/source/unix/misc/senddoc.sh |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 4b49fa35226791e3ee262af7f2ce664aa3d38424
Author: Stephan Bergmann 
Date:   Mon Mar 11 11:00:49 2013 +0100

fdo#60701: Properly quote shell parameter expansions

(cherry picked from commit 5c32ac5104e9cade52c8a373033644282de9ceff)
Conflicts:
shell/source/unix/misc/senddoc.sh

Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82
Reviewed-on: https://gerrit.libreoffice.org/2661
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index 0ff1594..2002c3d 100644
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -17,7 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-URI_ENCODE="`dirname $0`/uri-encode"
+URI_ENCODE=`dirname "$0"`/uri-encode
 FOPTS=""
 sd_platform=`uname -s`
 
@@ -105,7 +105,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --attach)
-ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | 
${URI_ENCODE}`
+ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -239,23 +239,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --subject)
-MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --body)
-MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --attach)
-MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -281,23 +281,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --bcc)
-MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --subject)
-MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --body)
-MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 --attach)
-MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo 
"file://$2" | ${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo 
"file://$2" | "${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -358,7 +358,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 case $1 in
 --attach)
 #i95688# fix filenames containing accented chars, whatever 
alien
-ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | 
${URI_ENCODE}`
+ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | 
"${URI_ENCODE}"`
 shift
 ;;
 *)
@@ -400,23 +400,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | 
${URI_ENCODE}`
+MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo 

[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-15'

[Petr Mladek]

Tag 'suse-3.6-15' created by Petr Mladek  at 2013-03-11 11:56 
-0700

Tag suse-3.6-15
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlE9uHAACgkQKZC06p8y5oP44wCfcjo5nNdGMqYrydrg/+M5esvk
WZ8An2UTW0ZWrQgr8WmliCifsDpoIN8R
=j41k
-END PGP SIGNATURE-

Changes since suse-3.6-14-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-15'

[Libreoffice Gerrit user]

Tag 'suse-3.6-15' created by Petr Mladek  at 2013-03-11 11:56 
-0700

Tag suse-3.6-15
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlE9uHAACgkQKZC06p8y5oO85gCeKTxyIXko/GG6C1oeoLwEOamj
N7gAmQGLCPb8HX+gChMxsS/+QZBQxGO4
=hyML
-END PGP SIGNATURE-

Changes since suse-3.6-14:
Petr Mladek (1):
  Release SUSE 3.6-15, build id 515, Linux version 3.6.5.2.15, tag 
suse-3.6-15

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-15'

[Petr Mladek]

Tag 'suse-3.6-15' created by Petr Mladek  at 2013-03-11 11:56 
-0700

Tag suse-3.6-15
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlE9uHAACgkQKZC06p8y5oN7dgCeOMqmGeLjUZ+dBqE58i8K/57V
RPEAoIRWGN/f0r0RfJ0YDH7aIxzNV/Yl
=48J9
-END PGP SIGNATURE-

Changes since suse-3.6-14:
Petr Mladek (1):
  Release SUSE 3.6-15, build id 515, Linux version 3.6.5.2.15, tag 
suse-3.6-15

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-15'

[Petr Mladek]

Tag 'suse-3.6-15' created by Petr Mladek  at 2013-03-11 11:56 
-0700

Tag suse-3.6-15
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlE9uHAACgkQKZC06p8y5oNQ2QCeLsUzB5zg7elvG7wMZ7Adx8xZ
ZzkAnAhvssblv9EsB0ov1JNeiHqIYlPx
=shs/
-END PGP SIGNATURE-

Changes since suse-3.6-14:
Petr Mladek (1):
  Release SUSE 3.6-15, build id 515, Linux version 3.6.5.2.15, tag 
suse-3.6-15

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-15'

[Petr Mladek]

Tag 'suse-3.6-15' created by Petr Mladek  at 2013-03-11 11:56 
-0700

Tag suse-3.6-15
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlE9uHAACgkQKZC06p8y5oPZvACghiTL4rPTzkTkQuqmDH6FCkum
KGcAn10izmFmXsbeVBYv/FAp1snPE6wE
=zV8E
-END PGP SIGNATURE-

Changes since suse-3.6-14:
Petr Mladek (1):
  Release SUSE 3.6-15, build id 515, Linux version 3.6.5.2.15, tag 
suse-3.6-15

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

Re: gnumake module deps ...

[Michael Meeks]

On Sat, 2013-03-09 at 23:39 +0100, David Ostrovsky wrote:
> You are a funny one ;-)
> First you are starting that project on write only language and then 
> looking for a mantainer??? ;-)

Hah ;-) seems you defeated the write-only language at the first attempt
however; nice work.

> so we have now manual page with developer guide, just try
> bin/module-deps.pl --man

Beautiful - all the changes look great.

> As Stephan pointed out we have "include only" dependencies that we 
> should take care of. Anyway now we have something that start to make sense:
> 
> http://ostrovsky.org/libo/lo.png
> http://ostrovsky.org/libo/lo.graphviz

Nice - then again, it looks a little different ( I rather preferred the
library graph - it seemed simpler - can we have an option to print that
out as well ?).

One thing I noticed in this graph was (perhaps as an artifact of it's
production), that the raft of pure UNO components depending on just
comphelper seems to have mostly gone ;-) which IMHO confuses the
picture; some oddnesses: eg. 'UnoXML' depends on sax and comphelper -
but sax depends on comphelper itself - look like they may point to some
redundant linkages (?).

I suspect that if we instead of do the create_lib_module_map higher up:

my $tree = clean_tree($deps)
my $reduced_tree;
if ($arg_dump_modules) {
$reduced_tree = collapse_libs_to_modules($tree);
} else {
$reduced_tree = $tree;
}
prune_redundant_deps($reduced_tree);
dump_graphviz($reduced_tree);

Where the collapse_libs_to_modules would just build a new list of
collapsed module nodes from the library ones - renaming each of the
library deps as it went.

Then we might get a more precise redundancy pruning & hence prettier /
more minimal graph again. There are other examples of deps that jump out
eg. slideshow->cppcanvas->canvas and also direct ->canvas etc.

> Let me print it on say 2-3 meters and bring it to the next Hackfest/LO 
> Congress ;-)

Quite ! it's starting to look rather sexy.

Having said that if someone can create the graphviz fragment that would
group lots of modules eg. animations, binaryurp, io, desktopbe1 etc.
into a single vertically listed meta-module - then I'd be happy to
collapse the horizontal width to aid readability with that.

Anyhow,

Thanks David !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60701: Properly quote shell parameter expansions

[Eike Rathke (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2661

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2661
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann 
Gerrit-Reviewer: Eike Rathke 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/core/attr/format.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7bcea66a583f67095cb51c1a7a8ab0a49cb493d
Author: Stephan Bergmann 
Date:   Mon Mar 11 12:37:06 2013 +0100

Fix operator + ADL

Change-Id: I141359a978d8547be157d4fba851506a9a1c9041

diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 7463ed81..d38cbca 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -223,7 +223,7 @@ SwFmt::~SwFmt()
 SwFmt* pParentFmt = DerivedFrom();
 if( !pParentFmt )
 {
-OSL_FAIL("~SwFmt: parent format missing from: " + GetName() );
+OSL_FAIL("~SwFmt: parent format missing from: " + 
OUString(GetName()) );
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Creating a libmwaw module for library parsing variaous old M...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2662

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/2662/1

Creating a libmwaw module for library parsing variaous old Mac file-formats

Change-Id: I367dfa309a30a5b55de1d59e632d0dbcf5dc6dbb
---
M RepositoryExternal.mk
M RepositoryModule_host.mk
M config_host.mk.in
M configure.ac
M download.lst
A libmwaw/ExternalPackage_libmwaw.mk
A libmwaw/ExternalProject_libmwaw.mk
A libmwaw/Makefile
A libmwaw/Module_libmwaw.mk
A libmwaw/README
A libmwaw/UnpackedTarball_mwaw.mk
A libmwaw/prj/build.lst
12 files changed, 188 insertions(+), 0 deletions(-)



diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2e36e94..decd7b3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1420,6 +1420,36 @@
 endif # SYSTEM_WPS
 
 
+ifeq ($(SYSTEM_MWAW),YES)
+
+define gb_LinkTarget__use_mwaw
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(MWAW_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(MWAW_LIBS))
+
+endef
+
+else # !SYSTEM_MWAW
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   mwaw-0.1 \
+))
+
+define gb_LinkTarget__use_mwaw
+$(call gb_LinkTarget_use_package,$(1),\
+   libmwaw \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   mwaw-0.1 \
+)
+
+endef
+
+endif # SYSTEM_MWAW
+
+
 ifeq ($(SYSTEM_LCMS2),YES)
 
 define gb_LinkTarget__use_lcms2
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 6cf2e04..e28c9ae 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -113,6 +113,7 @@
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
$(call gb_Helper_optional,LIBPNG,libpng) \
$(call gb_Helper_optional,MSPUB,libmspub) \
+   $(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,ORCUS,liborcus) \
librelogo \
$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/config_host.mk.in b/config_host.mk.in
index 273385b..4f58f21 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -403,6 +403,8 @@
 export MSVC_DLL_PATH=@MSVC_DLL_PATH@
 export MSVC80_DLLS=@MSVC80_DLLS@
 export MSVC80_DLL_PATH=@MSVC80_DLL_PATH@
+export MWAW_CFLAGS=$(gb_SPACE)@MWAW_CFLAGS@
+export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@
 export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
 export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
 export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@
@@ -537,6 +539,7 @@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
 export SYSTEM_MSPUB=@SYSTEM_MSPUB@
+export SYSTEM_MWAW=@SYSTEM_MWAW@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_VISIO=@SYSTEM_VISIO@
diff --git a/configure.ac b/configure.ac
index 61eb8ac..90fd0b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7067,6 +7067,14 @@
 fi
 
 dnl ===
+dnl Check for system libmwaw
+dnl ===
+# libmwaw depends on libwpd that is LGPL, publishing empty flags
+if test $_os != iOS; then
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.1])
+fi
+
+dnl ===
 dnl Check for system libvisio
 dnl ===
 # libvisio depends on libwpd and libwpg and those are LGPL, publishing empty 
flags
diff --git a/download.lst b/download.lst
index aaa735f..149caaf 100644
--- a/download.lst
+++ b/download.lst
@@ -2,6 +2,8 @@
 export CDR_TARBALL := libcdr-0.0.11.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
+MWAW_MD5SUM := be634f72debb6beba9150d5aa5c9
+export MWAW_TARBALL := libmwaw-0.1.7.tar.bz2
 VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
 export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
 
diff --git a/libmwaw/ExternalPackage_libmwaw.mk 
b/libmwaw/ExternalPackage_libmwaw.mk
new file mode 100644
index 000..b541498
--- /dev/null
+++ b/libmwaw/ExternalPackage_libmwaw.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,mwaw))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw,\
+   src/lib/libmwaw.hxx \
+   src/lib/MWAWDocument.hxx \
+   src/lib/MWAWPropertyHandler.hxx \
+))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,build/win32/Release/lib/libmwaw-0.1.lib))
+else
+$(eval $(call 
g

Re: minutes of ESC call ...

[Michael Meeks]

On Sat, 2013-03-09 at 22:11 +0100, Markus Mohrhard wrote:
> Fixed in master now. I reverted the commit introducing the regression
> for as I need some time inspecting what is going on there.

Thanks !

Michael ( who needs to understand the DomainMapper /
  docx importer to get on with his fdo#40594 )
-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: use startsWith() instead of compareToAscii()

[Lionel Elie Mamane]

Thanks Stephan, good catch!

Short version: this was, and should remain, an equality test and not a
"string begins with, but can continue with anything" test.

On Mon, Mar 11, 2013 at 12:05:40PM +0100, Stephan Bergmann wrote:
> On 03/11/2013 11:10 AM, Thomas Arnhold wrote:
> >commit 937b63af3322f7f8b5e869b2c7431a2deaec3113
> >Author: Thomas Arnhold 
> >Date:   Sat Mar 9 22:47:20 2013 +0100
> >
> > use startsWith() instead of compareToAscii()
> >
> > brain damage...
> >
> > Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff
> [...]
> >diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
> >b/connectivity/source/drivers/hsqldb/HDriver.cxx
> >index 3f2a96b..d58c8f5 100644
> >--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
> >+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
> >@@ -399,7 +399,7 @@ namespace connectivity
> >  {
> >  sal_Bool bEnabled = sal_False;
> >  OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error 
> > in jfw_getEnabled" );
> >-return bEnabled  && 
> >url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 
> >0;
> >+return bEnabled  && url.startsWith("sdbc:embedded:hsqldb");

> Note that sizeof("...") == strlen("...") + 1, so the call to
> compareToAscii included the terminating NUL of the string literal in
> the comparison, so would never have returned zero (unless url
> contained embedded NUL characters, which is unlikely).

So,
 compareToAscii never returned zero
means
 url.compareToAscii(..) == 0 never was true
so you are saying that
 return bEnabled &&  
url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 0
was in fact equivalent to
 return false;

In other words, you are saying that foo.compareToAscii(bar, n) is more or less a
memcmp(&foo, &bar, min(strlen(foo),n)); provided foo is long enough it
always compares *exactly* n characters/bytes, never less.

I *strongly* doubt that, since it would mean that embedded hsqldb .odb
files WOULD NOT WORK AT ALL.

Indeed, looking in sal/rtl/ustring.cxx at function
rtl_ustr_ascii_shortenedCompare_WithLength,
it seems to me it handles the terminating NULL specially:

while ( (nShortenedLength > 0) &&
(pStr1 < pStr1End) && *pStr2 )
{
   ...
}

(...)

if ( *pStr2 )
{
   ...
}
else
{
   nRet = pStr1End - pStr1;
}

That is, it returns 0 if and only if its first argument (that is, in
our example, the value of the url variable) it precisely equal to the
pStr2 argument.

In other words, I think foo.compareToAscii(bar, n) is more or less a
 memcmp(&foo, &bar, min(strlen(foo),strlen(bar),n))
that is more or less a
 strncmp(&foo, &bar, n)
In other words, if bar is of length less than 1000, then all these
calls are equivalent:
 foo.compareToAscii(bar, sizeof(bar))
 foo.compareToAscii(bar, strlen(bar))
 foo.compareToAscii(bar, 1000)
 foo == bar

> Not sure about the details of that sdbc URL scheme, whether what one
> wants there is url.startsWith("sdbc:embedded:hsqldb") or
> url.startsWith("sdbc:embedded:hsqldb:") or
> url=="sdbc:embedded:hsqld"

It should be url=="sdbc:embedded:hsqldb". Most drivers have in their
acceptsURL a test of the kind url.startsWith("sdbc:foo:bar:") because
they expect extra information after the "sdbc:foo:bar"; in this
particular case of embedded HSQLDB, there is no extra information, and
the full exact URI is "sdbc:embedded:hsqldb".

A test like:
 url.startsWith("sdbc:embedded:hsqldb:")
would break all/older files since their sdbc URI is
"sdbc:embedded:hsqldb" and this would not match.

A test like:
 url.startsWith("sdbc:embedded:hsqldb")
would wrongly match a putative future URI "sdbc:embedded:hsqldb2",
which the current driver is *not* able to handle.

> (and, while we are at it, at least for the initial "sdbc" part, URI
> syntax would mandated case-insensitive comparison anyway, unless the
> given url is known to be normalized to lowercase),

I'm not sure if it is guaranteed normalised. If it is not, we have
this bug (of case-sensitivity) all over the place, not only in
embedded HSQLDB.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

[Ondřej Smrž]

 android/sdremote/res/layout/activity_presentation.xml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f0615d8d399f32de21002add6e033c3a9575f417
Author: Ondřej Smrž 
Date:   Sun Mar 10 13:10:37 2013 +0100

fdo#61421 Added line to prevent screenlocking during presentation

Added line to xml layout to prevent locking screen during using this
layout

Change-Id: Ia2f71e67a3d09bacf1cb7e95dd05a2008129eb24
Reviewed-on: https://gerrit.libreoffice.org/2640
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 
Signed-off-by: Michael Meeks 

diff --git a/android/sdremote/res/layout/activity_presentation.xml 
b/android/sdremote/res/layout/activity_presentation.xml
index 23b615a..1dbf5a6 100644
--- a/android/sdremote/res/layout/activity_presentation.xml
+++ b/android/sdremote/res/layout/activity_presentation.xml
@@ -2,7 +2,8 @@
 xmlns:tools="http://schemas.android.com/tools";
 android:id="@+id/framelayout"
 android:layout_width="match_parent"
-android:layout_height="match_parent" >
+android:layout_height="match_parent"
+android:keepScreenOn = "true">
 
 ___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#47011 autosave feature

[Krisztian Pinter (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2663

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2663/1

fdo#47011 autosave feature

removed unnecessary prop. name "Document/UserAutoSave" from saveopt.cxx
fixed autosave feature setting "losing its value"
set autosave feature default value to False

Change-Id: I473154b21bab53bf595a5a59e87dc16e472dcbf9
---
M cui/source/options/optsave.src
M framework/source/services/autorecovery.cxx
M officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
M unotools/source/config/saveopt.cxx
4 files changed, 17 insertions(+), 20 deletions(-)



diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 3d3d8f4..45bcd07 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -112,7 +112,7 @@
 };
 CheckBox BTN_USERAUTOSAVE
 {
-HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_USERAUTOSAVE"; //? FIX ME
+HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_USERAUTOSAVE";
 Pos = MAP_APPFONT ( 21 , 74 ) ;
 Size = MAP_APPFONT ( 163 , 10 ) ;
 Text [ en-US ] = "Automatically save the document too" ;
diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index d0f1fab..431b5a4 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -21,8 +21,6 @@
 #include "services/autorecovery.hxx"
 #include 
 
-#include  //?
-
 #include 
 #include 
 #include 
@@ -89,6 +87,8 @@
 #include 
 
 #include 
+
+#include 
 
 //___
 // namespaces
@@ -583,6 +583,8 @@
 // in case a new dispatch overwrites a may ba active AutoSave session
 // we must restore this session later. see below ...
 sal_Bool bWasAutoSaveActive = ((eJob & AutoRecovery::E_AUTO_SAVE) == 
AutoRecovery::E_AUTO_SAVE);
+sal_Bool bWasUserAutoSaveActive =
+((eJob & AutoRecovery::E_USER_AUTO_SAVE) == 
AutoRecovery::E_USER_AUTO_SAVE);
 
 // On the other side it make no sense to reactivate the AutoSave operation
 // if the new dispatch indicates a final decision ...
@@ -691,6 +693,11 @@
)
 {
 m_eJob |= AutoRecovery::E_AUTO_SAVE;
+
+if (bWasUserAutoSaveActive)
+{
+m_eJob |= AutoRecovery::E_USER_AUTO_SAVE;
+}
 }
 
 aWriteLock.unlock();
@@ -993,9 +1000,13 @@
 m_eTimerType  = AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL;
 
 if (bUserEnabled)
+{
 m_eJob |= AutoRecovery::E_USER_AUTO_SAVE;
+}
 else
+{
 m_eJob &= ~AutoRecovery::E_USER_AUTO_SAVE;
+}
 }
 else
 {
@@ -2341,7 +2352,6 @@
 // Mark AutoSave state as "INCOMPLETE" if it failed.
 // Because the last temp file is to old and does not include all changes.
 Reference< XDocumentRecovery > xDocRecover(rInfo.Document, 
css::uno::UNO_QUERY_THROW);
-Reference< XStorable > xDocSave(rInfo.Document, css::uno::UNO_QUERY_THROW);
 
 // safe the state about "trying to save"
 // ... we need it for recovery if e.g. a crash occures inside next line!
@@ -2359,6 +2369,7 @@
 // if userautosave is enabled, also save to the original file
 if((m_eJob & AutoRecovery::E_USER_AUTO_SAVE) == 
AutoRecovery::E_USER_AUTO_SAVE)
 {
+Reference< XStorable > xDocSave(rInfo.Document, 
css::uno::UNO_QUERY_THROW);
 xDocSave->store();
 }
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
index a44e611..c775d08 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
@@ -135,7 +135,7 @@
 
  
 
-true
+false
 
 
 
diff --git a/unotools/source/config/saveopt.cxx 
b/unotools/source/config/saveopt.cxx
index 452fcca..513f2a3 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -357,7 +357,6 @@
 #define ODFDEFAULTVERSION   15
 #define USESHA1INODF12  16
 #define USEBLOWFISHINODF12  17
-#define USERAUTOSAVE18
 
 Sequence< OUString > GetPropertyNames()
 {
@@ -380,8 +379,7 @@
 "WorkingSet",
 "ODF/DefaultVersion",
 "ODF/UseSHA1InODF12",
-"ODF/UseBlowfishInODF12",
-"Document/UserAutoSave"
+"ODF/UseBlowfishInODF12"
 };
 
 const int nCount = sizeof( aPropNames ) / sizeof( const char* );
@@ -499,10 +497,6 @@
 case AUTOSAVE :
 bAutoSave = bTemp;
 bROAutoSave = pROStates[nProp];
-break;
-case USE

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - translations

[Andras Timar]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7398b71487516380b7eff54f42eff88ae69fd22a
Author: Andras Timar 
Date:   Mon Mar 11 13:27:40 2013 +0100

Updated core
Project: translations  a84b3daced29f6e7f58c27bb11ec88adf7313667

diff --git a/translations b/translations
index 3d53850..a84b3da 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3d53850b75ab218933e51f9f00a42f86a2cb8b97
+Subproject commit a84b3daced29f6e7f58c27bb11ec88adf7313667
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

[navin patidar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2664

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/2664/1

fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
---
M editeng/source/outliner/outliner.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index adf0d08..dbb62b9 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -980,7 +980,7 @@
 sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
 nLayoutMode &= 
~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
 if ( bRightToLeftPara )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT;
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG;
 pOutDev->SetLayoutMode( nLayoutMode );
 
 if(bStrippingPortions)

-- 
To view, visit https://gerrit.libreoffice.org/2664
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice