date:20140812

New branch 'feature/opengl-transitions' available with the following commits:
commit f7635719ffc9e9aaca522c59918160b8341d95ed
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Aug 12 05:56:45 2014 +0200

make OGLTrans build on windows

We still need to fix a number of issues around pixmap to make it really 
useful.

Change-Id: I747d735d043d91d51809801edd9b778622b6063c

commit ce6433b7c9ec63eec99b7374117c19f02a6115d5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Aug 11 21:44:10 2014 +0200

we always have GLX 1.3, even on the baseline

Change-Id: I381aca6e09a63d21bcbdf2625c4d829f84819bf8

commit 1b2a4f5f711402871a06ea53acc21e83b3c13279
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Aug 11 21:25:06 2014 +0200

remove useless OGL transition shader code

Change-Id: I8930aab2b4d3fd00916f12b86fa06b5e011542ac

commit fc9f560bb4ad0fbc7f90c8aca0042cc71586b158
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Aug 11 21:04:20 2014 +0200

fix OpenGL canvas windows build

Change-Id: Ic6ed9c69003fa79a60310dc0b010ffc0ca868791

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

[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - embeddedobj/source

2014-08-12 Thread Zolnai Tamás

 embeddedobj/source/general/docholder.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8032bf16fa2496b2bba40ad51f943238d24e48ef
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Mon Aug 11 17:53:31 2014 +0200

Add a border to opengl chart to make it easier to handle.

Change-Id: I74bc636dc0a37d70f45fe2eac0b8b60e3f6318bb

diff --git a/embeddedobj/source/general/docholder.cxx 
b/embeddedobj/source/general/docholder.cxx
index 783c99b..9bb8581 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -73,8 +73,7 @@
 #include commonembobj.hxx
 #include intercept.hxx
 
-#define HATCH_BORDER_WIDTH 
m_pEmbedObj-getStatus(embed::Aspects::MSOLE_CONTENT)embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE)
 || \
-(svt::EmbeddedObjectRef::IsGLChart(m_pEmbedObj)) ) 
 \
+#define HATCH_BORDER_WIDTH 
(((m_pEmbedObj-getStatus(embed::Aspects::MSOLE_CONTENT)embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE)
  \
 
m_pEmbedObj-getCurrentState()!=embed::EmbedStates::UI_ACTIVE) ? 0 : 4 )
 
 using namespace ::com::sun::star;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - i18npool/source sd/source

 i18npool/source/localedata/localedata.cxx   |2 +-
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx |5 -
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 03d44c7670413b730b1445eeab5210cff8245786
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 11 22:24:54 2014 +0200

fdo#81995: fix Outline numbering tab page

The ParentNumbering property is not a string.

(regression from 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53)

Change-Id: Ib33e95847b388bb1126a63812e128c96a0c00730
(cherry picked from commit 4d3c9ed257e51af55f358d2b44d5fc2e341c7202)
Reviewed-on: https://gerrit.libreoffice.org/10874
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index bcd087f..212b626 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1585,7 +1585,7 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
 pValues[4].Name = BulletFontName;
 pValues[4].Value = pTemp-sBulletFontName;
 pValues[5].Name = ParentNumbering;
-pValues[5].Value = OUString::number(pTemp-nParentNumbering);
+pValues[5].Value = pTemp-nParentNumbering;
 pValues[6].Name = LeftMargin;
 pValues[6].Value = pTemp-nLeftMargin;
 pValues[7].Name = SymbolTextDistance;
commit 57de7defc7baf03b0ae3574fa453009f201a2fd1
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 11 16:44:37 2014 +0200

fdo#81933 do not select 1st slide unconditionally

This is a regression from commit
ad0c4bf5790546242884da0c2ec281f2db9e14a0 . But I do not see why this
code would be needed for that either.

Change-Id: Ied3a5d25b2bec9542aa83c4d7fa36ed5313fc797
(cherry picked from commit 904fdac93b072cc5295cce0360f47926f049e6ea)
Reviewed-on: https://gerrit.libreoffice.org/10869
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx 
b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index 1484159..3524870 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -388,11 +388,6 @@ void PageSelector::UpdateCurrentPage (const bool 
bUpdateOnlyWhenPending)
 break;
 }
 }
-if ( ! pCurrentPageDescriptor  nPageCount0)
-{
-// No page is selected.  Make the first slide the current page.
-pCurrentPageDescriptor = mrModel.GetPageDescriptor(0);
-}
 
 if (pCurrentPageDescriptor)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Maxim Monastirsky

 scp2/source/ooo/file_ooo.scp |2 ++
 scp2/source/ooo/module_hidden_ooo.scp|1 +
 scp2/source/ooo/module_lang_template.scp |1 +
 3 files changed, 4 insertions(+)

New commits:
commit c6beff5dc531890bd8758115f792a9ef0440ff08
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Sun Aug 10 18:08:28 2014 +0300

fdo#78845 Packaging of fpicker ui files

Change-Id: I78e217032af52b365cc2d07909bda68daaf028a1
Reviewed-on: https://gerrit.libreoffice.org/10857
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 24884b2007a7dc48fa13bd3fd32d36109536403c)
Reviewed-on: https://gerrit.libreoffice.org/10867
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6f5d715..9b11d66 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -498,6 +498,7 @@ UI_FILELIST(dbtdata, UIConfig/modules/dbtdata.filelist)
 #endif
 UI_FILELIST(desktop, UIConfig/desktop.filelist)
 UI_FILELIST(filter, UIConfig/filter.filelist)
+UI_FILELIST(fps, UIConfig/fps.filelist)
 UI_FILELIST(sabpilot, UIConfig/modules/sabpilot.filelist)
 #ifdef DBCONNECTIVITY
 UI_FILELIST(sbibliography, UIConfig/modules/sbibliography.filelist)
@@ -535,6 +536,7 @@ UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
+UI_FILELIST_ALL_LANG(fps, fps)
 UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index c269045..d9cc9bd 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -240,6 +240,7 @@ Module gid_Module_Root_Files_6
 #endif
 gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
 gid_File_Share_Config_Sofficecfg_uiconfig_filter,
+gid_File_Share_Config_Sofficecfg_uiconfig_fps,
 #ifdef DBCONNECTIVITY
 gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
 #endif
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 0ac4ea0..8facc54 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -32,6 +32,7 @@ Module gid_Module_Langpack_Basis_Template
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - include/svx svx/source svx/uiconfig

2014-08-12 Thread Krisztian Pinter

 include/svx/Palette.hxx|1 
 include/svx/PaletteManager.hxx |   17 +++-
 svx/source/tbxctrls/Palette.cxx|3 
 svx/source/tbxctrls/PaletteManager.cxx |   32 +
 svx/source/tbxctrls/colorwindow.hxx|6 +
 svx/source/tbxctrls/tbcontrl.cxx   |   71 +---
 svx/uiconfig/ui/colorwindow.ui |  116 +
 7 files changed, 203 insertions(+), 43 deletions(-)

New commits:
commit ed6e4c65965fefdf5b638d6a2f8ca5fac856aa3b
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Mon Aug 11 17:35:50 2014 +0200

Add recent colors

Change-Id: Id6b2239149bf7d0b3c9242efb7a72091e32c3384

diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index 11a3462..6eab3f4 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -29,7 +29,6 @@
 typedef std::pairColor, OUString NamedColor;
 typedef std::vector NamedColor  ColorList;
 
-
 class Palette
 {
 public:
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index e4144f9..cb70d2c 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -23,6 +23,7 @@
 #include svx/Palette.hxx
 #include rtl/ustring.hxx
 #include svx/tbxcolorupdate.hxx
+#include deque
 
 #include tools/urlobj.hxx
 #include comphelper/processfactory.hxx
@@ -36,27 +37,35 @@
 
 class PaletteManager
 {
-sal_uInt16  mnNumOfPalettes;
-sal_uInt16  mnCurrentPalette;
+const sal_uInt16mnMaxRecentColors;
 
-longmnColorCount;
+sal_uInt16  mnNumOfPalettes;
+sal_uInt16  mnCurrentPalette;
+
+longmnColorCount;
 svx::ToolboxButtonColorUpdater* mpBtnUpdater;
 
-Color   mLastColor;
+Color   mLastColor;
+std::dequeColor   maRecentColors;
 boost::ptr_vectorPalette maPalettes;
 public:
 PaletteManager();
 ~PaletteManager();
 voidLoadPalettes();
 voidReloadColorSet(SvxColorValueSet rColorSet);
+voidReloadRecentColorSet(SvxColorValueSet rColorSet);
 std::vectorOUString GetPaletteList();
 voidSetPalette( sal_Int32 nPos );
 sal_Int32   GetPalette();
 
 longGetColorCount();
+longGetRecentColorCount();
 OUStringGetPaletteName();
+
 const Color GetLastColor();
 voidSetLastColor(const Color rLastColor);
+voidAddRecentColor(const Color rRecentColor);
+
 voidSetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater);
 voidPopupColorPicker(const OUString aCommand);
 static void DispatchColorCommand(const OUString aCommand, const Color 
aColor);
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index 496e0fc..ba5bdbd 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -52,10 +52,9 @@ void PaletteGPL::LoadColorSet( SvxColorValueSet rColorSet )
 
 rColorSet.Clear();
 int nIx = 1;
-for(ColorList::const_iterator it = maColors.begin();
+for(typename ColorList::const_iterator it = maColors.begin();
 it != maColors.end(); ++it)
 {
-// TODO make it-second OUString
 rColorSet.InsertItem(nIx, it-first, it-second);
 ++nIx;
 }
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 98ae0b2..101c002 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -30,6 +30,7 @@
 #define STR_DOC_COLOR_PREFIXDocument Color 
 
 PaletteManager::PaletteManager() :
+mnMaxRecentColors(10),
 mnNumOfPalettes(2),
 mnCurrentPalette(0),
 mnColorCount(0),
@@ -115,6 +116,18 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet 
rColorSet)
 }
 }
 
+void PaletteManager::ReloadRecentColorSet(SvxColorValueSet rColorSet)
+{
+rColorSet.Clear();
+int nIx = 1;
+for(std::dequeColor::const_iterator it = maRecentColors.begin();
+it != maRecentColors.end(); ++it)
+{
+rColorSet.InsertItem(nIx, *it, );
+++nIx;
+}
+}
+
 std::vectorOUString PaletteManager::GetPaletteList()
 {
 std::vectorOUString aPaletteNames;
@@ -148,6 +161,11 @@ long PaletteManager::GetColorCount()
 return mnColorCount;
 }
 
+long PaletteManager::GetRecentColorCount()
+{
+return maRecentColors.size();
+}
+
 OUString PaletteManager::GetPaletteName()
 {
 if( mnCurrentPalette == 0 )
@@ -168,6 +186,19 @@ void PaletteManager::SetLastColor(const Color rLastColor)
 mLastColor = rLastColor;
 }
 
+void PaletteManager::AddRecentColor(const Color rRecentColor)
+{
+std::dequeColor::iterator itColor =
+std::find(maRecentColors.begin(), maRecentColors.end(), rRecentColor);
+// if recent color to be added is already in list, remove it
+if( itColor != maRecentColors.end() )
+maRecentColors.erase( itColor );
+
+maRecentColors.push_front( rRecentColor );
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - i18npool/source

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

New commits:
commit 48cbe9d301e3c7f94ca8cc682b5c67a4fe6f378c
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 11 22:24:54 2014 +0200

fdo#81995: fix Outline numbering tab page

The ParentNumbering property is not a string.

(regression from 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53)

Change-Id: Ib33e95847b388bb1126a63812e128c96a0c00730
(cherry picked from commit 4d3c9ed257e51af55f358d2b44d5fc2e341c7202)
Reviewed-on: https://gerrit.libreoffice.org/10875
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 5d70251..9aafd2b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1589,7 +1589,7 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
 pValues[4].Name = BulletFontName;
 pValues[4].Value = OUString::createFromAscii(pTemp-sBulletFontName);
 pValues[5].Name = ParentNumbering;
-pValues[5].Value = OUString::number(pTemp-nParentNumbering);
+pValues[5].Value = pTemp-nParentNumbering;
 pValues[6].Name = LeftMargin;
 pValues[6].Value = pTemp-nLeftMargin;
 pValues[7].Name = SymbolTextDistance;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - include/svx svx/source

 include/svx/sdr/attribute/sdrtextattribute.hxx |1 +
 svx/source/sdr/attribute/sdrtextattribute.cxx  |7 +++
 svx/source/sdr/primitive2d/sdrattributecreator.cxx |   14 +-
 svx/source/svdraw/svdotextdecomposition.cxx|2 ++
 4 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 35422761a3eff131dfd698cf64491f05af853bca
Author: matteocam matteo.campane...@gmail.com
Date:   Mon Aug 11 19:22:34 2014 +0200

Special treatment of chaining when making text attributes.

Change-Id: Ib0fcdfbc2524968bd633485f7abaec5805d60139

diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx 
b/include/svx/sdr/attribute/sdrtextattribute.hxx
index 6d3b738..624c5f0 100644
--- a/include/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrtextattribute.hxx
@@ -76,6 +76,7 @@ namespace drawinglayer
 bool bWrongSpell,
 bool bToBeChained);
 SdrTextAttribute();
+SdrTextAttribute(bool bIsToBeChained); // special treatment for 
text chaining
 SdrTextAttribute(const SdrTextAttribute rCandidate);
 SdrTextAttribute operator=(const SdrTextAttribute rCandidate);
 ~SdrTextAttribute();
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx 
b/svx/source/sdr/attribute/sdrtextattribute.cxx
index de9a61f..dd1eafe 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -297,6 +297,13 @@ namespace drawinglayer
 mpSdrTextAttribute-mnRefCount++;
 }
 
+SdrTextAttribute::SdrTextAttribute(bool bIsToBeChained)
+:   mpSdrTextAttribute(ImpSdrTextAttribute::get_global_default())
+{
+mpSdrTextAttribute-mbToBeChained = bIsToBeChained;
+mpSdrTextAttribute-mnRefCount++;
+}
+
 SdrTextAttribute::SdrTextAttribute(const SdrTextAttribute rCandidate)
 :   mpSdrTextAttribute(rCandidate.mpSdrTextAttribute)
 {
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx 
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4d1bca5..d13bb39 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -524,8 +524,6 @@ namespace drawinglayer
 // FIXME(matteocam)
 bool bToBeChained = rTextObj.IsToBeChained();
 
-
-
 if(rText.GetOutlinerParaObject()  rText.GetModel())
 {
 // added TextEdit text suppression
@@ -588,7 +586,7 @@ namespace drawinglayer
 bToBeChained);
 }
 
-return attribute::SdrTextAttribute();
+return attribute::SdrTextAttribute(bToBeChained);
 }
 
 attribute::FillGradientAttribute 
createNewTransparenceGradientAttribute(const SfxItemSet rSet)
commit ed720c37f2b016badea4ace09d9b86e156dceefe
Author: matteocam matteo.campane...@gmail.com
Date:   Mon Aug 11 18:43:49 2014 +0200

Chaining status for SdrTextObj is reset after chaining occurs

Change-Id: Ie09f615c36bcf4b433a4dc5c286c1a7184119e6c

diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx 
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 68b44e0..4d1bca5 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -540,16 +540,6 @@ namespace drawinglayer
 bInEditMode = rTextObj.IsInEditMode();
 }
 
-// for resetting status
-// FIXME(matteocam)
-// XXX: may not work
-// XXX: this should happen only whether the chaining has 
occurred though.
-// XXX: violates SPOT rule (the following condition is also in 
sdrdecompositiontools.cxx)
-if ( !bInEditMode  rTextObj.IsToBeChained() )
-{   // XXX: hack
-const_castSdrTextObj*(rTextObj)-SetToBeChained( false 
);
-}
-
 OutlinerParaObject 
aOutlinerParaObject(*rText.GetOutlinerParaObject());
 
 if(bInEditMode)
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index cf2f455..4ed8b58 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1482,6 +1482,8 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
 SdrTextObj *pNextTextObj = GetNextLinkInChain();
 assert (pNextTextObj);
 impCopyTextInTextObj(pNextTextObj); // XXX: it actually moves the 
overflowing text currently
+// Chaining occurred. Let's reset the status
+const_castSdrTextObj*(this)-SetToBeChained( false );
 
 //pNextTextObj-SetOutlinerParaObject( mpOverflowingText );
 //SdrOutliner rOutl = pNextTextObj-ImpGetDrawOutliner();
___
Libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/calctiledrendering_alt'

2014-08-12 Thread Andrzej Hunt

New branch 'feature/calctiledrendering_alt' available with the following 
commits:
commit 7e00e97534a6df416d10f6d098dc746daf3030da
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 21:23:35 2014 +0200

Return to pixRect in Paint.

Change-Id: I8ee807ba94c3e372b8dd1cbbf9302aaf9e85f323

commit 2904c469fc84fe7fb973e499d9d8b34c4919b3b3
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 21:22:59 2014 +0200

Move variable definition closer to point of use.

Previously it was in a very unlogical location.

Change-Id: I6a09244eb1aa3bf413ae98e215c2667adcc96907

commit 3413e93dae1a915596c9621a49c73ba9c005a9b6
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 21:21:32 2014 +0200

Return logic units for GetMergeSizePixel too.

This is used for some cell drawing etc.

This commit by itself isn't so useful as the clients also need
to be updated to work with logic units rather than pixels. We should
probably also rename the method at some point.

Change-Id: I7e563d21885261b0dabe55e6e535b066b68a07a3

commit 4fbdd7b3f789b9cb74f1f23ab11a198d9848d023
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 21:04:53 2014 +0200

Use correct scalings for col/row-bar text too.

Change-Id: I55d7a965bfef6a459d98845a329d1f399e23d63f

commit 67910e62ff07fa80326c082e268af34deac5703c
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 19:56:53 2014 +0200

Use late conversions for col/row-bars too.

Change-Id: I258408fef0f0c18b20c8973c2182fac2d5ed3298

commit 1adb6dc0f02d8b91b0631cf80aa6b29d6a71e4d4
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 19:51:17 2014 +0200

Remove bad check.

This was an issue with Tiled Rendering when we still used the FillData.

We don't use FillData anymore, and more importantly we do actually
want to be able to redraw just one column/row at a time (where
nStart==nEnd).

Change-Id: I3f8b85556d3b6d6cf7cdc50db93db1fa3119e9fc

commit cf1ed90aa1f04790fc6e71531d100c086a6f1e95
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 19:48:40 2014 +0200

DON'T MERGE: more work needed.

Change-Id: Id3cb2f0146ffec4b4bd3ae2f06690e1cde8182b1

commit 9ce8b6ac09c3828a7c5a366cbf9b0dac5c864395
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Wed Jun 25 22:37:54 2014 +0100

Use OutputDevice scaling for column-/rowbars too.

This means we now match the new gridwindow dimensions. There
are however some issues around selection/painting now, which
are presumably related to some parts of the code still assuming
pixel rather than logical dimensions.

Change-Id: I15c2bc7210f26cededd63bc89dbd782e6e4c03b8

commit ef51fd2d815820c86c371e543730306f1e61bcfc
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 11:04:40 2014 +0200

Pass PaintMapMode through to DrawGrid/DrawBackground.

Change-Id: I1e89babc968278fb504a9afdb409ecc1a8142fc5

commit 4758f53c2396220493bf2e75f7e0ded6f7d043d0
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Thu Jun 26 17:06:58 2014 +0100

Ensure we actually render all cells in the selected area.

Only cells within maVisibleRange are rendered, even if we request
a larger area (and maVisibleRange is otherwise not updated for tiled
rendering). Hence we should explicitly set it here.

Change-Id: I399be9df1f266a2b3d32a95483960b21f561c6b3

commit 05dfc5de62eb2fc52e533134c153742190eac7e0
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Thu Jun 26 14:30:08 2014 +0100

Take into account drawing layer for data area size.

The drawing layer could potentially have items that are outwith
the data area, but we probably want to have them included for
tiled rendering.

Change-Id: I958c4fa29491cdb0fd80392dfcfa033306f2b76c

commit 554c888341210feeebccdaa2f281996c8c8b9d66
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 09:39:06 2014 +0200

Use output device mapping for draw layer too.

Otherwise draw layer items don't get scaled at all for tiled
rendering.

Change-Id: I4ed54f61420eae82fcf4692b8e9b605a3338fc52

commit 373d18fbed8d439317a292ffab26b06bc12f71b7
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 09:17:56 2014 +0200

Set correct scaling for normal painting.

As we no longer read the scaling from the viewdata, we should
instead set it on the output device when doing normal rendering.

However the grid still doesn't exactly match the external axes yet,
there are probably more rounding errors wherever they are painted.

Change-Id: I25b1bd9b344115578fe892aa94fbf753a3c10c81

commit 8a6ee4b5c0954fea6b95213ee45de13336fa0caf
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Mon Aug 11 09:15:08 2014 +0200

Use output device scaling to determine cells

[Libreoffice-commits] core.git: 27 commits - bin/lo-all-static-libs configure.ac dbaccess/source desktop/source external/mysqlcppconn external/nss framework/source .gitignore i18npool/source oox/sourc

2014-08-12 Thread Adam Co

 .gitignore |1 
 bin/lo-all-static-libs |2 
 configure.ac   |2 
 dbaccess/source/core/api/CRowSetDataColumn.cxx |   14 
 dbaccess/source/core/api/RowSetBase.cxx|   16 
 desktop/source/app/dispatchwatcher.cxx |   77 
 external/mysqlcppconn/Library_mysqlcppconn.mk  |8 
 external/nss/ExternalPackage_nss.mk|8 
 external/nss/ExternalProject_nss.mk|7 
 external/nss/Module_nss.mk |2 
 external/nss/UnpackedTarball_nss.mk|2 
 external/nss/nss-ios.patch |  101 
 framework/source/uielement/langselectionstatusbarcontroller.cxx|2 
 i18npool/source/localedata/localedata.cxx  |2 
 oox/source/token/tokens.txt|2 
 qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java   |  146 -
 qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java  |6 
 sc/inc/compiler.hxx|7 
 sc/source/core/tool/compiler.cxx   |   90 
 sc/source/core/tool/token.cxx  |7 
 sc/source/filter/excel/excdoc.cxx  |3 
 sc/source/filter/excel/ooxml-export-TODO.txt   |2 
 sc/source/filter/excel/xecontent.cxx   |2 
 sc/source/filter/excel/xelink.cxx  |  293 
+-
 sc/source/filter/inc/xecontent.hxx |7 
 sc/source/filter/inc/xelink.hxx|3 
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx|5 
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |   10 
 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx   | 1315 
-
 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx   |  508 
---
 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 1448 
--
 slideshow/source/engine/OGLTrans/win/UNUSED|4 
 solenv/gbuild/platform/macosx.mk   |4 
 svx/sdi/svx.sdi|2 
 sw/qa/extras/ooxmlexport/data/wrap-tight-through.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx|   12 
 sw/source/filter/ww8/docxsdrexport.cxx |   49 
 sw/source/uibase/shells/textsh1.cxx|7 
 unotools/source/config/configvaluecontainer.cxx|   59 
 vcl/source/opengl/OpenGLContext.cxx|6 
 writerfilter/inc/dmapper/DomainMapper.hxx  |1 
 writerfilter/source/dmapper/DomainMapper.cxx   |5 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx   |   18 
 writerfilter/source/dmapper/DomainMapperTableManager.hxx   |5 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |2 
 writerfilter/source/dmapper/GraphicImport.cxx  |   17 
 writerfilter/source/dmapper/StyleSheetTable.cxx|5 
 writerfilter/source/dmapper/StyleSheetTable.hxx|1 
 writerfilter/source/dmapper/TablePropertiesHandler.cxx |6 
 writerfilter/source/dmapper/TablePropertiesHandler.hxx |4 
 writerfilter/source/dmapper/TblStylePrHandler.cxx  |2 
 writerfilter/source/ooxml/factoryimpl_ns.py|5 
 writerfilter/source/ooxml/model.xml|   39 
 writerfilter/source/ooxml/modelpreprocess.py   |2 
 54 files changed, 895 insertions(+), 3458 deletions(-)

New commits:
commit f91b81c24e21fffbee0d02d325171e684ca880eb
Author: Adam Co rattles2...@gmail.com
Date:   Mon Aug 11 18:31:45 2014 +0300

Add reference to 'DomainMapper' to some DOCX import classes

The reason for adding 'DomainMapper' is to be able to check
during import in these classes whether or not the import is
in a 'styles.xml' file or not.

Also added blank handling for new XML nodes.

Reviewed on:
https://gerrit.libreoffice.org/10870

Change-Id: Ib2acde736d96f30eda40ee327991dc6ae0ed7f25

diff --git

Re: gerrit-to-freedesktop synchronisation not happening

2014-08-12 Thread Norbert Thiebaud

On Tue, Aug 12, 2014 at 7:58 AM, Lionel Elie Mamane lio...@mamane.lu wrote:
 It seems the synchronisation (or rather, mirroring) from the gerrit
 git repo to the freedesktop read-only (anonymous access) mirror is not
 happening anymore. The freedesktop mirror is stuck at

 commit 213e1f9f85b5edb266607a29f5b02e36904d1070
 Author: Lionel Elie Mamane lio...@mamane.lu
 Date:   Mon Aug 11 16:27:14 2014 +0200

 fixup

 Change-Id: I35996d4337421317ae1c6da2a4647b231782d882

 while the gerrit git repo has 22 more commits.

Fixed

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

[Libreoffice-commits] core.git: 2 commits - external/mysqlcppconn .gitignore

 .gitignore|1 
 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1 
 external/mysqlcppconn/patches/cmake.patch |  363 ++
 3 files changed, 365 insertions(+)

New commits:
commit e93bba26ddd8edbcc2852babc6b758ccd1ae39cc
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Aug 12 09:11:17 2014 +0200

git-ignore ure/source/unorc

Change-Id: If6526bfa6cbbb74c32325cf03e2845957fec7be6

diff --git a/.gitignore b/.gitignore
index 374edb5..2a53bbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@
 /solenv/gdb/libreoffice/util/*.pyo
 /moz/zipped/*.zip
 __pycache__
+/ure/source/unorc
 
 # OSX specific
 .DS_Store
commit 6ec17530c5c715e47befeb18646022b6ea54efdf
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Aug 12 09:10:20 2014 +0200

mysqlcppconn: limit cmake to the role we left it

generate version_info.h

Change-Id: I6ea57ef1403974d19a0dca1f76e40a6d68a9e44c

diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk 
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 74f19ac..5f5a437 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
 $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
+   external/mysqlcppconn/patches/cmake.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/patches/cmake.patch 
b/external/mysqlcppconn/patches/cmake.patch
new file mode 100644
index 000..79fe064
--- /dev/null
+++ b/external/mysqlcppconn/patches/cmake.patch
@@ -0,0 +1,363 @@
+diff --recursive -u UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt 
UnpackedTarball/mysqlcppconn/CMakeLists.txt
+--- UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt 2014-08-12 
08:44:13.262850586 +0200
 UnpackedTarball/mysqlcppconn/CMakeLists.txt2014-08-12 
08:51:01.572088747 +0200
+@@ -61,282 +61,3 @@
+ SET( LICENSE_FILENAME ${LICENSE_FILENAME}))
+ ENDIF(WIN32)
+ 
+-#-
+-# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
+-SET(MYSQLCPPCONN_COMPILE_FLAGS_ENV $ENV{CPPFLAGS} ${MYSQL_CXXFLAGS} 
$ENV{CXXFLAGS})
+-MESSAGE(STATUS Environment compile flags: ${MYSQLCPPCONN_COMPILE_FLAGS_ENV})
+-
+-SET(MYSQLCPPCONN_LINK_FLAGS_ENV $ENV{LDFLAGS})
+-MESSAGE(STATUS Environment link flags: ${MYSQLCPPCONN_LINK_FLAGS_ENV})
+-
+-#-
+-# ICU
+-
+-SET(MYSQLCPPCONN_ICU_ENABLE 0 CACHE BOOL development only: search icu 
although we do not make use of it yet.)
+-
+-IF(MYSQLCPPCONN_ICU_ENABLE)
+-  SET(MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
+-  SET(MYSQLCPPCONN_ICU_LIBRARY)
+-  SET(MYSQLCPPCONN_ICU_INCLUDE)
+-
+-  FIND_PROGRAM (MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE icu-config)
+-
+-  IF (NOT MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
+-  SET (MYSQLCPPCONN_ICU_FOUND FALSE)
+-  MESSAGE(STATUS icu-config not found)
+-  ELSE (NOT MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
+-
+-  EXEC_PROGRAM (${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE} 
--ldflags-libsonly
+-  OUTPUT_VARIABLE MYSQLCPPCONN_ICU_LIBRARY
+-  RETURN_VALUE ERROR_CODE
+-  )
+-
+-  EXEC_PROGRAM (${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE} 
--cppflags-searchpath|sed s/^-I//
+-  OUTPUT_VARIABLE MYSQLCPPCONN_ICU_INCLUDE
+-  RETURN_VALUE ERROR_CODE
+-  )
+-
+-  EXEC_PROGRAM (${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE} 
--ldflags-searchpath|sed s/^-L//
+-  OUTPUT_VARIABLE MYSQLCPPCONN_ICU_LDLIB
+-  RETURN_VALUE ERROR_CODE
+-  )
+-
+-  IF (MYSQLCPPCONN_ICU_LIBRARY)
+-  SET (MYSQLCPPCONN_ICU_FOUND TRUE)
+-  ENDIF (MYSQLCPPCONN_ICU_LIBRARY)
+-
+-  MESSAGE(STATUS ICU::CONFIG: 
${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE})
+-  MESSAGE(STATUS ICU::LIBRARY: ${MYSQLCPPCONN_ICU_LIBRARY})
+-  MESSAGE(STATUS ICU::INCLUDE: ${MYSQLCPPCONN_ICU_INCLUDE})
+-  MESSAGE(STATUS ICU::LDLIB: ${MYSQLCPPCONN_ICU_LDLIB})
+-
+-  INCLUDE_DIRECTORIES(${MYSQLCPPCONN_ICU_INCLUDE})
+-  LINK_DIRECTORIES(${MYSQLCPPCONN_ICU_LDLIB})
+-  ENDIF (NOT MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
+-ENDIF(MYSQLCPPCONN_ICU_ENABLE)
+-#-
+-
+-#-
+-# BOOST
+-SET(ENV_BOOST $ENV{BOOST_ROOT})
+-IF(NOT BOOST_ROOT AND ENV_BOOST)
+-  SET(BOOST_ROOT ${ENV_BOOST})
+-ENDIF(NOT BOOST_ROOT AND ENV_BOOST)
+-
+-IF(NOT BOOST_ROOT AND WIN32)
+-SET(BOOST_ROOT C:/Program Files/Boost)
+-ENDIF(NOT BOOST_ROOT AND WIN32)
+-
+-# Prefer static linking in all cases
+-SET(Boost_ADDITIONAL_VERSIONS 1.37.0 1.37 1.38.0 1.38 1.39.0 1.39)

[Libreoffice-commits] core.git: sd/inc

2014-08-12 Thread Takeshi Abe

 sd/inc/customshowlist.hxx |   43 ---
 1 file changed, 24 insertions(+), 19 deletions(-)

New commits:
commit 4347d844646907ba31dc1e0c7f53c5a93d986c2a
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Aug 11 23:10:37 2014 +0900

fdo#75757: remove inheritance to std::vector

Change-Id: I5781799bbd8cc321ff7f659013c6cf68b3253989
Reviewed-on: https://gerrit.libreoffice.org/10868
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sd/inc/customshowlist.hxx b/sd/inc/customshowlist.hxx
index 466c436..0fdd8c0 100644
--- a/sd/inc/customshowlist.hxx
+++ b/sd/inc/customshowlist.hxx
@@ -24,54 +24,59 @@
 
 class SdCustomShow;
 
-class SdCustomShowList : private std::vectorSdCustomShow*
+class SdCustomShowList
 {
 private:
+std::vectorSdCustomShow* mShows;
sal_uInt16 mnCurPos;
 public:
-using std::vectorSdCustomShow*::operator[];
-using std::vectorSdCustomShow*::size;
-using std::vectorSdCustomShow*::empty;
-using std::vectorSdCustomShow*::push_back;
-using std::vectorSdCustomShow*::erase;
-using std::vectorSdCustomShow*::begin;
-using std::vectorSdCustomShow*::iterator;
-
 SdCustomShowList()
-: mnCurPos(0)
+: mShows(), mnCurPos(0)
 {
 }
 
+bool empty() const {return mShows.empty();}
+
+size_t size() const {return mShows.size();}
+
+SdCustomShow* operator[](size_t i) {return mShows[i];}
+
+std::vectorSdCustomShow*::iterator begin() {return mShows.begin();}
+
+void erase(std::vectorSdCustomShow*::iterator it) {mShows.erase(it);}
+
+void push_back(SdCustomShow* p) {mShows.push_back(p);}
+
 sal_uInt16 GetCurPos() const { return mnCurPos; }
 void Seek(sal_uInt16 nNewPos) { mnCurPos = nNewPos; }
 
 SdCustomShow* First()
 {
-if( empty() )
+if( mShows.empty() )
 return NULL;
 mnCurPos = 0;
-return operator[](mnCurPos);
+return mShows[mnCurPos];
 }
 SdCustomShow* Next()
 {
 ++mnCurPos;
-return mnCurPos = size() ? NULL : operator[](mnCurPos);
+return mnCurPos = mShows.size() ? NULL : mShows[mnCurPos];
 }
 void Last()
 {
-if( !empty() )
-mnCurPos = size() - 1;
+if( !mShows.empty() )
+mnCurPos = mShows.size() - 1;
 }
 SdCustomShow* GetCurObject()
 {
-return empty() ? NULL : operator[](mnCurPos);
+return mShows.empty() ? NULL : mShows[mnCurPos];
 }
 SdCustomShow* Remove(SdCustomShow* p)
 {
-iterator it = std::find(begin(), end(), p);
-if( it == end() )
+std::vectorSdCustomShow*::iterator it = std::find(mShows.begin(), 
mShows.end(), p);
+if( it == mShows.end() )
 return NULL;
-erase(it);
+mShows.erase(it);
 return p;
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

https://bugs.freedesktop.org/show_bug.cgi?id=75757

--- Comment #20 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=4347d844646907ba31dc1e0c7f53c5a93d986c2a

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/sfx2 include/svtools include/vcl sfx2/source svtools/source vcl/source xmlsecurity/source

 dbaccess/source/ui/control/curledit.cxx|8 --
 dbaccess/source/ui/control/dbtreelistbox.cxx   |   10 
 dbaccess/source/ui/dlg/adminpages.cxx  |7 -
 dbaccess/source/ui/dlg/adminpages.hxx  |3 --
 dbaccess/source/ui/dlg/dlgattr.cxx |3 +-
 dbaccess/source/ui/inc/curledit.hxx|1 
 dbaccess/source/ui/inc/dbtreelistbox.hxx   |3 --
 include/sfx2/basedlgs.hxx  |1 
 include/svtools/wizardmachine.hxx  |3 --
 include/vcl/scrbar.hxx |1 
 include/vcl/vclmedit.hxx   |6 +
 sfx2/source/dialog/basedlgs.cxx|   22 --
 svtools/source/dialogs/wizardmachine.cxx   |   18 ---
 vcl/source/control/scrbar.cxx  |   18 ---
 vcl/source/edit/vclmedit.cxx   |   30 -
 xmlsecurity/source/dialogs/resourcemanager.cxx |   10 
 xmlsecurity/source/dialogs/resourcemanager.hxx |2 -
 17 files changed, 4 insertions(+), 142 deletions(-)

New commits:
commit e2d2fa4f0663cf990c0595f8827ff9123c88d41a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 09:01:28 2014 +0100

Resolves: fdo#82413 crash in format-column

Change-Id: I3af776c14ec0f224884488fdc99ee26ebbba7cb8

diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx 
b/dbaccess/source/ui/dlg/dlgattr.cxx
index 0a83ba3..8af7569 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -39,13 +39,14 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const 
SfxItemSet* pCellAttrs,
 : SfxTabDialog(pParent, FieldDialog, dbaccess/ui/fielddialog.ui, 
pCellAttrs)
 , m_nNumberFormatId(0)
 {
-
 pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
 
 if (bRow)
 SetText(getFixedText(alttitle)-GetText());
 if (bHasFormat)
 m_nNumberFormatId = AddTabPage(format, RID_SVXPAGE_NUMBERFORMAT);
+else
+RemoveTabPage(format);
 AddTabPage(alignment, RID_SVXPAGE_ALIGNMENT);
 }
 
commit d24df3fc66614eda59d38f6ab409be73f8a20dad
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 08:36:15 2014 +0100

callcatcher: another round of ResId removals

Change-Id: Ia3acdb3501b7735820258cb090e731f5814bc07f

diff --git a/dbaccess/source/ui/control/curledit.cxx 
b/dbaccess/source/ui/control/curledit.cxx
index 3a24c58..3c856db 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -24,14 +24,6 @@
 
 namespace dbaui
 {
-// OConnectionURLEdit
-OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId 
_rResId,bool _bShowPrefix)
-:Edit(_pParent, _rResId)
-,m_pTypeCollection(NULL)
-,m_pForcedPrefix(NULL)
-,m_bShowPrefix(_bShowPrefix)
-{
-}
 
 OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool 
_bShowPrefix)
 :Edit(_pParent, _nBits)
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index bd23fa9..cdc185f 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -64,16 +64,6 @@ DBTreeListBox::DBTreeListBox( Window* pParent, WinBits 
nWinStyle ,bool _bHandleE
 init();
 }
 
-DBTreeListBox::DBTreeListBox( Window* pParent, const ResId rResId,bool 
_bHandleEnterKey)
-:SvTreeListBox(pParent,rResId)
-,m_pDragedEntry(NULL)
-,m_pActionListener(NULL)
-,m_pContextMenuProvider( NULL )
-,m_bHandleEnterKey(_bHandleEnterKey)
-{
-init();
-}
-
 void DBTreeListBox::init()
 {
 sal_uInt16 nSize = SPACEBETWEENENTRIES;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx 
b/dbaccess/source/ui/dlg/adminpages.cxx
index 2673f57..640db09 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -221,13 +221,6 @@ namespace dbaui
 }
 }
 
-void OGenericAdministrationPage::SetControlFontWeight(Window* _pWindow, 
FontWeight _eWeight)
-{
-Font aFont = _pWindow-GetControlFont();
-aFont.SetWeight( _eWeight );
-_pWindow-SetControlFont( aFont );
-}
-
 IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, 
PushButton*, /*_pButton*/)
 {
 OSL_ENSURE(m_pAdminDialog,No Admin dialog set! -GPF);
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx 
b/dbaccess/source/ui/dlg/adminpages.hxx
index c56733c..88a8784 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -228,9 +228,6 @@ namespace dbaui
 static void fillString(SfxItemSet _rSet,Edit* _pEdit,sal_uInt16 _nID, 
bool _bChangedSomething);
 
 protected:
-// used to set the right Pane header of a wizard to bold
-void SetControlFontWeight(Window* _pWindow, FontWeight _eWeight = 
WEIGHT_BOLD);
-
 /** This link be used for controls where the tabpage does not need to 
take any

[Libreoffice-commits] core.git: external/mysqlcppconn

 external/mysqlcppconn/Library_mysqlcppconn.mk |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 8994fac52888fb563751cb79aea88e2fde26263d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Aug 12 10:03:47 2014 +0200

mysqlcppconn: do not force (partial) rebuild each time

Change-Id: I2eb014f143dda22011161e82fbf06fcba32ce3c6

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 1e33370..1670de8 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -74,15 +74,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mysqlcppconn,\

UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
 ))
 
-$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: 
mysqlcppconn_configure
+$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: 
$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h
 
 ifeq ($(SYSTEM_BOOST),)
 MYSQLCPPCONN_BOOST:=-DBOOST_ROOT:STRING=$(call 
gb_UnpackedTarball_get_dir,boost)
 endif
 
-mysqlcppconn_configure: $(call gb_UnpackedTarball_get_target,mysqlcppconn) 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_util.o
+$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h: $(call 
gb_UnpackedTarball_get_target,mysqlcppconn) 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_util.o
cd $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn  cmake 
$(MYSQLCPPCONN_BOOST) ../../../UnpackedTarball/mysqlcppconn/
 
-.PHONY: mysqlcppconn_configure
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - comphelper/source include/comphelper sfx2/source svtools/source

2014-08-12 Thread Armin Le Grand

 comphelper/source/container/embeddedobjectcontainer.cxx |   36 
 include/comphelper/embeddedobjectcontainer.hxx  |3 +
 sfx2/source/appl/linkmgr2.cxx   |   12 -
 svtools/source/misc/embedhlp.cxx|   29 
 4 files changed, 62 insertions(+), 18 deletions(-)

New commits:
commit b6b84b972fc9b997a586ca2e5496eb0617544a1a
Author: Armin Le Grand a...@apache.org
Date:   Thu Aug 7 09:59:26 2014 +

Resolves: #i125386# secured user request and changed some bools to bitfield

(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3)

Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
sfx2/source/appl/linkmgr2.cxx
svtools/source/misc/embedhlp.cxx

Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
(cherry picked from commit d005acae3aa315921f2c331612131626c470bd22)

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 9437893..d7813d7 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -85,7 +85,10 @@ struct EmbedImpl
 uno::WeakReference  uno::XInterface  m_xModel;
 //EmbeddedObjectContainerNameMap maTempObjectContainer;
 //uno::Reference  embed::XStorage  mxTempStorage;
-bool bOwnsStorage;
+
+/// bitfield
+bool mbOwnsStorage : 1;
+bool mbUserAllowsLinkUpdate : 1;
 
 const uno::Reference  embed::XStorage  GetReplacements();
 };
@@ -116,7 +119,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
 {
 pImpl = new EmbedImpl;
 pImpl-mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
-pImpl-bOwnsStorage = true;
+pImpl-mbOwnsStorage = true;
+pImpl-mbUserAllowsLinkUpdate = true;
 pImpl-mpTempObjectContainer = 0;
 }
 
@@ -124,7 +128,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const 
uno::Reference  embed::
 {
 pImpl = new EmbedImpl;
 pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
 pImpl-mpTempObjectContainer = 0;
 }
 
@@ -132,7 +137,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const 
uno::Reference  embed::
 {
 pImpl = new EmbedImpl;
 pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
 pImpl-mpTempObjectContainer = 0;
 pImpl-m_xModel = xModel;
 }
@@ -141,11 +147,11 @@ void EmbeddedObjectContainer::SwitchPersistence( const 
uno::Reference  embed::X
 {
 ReleaseImageSubStorage();
 
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
 pImpl-mxStorage-dispose();
 
 pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
 }
 
 bool EmbeddedObjectContainer::CommitImageSubStorage()
@@ -201,7 +207,7 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer()
 {
 ReleaseImageSubStorage();
 
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
 pImpl-mxStorage-dispose();
 
 delete pImpl-mpTempObjectContainer;
@@ -1360,7 +1366,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool 
_bOasisFormat,bool _bCreateEm
 xStream = GetGraphicStream( xObj, aMediaType );
 }
 
-if ( !xStream.is() )
+if ( !xStream.is()  getUserAllowsLinkUpdate() )
 {
 // the image must be regenerated
 // TODO/LATER: another aspect could be used
@@ -1649,6 +1655,20 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const 
uno::Reference embed::
 }
 return bError;
 }
+
+bool EmbeddedObjectContainer::getUserAllowsLinkUpdate() const
+{
+return pImpl-mbUserAllowsLinkUpdate;
+}
+
+void EmbeddedObjectContainer::setUserAllowsLinkUpdate(bool bNew)
+{
+if(pImpl-mbUserAllowsLinkUpdate != bNew)
+{
+pImpl-mbUserAllowsLinkUpdate = bNew;
+}
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/embeddedobjectcontainer.hxx 
b/include/comphelper/embeddedobjectcontainer.hxx
index 8895a8d..2c8e25f 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -181,6 +181,9 @@ public:
 * \return FALSE/ if no error occurred, otherwise TRUE/.
 */
 bool SetPersistentEntries(const 
com::sun::star::uno::Reference com::sun::star::embed::XStorage  
_xStorage,bool _bClearModifedFlag = true);
+
+bool getUserAllowsLinkUpdate() const;
+void setUserAllowsLinkUpdate(bool bNew);
 };
 
 }
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 2916713..906914d 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++

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

 dbaccess/source/core/api/RowSet.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit aac6ed7a67e70c2548d81484b2930f2a0ce1e4aa
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Aug 6 15:33:46 2014 +0200

Don't leak the previous cache

Conflicts:
dbaccess/source/core/api/RowSet.cxx

Change-Id: I61cb1c608a7de8efc63533085e86c6c17c05f545
Reviewed-on: https://gerrit.libreoffice.org/10795
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index ca83936..d4795ee 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1701,6 +1701,10 @@ Reference XResultSet  
ORowSet::impl_prepareAndExecute_throw()
 aComposedUpdateTableName = composeTableName( 
m_xActiveConnection-getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, 
m_aUpdateTableName, false, ::dbtools::eInDataManipulation );
 
 SAL_INFO(dbaccess, ORowSet::execute_NoApprove_NoNewConn: creating 
cache );
+if(m_pCache)
+{
+DELETEZ(m_pCache);
+}
 m_pCache = new ORowSetCache( xResultSet, m_xComposer.get(), m_aContext, 
aComposedUpdateTableName, m_bModified, 
m_bNew,m_aParameterValueForCache,m_aFilter,m_nMaxRows );
 if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/tool/chartlis.cxx |   23 ---
 1 file changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 99784de15a9921c47799201b555632eefe9d37a3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jul 31 22:09:55 2014 +0200

fix memory leak around chart listeners

Found by Lsan.

The following pattern leaks memory:

boost::ptr_container x;
x.release().release();

Change-Id: Iaf52e4f2d6a96266fc6afd65ef8027d80c97a08b
(cherry picked from commit 42cd7a8a26201fa1db98d6498198db23abef87fc)
Reviewed-on: https://gerrit.libreoffice.org/10741
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 6e15d77..4a96cf6 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -544,39 +544,32 @@ public:
 
 void ScChartListenerCollection::FreeUnused()
 {
-std::vectorScChartListener* aUsed, aUnused;
+ListenersType aUsed, aUnused;
 
 // First, filter each listener into 'used' and 'unused' categories.
 {
-ListenersType::iterator it = maListeners.begin(), itEnd = 
maListeners.end();
-for (; it != itEnd; ++it)
+while(!maListeners.empty())
 {
-ScChartListener* p = it-second;
+ScChartListener* p = maListeners.begin()-second;
 if (p-IsUno())
 {
 // We don't delete UNO charts; they are to be deleted 
separately via FreeUno().
-aUsed.push_back(p);
+aUsed.transfer(maListeners.begin(), maListeners);
 continue;
 }
 
 if (p-IsUsed())
 {
 p-SetUsed(false);
-aUsed.push_back(p);
+aUsed.transfer(maListeners.begin(), maListeners);
 }
 else
-aUnused.push_back(p);
+aUnused.transfer(maListeners.begin(), maListeners);
+
 }
 }
 
-// Release all pointers currently managed by the ptr_map container.
-maListeners.release().release();
-
-// Re-insert the listeners we need to keep.
-std::for_each(aUsed.begin(), aUsed.end(), 
InsertChartListener(maListeners));
-
-// Now, delete the ones no longer needed.
-std::for_each(aUnused.begin(), aUnused.end(), 
boost::checked_deleterScChartListener());
+std::swap(aUsed, maListeners);
 }
 
 void ScChartListenerCollection::FreeUno( const uno::Reference 
chart::XChartDataChangeEventListener  rListener,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Joren De Cuyper

 cui/source/tabpages/paragrph.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit ff12ec8ea00530768d5e07dcc9ab200ce7f54ef6
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Thu Jul 31 12:28:33 2014 +0200

fdo#41350 Expand Single Word only shown active for Last line: Justified

Change-Id: Ibe90d041f15fd007026676ea626c672a9805b263
Reviewed-on: https://gerrit.libreoffice.org/10656
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 21dc407..db62e93 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1171,9 +1171,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
 bool bEnable = m_pJustify-IsChecked();
 m_pLastLineFT-Enable(bEnable);
 m_pLastLineLB-Enable(bEnable);
-m_pExpandCB-Enable(bEnable);
 
-m_pExpandCB-Check(SVX_ADJUST_BLOCK == rAdj.GetOneWord());
 switch(rAdj.GetLastBlock())
 {
 case SVX_ADJUST_LEFT:  nLBSelect = 0; break;
@@ -1183,6 +1181,8 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
 case SVX_ADJUST_BLOCK: nLBSelect = 2;  break;
 default: ; //prevent warning
 }
+m_pExpandCB-Enable(bEnable  nLBSelect == 2);
+m_pExpandCB-Check(SVX_ADJUST_BLOCK == rAdj.GetOneWord());
 }
 else
 {
@@ -1249,13 +1249,17 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl)
 bool bJustify = m_pJustify-IsChecked();
 m_pLastLineFT-Enable(bJustify);
 m_pLastLineLB-Enable(bJustify);
-m_pExpandCB-Enable(bJustify);
+bool bLastLineIsBlock = m_pLastLineLB-GetSelectEntryPos() == 2;
+m_pExpandCB-Enable(bJustify  bLastLineIsBlock);
 UpdateExample_Impl(false);
 return 0;
 }
 
 IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl)
 {
+//fdo#41350 only enable 'Expand last word' if last line is also justified
+bool bLastLineIsBlock = m_pLastLineLB-GetSelectEntryPos() == 2;
+m_pExpandCB-Enable(bLastLineIsBlock);
 UpdateExample_Impl(false);
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Julien Nabet

 vcl/osx/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76e46a52706711c11f1f62373d0db5262dd2be2f
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jul 28 23:14:40 2014 +0200

fdo#39477: Mac Keyboard shortcut Option key ko in Customize dialog

There's still a problem of order of symbols between menu shortcut and the 2 
shortcuts in Customize dialog

Change-Id: I7d8235130e8ddb8aa510a20cf803fbe81038b023
Reviewed-on: https://gerrit.libreoffice.org/10600
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index c799407..d2422ca 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1060,7 +1060,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 // we do not really handle Alt (see below)
 // we map it to MOD3, whichis actually Command
 if( (nKeyCode  (KEY_MOD2|KEY_MOD3)) != 0 )
-aResult.append( sal_Unicode( 0x2303 ) );
+aResult.append( sal_Unicode( 0x2325 ) );
 
 aResult.append( it-second );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread David Tardon

 svtools/source/svrtf/svparser.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 26a0f8b04f7d5ba8ee7e5f68e8379d152b03a2c7
Author: David Tardon dtar...@redhat.com
Date:   Thu Jul 10 16:14:08 2014 +0200

fdo#81044 detect UTF-8 BOM too

Change-Id: I6fd041780b889e2125b916964ba27d032667dcd6
Reviewed-on: https://gerrit.libreoffice.org/10742
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svtools/source/svrtf/svparser.cxx 
b/svtools/source/svrtf/svparser.cxx
index 114e377..d55f6f0 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -185,6 +185,25 @@ sal_Unicode SvParser::GetNextChar()
 }
 }
 }
+else if( 0xef == c1 || 0xbb == c1 ) // check for UTF-8 BOM
+{
+rInput.ReadUChar( c2 );
+bErr = rInput.IsEof() || rInput.GetError();
+if( !bErr )
+{
+if( ( 0xef == c1  0xbb == c2 ) || ( 0xbb == c1  0xef 
== c2 ) )
+{
+unsigned char c3(0);
+rInput.ReadUChar( c3 );
+bErr = rInput.IsEof() || rInput.GetError();
+if( !bErr  ( 0xbf == c3 ) )
+{
+eSrcEnc = RTL_TEXTENCODING_UTF8;
+bSeekBack = false;
+}
+}
+}
+}
 }
 if( bSeekBack )
 rInput.Seek( 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 dbaccess/source/ui/dlg/dlgattr.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2c57f8b716a5e8e378ac4fe85ef1d62a4fc65dce
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 09:01:28 2014 +0100

Resolves: fdo#82413 crash in format-column

Change-Id: I3af776c14ec0f224884488fdc99ee26ebbba7cb8
(cherry picked from commit e2d2fa4f0663cf990c0595f8827ff9123c88d41a)
Reviewed-on: https://gerrit.libreoffice.org/10876
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx 
b/dbaccess/source/ui/dlg/dlgattr.cxx
index 0a83ba3..8af7569 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -39,13 +39,14 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const 
SfxItemSet* pCellAttrs,
 : SfxTabDialog(pParent, FieldDialog, dbaccess/ui/fielddialog.ui, 
pCellAttrs)
 , m_nNumberFormatId(0)
 {
-
 pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
 
 if (bRow)
 SetText(getFixedText(alttitle)-GetText());
 if (bHasFormat)
 m_nNumberFormatId = AddTabPage(format, RID_SVXPAGE_NUMBERFORMAT);
+else
+RemoveTabPage(format);
 AddTabPage(alignment, RID_SVXPAGE_ALIGNMENT);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/jmux/mailmerge-fixes-latest'

2014-08-12 Thread Jan-Marek Glogowski

New branch 'private/jmux/mailmerge-fixes-latest' available with the following 
commits:
commit 51089a0588587ffea23c4facead3c80cefee2648
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sat Aug 9 00:22:00 2014 +0200

fdo#78611 Don't create automatic rules on reset

As we reset all styles, there shouldn't be any unknown automatic
SwNumRules, because all should have been created by the style
copying! And in this case we also have to overwrite the existing
automatic SwNumRules to get a consistent copy.

In case of unknown automatic SwNumRules we just warn and ignore
any inconsistence.

Change-Id: I26e25bccc9a8c7be74f3dceb2e1f91894eac1d0a

commit db54c19ccbc6bf3605343825f836b53f2cc06d94
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Aug 3 12:10:40 2014 +0200

fdo#81782 MM: copy most document properties

Mail merge wasn't copying the document properties into the target
document. It also has to copy most document properties into the
working copy, as ConvertFieldsToText is called just there.

Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041

commit 61978c3c99d03843a7b5e8514a061afc8e1a44ec
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 15:38:32 2014 +0200

MM: restore the non-saving wizard behaviour

The wizard didn't save the MM source document, even if it was modified.

Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5

commit 3307e169db2846ba52a482f6b0caf07c9c58bc64
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 15:36:51 2014 +0200

MM: add missing CreateMonitor handling

The mail merge wizard uses a different progress dialog
(CreateDialog) then the UNO functions (PrintDialog).

This moves the CreateDialog code from the old mail merge function
and unifies some of the dialog handling.

Change-Id: I06088140f604893a33f3ee37507e551b043a193d

commit a33b00b2b78ee8e70f46ce1fde4a594d5548e637
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 15:31:00 2014 +0200

MM: refactor cancel handling for dbui dialogs

This simplifies the handling of CreateMonitor and PrintMonitor in
the combined mail merge function.

Change-Id: Iacf933ec1a6017949b29b3d5f62d5f55c4691053

commit e1be6c1e5534edf43822e58d757d4ae793d42634
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 14:26:40 2014 +0200

MM: Don't adapt the view when saving dbg documents

DoSaveCompleted updates the SwViewShell and recent file lists after
the document was saved via DoSaveAs. So we can simply drop the
call and delete the SfxMedium to save a copy.

Change-Id: I04a0710949ca60e1ff4cab24c6b504deb130db63

commit 399de756430c072a064dbb84b394412803f2e425
Author: Eilidh McAdam eilidh.mca...@gmail.com
Date:   Fri Jul 25 20:38:08 2014 +0100

Remove superfluous merge function.

The only caller of MergeDocuments now uses MergeMailFiles instead,
so MergeDocuments can be removed.

Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4

commit 9b9a9f22b1e3e088340527c3458ed2f514e9a66c
Author: Eilidh McAdam eilidh.mca...@gmail.com
Date:   Fri Jul 25 20:35:43 2014 +0100

Make UNO and wizard mail merge use same function.

Instead of MergeDocuments and MergeMailFiles duplicating largely the
same functionality, the only user of MergeDocuments (MM wizard) now
uses MergeMailFiles.

Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd

commit 369bd7727deef10c1122a291018de4a48b3a15fb
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jul 13 20:18:56 2014 +0200

Refactor a tiny bit of SwLayAction::IsShortCut

Change-Id: I13d4fbebec02bddaa27e8929188d497dde715730

commit 80872c8206b1bf2a7b25daafb53a94d342de01ef
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jul 13 20:15:55 2014 +0200

fdo#80926 Don't move anchors of invalid pages

If the anchor is valid, check if its page is valid too,
before moving anchors on view change.

Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5

commit 1fb45dc4e052a0cb1c88fa45e4601cc7a6be9a69
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 11:09:01 2014 +0200

MM: Fix language for DB dict values

Based on the code from SwCalc::VarLook.

Change-Id: I44220b0fb8332785105719f253897d2177c9c69c

commit 11ec72697670a1ba77e9931200df6da4a8771131
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sat Jul 12 23:17:31 2014 +0200

fdo#70346 MM: add mail merge data to condition dict

Currently section hide conditions are just evaluated based on
document field data.

This adds the current mail merge dataset to the condition
dictionary, so this can be used in the condition evaluation.

The dataset values are named from their columns and added initially,
therefore DB fields with identical names will overwrite the values
in the

Re: Crash test update

2014-08-12 Thread Eike Rathke

Hi Markus,

On Sunday, 2014-08-10 14:19:01 +0200, Markus Mohrhard wrote:

 On Sun, Aug 10, 2014 at 10:27 AM, crashtest.libreoff...@gmail.com
 crashtest.libreoff...@gmail.com wrote:
  New crashtest update available

Apparently the .csv files attached to that mail list number of crashes
per file extension over time, if I didn't misread. If it is easy to
stick a date (ISO 8601 please ;-) to the records I'd appreciate.

And thanks for the huge effort to get this up and running!

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


pgpP579ontiWu.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

New commits:
commit 73bb0fe7953f501747fb6b7c315beda4f253a216
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 10:24:06 2014 +0100

Resolves: fdo#81972 determining capitalization of =63335 char word hangs

Change-Id: I929eb86021883852381df1edf8bf1fb2150e348d

diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index c1cede4..db7d030 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -615,7 +615,7 @@ CapType SAL_CALL capitalType(const OUString aTerm, 
CharClass * pCC)
 {
 OUString aStr(aTerm);
 sal_Int32 nc = 0;
-for (sal_uInt16 tindex = 0; tindex  tlen;  tindex++)
+for (sal_Int32 tindex = 0; tindex  tlen; ++tindex)
 {
 if (pCC-getCharacterType(aStr,tindex) 
::com::sun::star::i18n::KCharacterType::UPPER) nc++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Herbert Dürr

 sfx2/source/appl/impldde.cxx |   72 ++-
 1 file changed, 11 insertions(+), 61 deletions(-)

New commits:
commit 1e7502f3c8b8d751dd851c3f146debf2678781ec
Author: Herbert DÃ¼rr h...@apache.org
Date:   Mon Jul 14 07:17:59 2014 +

Related: #i125226# expect DDE servers to be already up

soffice is always up anyway and other DDE apps should be started manually

(cherry picked from commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0)

Conflicts:
sfx2/source/appl/impldde.cxx

(cherry picked from commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759)

Conflicts:
sfx2/source/appl/impldde.cxx

Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790
Reviewed-on: https://gerrit.libreoffice.org/10297
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index b0b79a21..92b1c7e 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -198,9 +198,6 @@ sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any  
rData /*out param*/,
 
 sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 {
-#if defined(WNT)
-static sal_Bool bInWinExec = sal_False;
-#endif
 sal_uInt16 nLinkType = pSvLink-GetUpdateMode();
 if( pConnection )   // Connection is already made
 {
@@ -227,69 +224,22 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 pConnection = new DdeConnection( sServer, sTopic );
 if( pConnection-GetError() )
 {
-   // Is it possible to address the system-Topic?
-   // then the server is up, it just does not know the topic!
-if( sTopic.equalsIgnoreAsciiCase( SYSTEM ) )
+// check if the DDE server knows the SYSTEM topic
+bool bSysTopic = false;
+if (!sTopic.equalsIgnoreAsciiCase(SYSTEM))
 {
-sal_Bool bSysTopic;
-{
-DdeConnection aTmp(sServer, OUString(SYSTEM));
-bSysTopic = !aTmp.GetError();
-}
-
-if( bSysTopic )
-{
-nError = DDELINK_ERROR_DATA;
-return sal_False;
-}
-// otherwise in  Win/WinNT, start the Application directly
+DdeConnection aTmp(sServer, OUString(SYSTEM));
+bSysTopic = !aTmp.GetError();
 }
 
-#if defined(WNT)
-// check the suitability of starting the DDE server
-const SvtSecurityOptions aSecOpts;
-bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (comphelper::string::indexOfAny(sServer, L:./%\\) != 
-1);
-static const char* aBadServers[] = { cmd, rundll32 };
-for (size_t i = 0; i  sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= sServer.equalsAscii(aBadServers[i]);
-
-// try to start the DDE server if it is not there already
-bForbidden |= (bInWinExec != false);
-if( !bForbidden )
+if( bSysTopic )
 {
-OStringBuffer aCmdLine(OUStringToOString(sServer, 
RTL_TEXTENCODING_ASCII_US));
-aCmdLine.append(.exe );
-aCmdLine.append(OUStringToOString(sTopic, 
RTL_TEXTENCODING_ASCII_US));
-
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED )  32 ) // TODO: 
use CreateProcess() instead
-nError = DDELINK_ERROR_APP;
-else
-{
-sal_uInt16 i;
-for( i=0; i5; i++ )
-{
-bInWinExec = sal_True;
-Application::Reschedule();
-bInWinExec = sal_False;
-
-delete pConnection;
-pConnection = new DdeConnection( sServer, sTopic );
-if( !pConnection-GetError() )
-break;
-}
-
-if( i == 5 )
-{
-nError = DDELINK_ERROR_APP;
-}
-}
-}
-else
-#endif  // WNT
-{
-nError = DDELINK_ERROR_APP;
+// if the system topic works then the server is up but just 
doesn't know the original topic
+nError = DDELINK_ERROR_DATA;
+return false;
 }
+
+nError = DDELINK_ERROR_APP;
 }
 
 if( LINKUPDATE_ALWAYS == nLinkType  !pLink  !pConnection-GetError() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bean/com bean/qa connectivity/com framework/qa nlpsolver/ThirdParty odk/examples qadevOOo/runner reportbuilder/java scripting/java swext/mediawiki wizards/c

2014-08-12 Thread Noel Grandin

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java
  |4 -
 bean/qa/complex/bean/WriterFrame.java  
  |2 
 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java   
  |6 -
 framework/qa/complex/framework/autosave/Protocol.java  
  |   10 +--
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
 |2 
 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java   
  |2 
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
  |8 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java  
  |   32 +-
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
 |8 +-
 qadevOOo/runner/convwatch/HTMLOutputter.java   
  |   22 +++---
 qadevOOo/runner/convwatch/StatusHelper.java
  |2 
 qadevOOo/runner/graphical/HTMLResult.java  
  |8 +-
 qadevOOo/runner/graphical/PerformanceContainer.java
  |2 
 qadevOOo/runner/util/DBTools.java  
  |   16 ++---
 
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
   |2 
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
 |2 
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|2 
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
   |4 -
 
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 |   18 ++---
 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java   
  |6 -
 scripting/java/org/openoffice/idesupport/OfficeInstallation.java   
  |2 
 scripting/java/org/openoffice/idesupport/SVersionRCFile.java   
  |2 
 scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java 
  |2 
 swext/mediawiki/src/com/sun/star/wiki/Helper.java  
  |2 
 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java  
  |2 
 swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java 
  |   18 ++---
 wizards/com/sun/star/wizards/common/NumericalHelper.java   
  |   22 +++---
 wizards/com/sun/star/wizards/db/BlindtextCreator.java  
  |2 
 wizards/com/sun/star/wizards/form/FormControlArranger.java 
  |2 
 wizards/com/sun/star/wizards/form/FormWizard.java  
  |2 
 wizards/com/sun/star/wizards/table/ScenarioSelector.java   
  |4 -
 wizards/com/sun/star/wizards/ui/PathSelection.java 
  |8 +-
 writerfilter/source/dmapper/DomainMapperTableManager.cxx   
  |5 -
 writerfilter/source/dmapper/DomainMapperTableManager.hxx   
  |3 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  
  |2 
 writerfilter/source/dmapper/StyleSheetTable.cxx
  |5 -
 writerfilter/source/dmapper/StyleSheetTable.hxx
  |1 
 writerfilter/source/dmapper/TablePropertiesHandler.cxx 
  |5 -
 writerfilter/source/dmapper/TablePropertiesHandler.hxx 
  |3 
 writerfilter/source/dmapper/TblStylePrHandler.cxx  
  |2 
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java   
  |   10 +--

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

 sc/source/ui/docshell/impex.cxx|2 -
 starmath/source/cfgitem.cxx|2 -
 sw/source/core/access/acccontext.cxx   |6 ++--
 sw/source/core/crsr/crsrsh.cxx |4 +--
 sw/source/core/crsr/crstrvl.cxx|4 +--
 sw/source/core/crsr/unocrsr.cxx|2 -
 sw/source/core/doc/docdraw.cxx |2 -
 sw/source/core/doc/docfld.cxx  |4 +--
 sw/source/core/doc/docfly.cxx  |2 -
 sw/source/core/doc/docfmt.cxx  |2 -
 sw/source/core/doc/doclay.cxx  |2 -
 sw/source/core/doc/docredln.cxx|4 +--
 sw/source/core/doc/htmltbl.cxx |2 -
 sw/source/core/doc/poolfmt.cxx |8 +++---
 sw/source/core/doc/tblafmt.cxx |2 -
 sw/source/core/docnode/ndtbl.cxx   |4 +--
 sw/source/core/docnode/node.cxx|2 -
 sw/source/core/docnode/nodes.cxx   |2 -
 sw/source/core/docnode/section.cxx |2 -
 sw/source/core/docnode/swbaslnk.cxx|6 ++--
 sw/source/core/fields/docufld.cxx  |2 -
 sw/source/core/frmedt/fecopy.cxx   |2 -
 sw/source/core/frmedt/fefly1.cxx   |   10 +++
 sw/source/core/frmedt/feshview.cxx |2 -
 sw/source/core/frmedt/fews.cxx |2 -
 sw/source/core/graphic/grfatr.cxx  |4 +--
 sw/source/core/layout/atrfrm.cxx   |   38 ++---
 sw/source/core/layout/ftnfrm.cxx   |4 +--
 sw/source/core/layout/paintfrm.cxx |4 +--
 sw/source/core/layout/tabfrm.cxx   |2 -
 sw/source/core/ole/ndole.cxx   |4 +--
 sw/source/core/swg/SwXMLTextBlocks.cxx |2 -
 sw/source/core/swg/swblocks.cxx|4 +--
 sw/source/core/text/frmpaint.cxx   |2 -
 sw/source/core/text/inftxt.cxx |2 -
 sw/source/core/text/itrform2.cxx   |2 -
 sw/source/core/text/porlin.cxx |2 -
 sw/source/core/text/portxt.cxx |2 -
 sw/source/core/text/txtdrop.cxx|2 -
 sw/source/core/text/txttab.cxx |2 -
 sw/source/core/tox/tox.cxx |2 -
 sw/source/core/tox/txmsrt.cxx  |4 +--
 sw/source/core/txtnode/atrflyin.cxx|4 +--
 sw/source/core/undo/untbl.cxx  |   12 -
 sw/source/core/view/viewsh.cxx |2 -
 sw/source/filter/ascii/parasc.cxx  |4 +--
 sw/source/filter/html/htmlcss1.cxx |2 -
 sw/source/filter/html/htmlgrin.cxx |2 -
 sw/source/filter/html/htmlsect.cxx |2 -
 sw/source/filter/html/swhtml.cxx   |   14 +--
 sw/source/filter/writer/writer.cxx |6 ++--
 sw/source/filter/ww8/writerhelper.cxx  |4 +--
 sw/source/filter/ww8/wrtw8esh.cxx  |6 ++--
 sw/source/filter/ww8/wrtw8nds.cxx  |6 ++--
 sw/source/filter/ww8/wrtw8sty.cxx  |2 -
 sw/source/filter/ww8/wrtww8.cxx|8 +++---
 sw/source/filter/ww8/wrtww8gr.cxx  |2 -
 sw/source/filter/ww8/ww8atr.cxx|4 +--
 sw/source/filter/ww8/ww8glsy.cxx   |2 -
 sw/source/filter/ww8/ww8graf.cxx   |   32 -
 sw/source/filter/ww8/ww8graf2.cxx  |2 -
 sw/source/filter/ww8/ww8par.cxx|   18 +++---
 sw/source/filter/ww8/ww8par2.cxx   |4 +--
 sw/source/filter/ww8/ww8par3.cxx   |2 -
 sw/source/filter/ww8/ww8par5.cxx   |8 +++---
 sw/source/filter/ww8/ww8par6.cxx   |   12 -
 sw/source/filter/ww8/ww8scan.cxx   |   42 -
 sw/source/filter/xml/xmlfmt.cxx|2 -
 sw/source/filter/xml/xmltexte.cxx  |2 -
 sw/source/ui/dbui/dbinsdlg.cxx |8 +++---
 sw/source/ui/fmtui/tmpdlg.cxx  |2 -
 sw/source/uibase/app/docsh.cxx |2 -
 sw/source/uibase/app/docshini.cxx  |2 -
 sw/source/uibase/app/docstyle.cxx  |   30 +++
 sw/source/uibase/dochdl/swdtflvr.cxx   |4 +--
 sw/source/uibase/docvw/edtdd.cxx   |2 -
 sw/source/uibase/docvw/edtwin.cxx  |2 -
 sw/source/uibase/fldui/fldmgr.cxx  |2 -
 sw/source/uibase/shells/annotsh.cxx|2 -
 sw/source/uibase/shells/drawsh.cxx |2 -
 sw/source/uibase/shells/drformsh.cxx   |2 -
 sw/source/uibase/shells/drwbassh.cxx   |2 -
 sw/source/uibase/shells/drwtxtex.cxx   |2 -
 sw/source/uibase/shells/drwtxtsh.cxx   |6 ++--
 sw/source/uibase/shells/frmsh.cxx  |2 -
 sw/source/uibase/shells/grfsh.cxx  |4 +--
 sw/source/uibase/shells/listsh.cxx |2 -
 sw/source/uibase/shells/tabsh.cxx  |8 +++---
 sw/source/uibase/shells/textidx.cxx|2 -
 sw/source/uibase/shells/textsh.cxx |6 ++--
 sw/source/uibase/shells/textsh1.cxx|2 -
 sw/source/uibase/shells/textsh2.cxx|2 -
 sw/source/uibase/uiview/pview.cxx  |2 -
 sw/source/uibase/uiview/view2.cxx  |6 ++--
 sw/source/uibase/uiview/viewcoll.cxx   |2 -
 sw/source/uibase/uiview/viewdlg.cxx|2 -
 sw/source/uibase/uiview/viewling.cxx   |6 ++--

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

2014-08-12 Thread Matúš Kukan

 oox/source/drawingml/textbodypropertiescontext.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 65b8df84370617b080f20fb0aa18ebe84eb0af3e
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Thu Jul 24 20:03:43 2014 +0200

bnc#887227: Do not set TextAutoGrowHeight for vertical text.

It's horribly broken and it would resize text box
horizontally which is not supposed to happen.

Change-Id: I201ec8dbcddca56d21bf46ea8ee838d01923c442
(cherry picked from commit d068f13596f6d1023a70d98ec2059d38ad6fd777)
Reviewed-on: https://gerrit.libreoffice.org/10541
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index 315f679..80d82a0 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -123,7 +123,11 @@ ContextHandlerRef 
TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement
 mrTextBodyProp.maPropertyMap.setProperty( 
PROP_TextAutoGrowHeight, false);
 break;
 case A_TOKEN( spAutoFit ):
-mrTextBodyProp.maPropertyMap.setProperty( 
PROP_TextAutoGrowHeight, true);
+{
+const sal_Int32 tVert = mrTextBodyProp.moVert.get( 
XML_horz );
+if( tVert != XML_vert  tVert != XML_eaVert  tVert != 
XML_vert270  tVert != XML_mongolianVert )
+mrTextBodyProp.maPropertyMap.setProperty( 
PROP_TextAutoGrowHeight, true);
+}
 break;
 
 case A_TOKEN( scene3d ):// CT_Scene3D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source

2014-08-12 Thread Matúš Kukan

 oox/source/drawingml/textbodypropertiescontext.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ca51beb73336b3a19364df02aab82d56a2a63e74
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Thu Jul 24 20:03:43 2014 +0200

bnc#887227: Do not set TextAutoGrowHeight for vertical text.

It's horribly broken and it would resize text box
horizontally which is not supposed to happen.

(cherry picked from commit d068f13596f6d1023a70d98ec2059d38ad6fd777)

Change-Id: I201ec8dbcddca56d21bf46ea8ee838d01923c442
Reviewed-on: https://gerrit.libreoffice.org/10585
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index b580be3..166ecd0 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -132,7 +132,11 @@ ContextHandlerRef 
TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement
 mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] = 
false;
 break;
 case A_TOKEN( spAutoFit ):
-mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] = 
true;
+{
+const sal_Int32 tVert = mrTextBodyProp.moVert.get( 
XML_horz );
+if( tVert != XML_vert  tVert != XML_eaVert  tVert != 
XML_vert270  tVert != XML_mongolianVert )
+mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight 
] = true;
+}
 break;
 
 case A_TOKEN( scene3d ):// CT_Scene3D
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/lpsolve

 external/lpsolve/ExternalProject_lpsolve.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eda3beff19f95c634fa6f0320e7ab0f942f51f3e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 12 10:18:55 2014 +0200

Let building lpsolve fail when its ccc script fails

(hopefully, the various ccc script variants do not include code that would
unintentionally fail the script with -e)

Change-Id: Ia04291983d99a8cf5a74e6a0078e179c17a93f2b

diff --git a/external/lpsolve/ExternalProject_lpsolve.mk 
b/external/lpsolve/ExternalProject_lpsolve.mk
index e0a9e46..a40ada4 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/external/lpsolve/ExternalProject_lpsolve.mk
@@ -33,7 +33,7 @@ else # $(OS)!=WNT
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
$(call gb_ExternalProject_run,build,\
CC=$(CC) $(if $(debug),$(gb_COMPILERNOOPTFLAGS) 
$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \
-   sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
+   sh -e $(if $(filter MACOSX,$(OS)),ccc.osx, \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
ccc))) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: javaunohelper/test

2014-08-12 Thread rbuj

 javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java |   12 
++
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 43cda91057c2e5aeb361c9a5fde216023de37713
Author: rbuj robert@gmail.com
Date:   Mon Aug 11 12:14:50 2014 +0200

javaunohelper: Fix Bootstrap_Test.java  add warning messages

Accept bootstrap parameters that contained more than one =
Reject empty key

Change-Id: Ie04364867d56d5687cbbc2c142ea73be90bbafdf
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java 
b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index f52ce28..0031e1a 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -94,13 +94,17 @@ public class Bootstrap_Test {
 java.util.HashMapString,String bootstrap_parameters = new 
java.util.HashMapString,String();
 for ( int nPos = 1; nPos  args.length; ++nPos ) {
 if (args[nPos].contains(=)) {
-String bootstrap_parameter[] = args[nPos].split(=);
-if (bootstrap_parameter.length == 2){
+String bootstrap_parameter[] = args[nPos].split(=,2);
+if (bootstrap_parameter[0].length()  0) {
 bootstrap_parameters.put( bootstrap_parameter[0], 
bootstrap_parameter[1] );
-} else{
+} else {
+System.out.println();
+System.out.println(The 1st argument in a bootstrap 
parameter is the key of a HashMap element and can't be null : ' + args[nPos] + 
');
 usage();
 }
-} else{
+} else {
+System.out.println();
+System.out.println(Missing '=' in bootstrap parameter : ' + 
args[nPos] + ');
 usage();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

On Mon, 2014-08-04 at 23:47 +0200, Norbert Thiebaud wrote:
 I guess.. but the point of a formatting rule is easy to read and above
 all _visually consistent_.
 There is apparently debate about the readability of the different
 braces scheme.. but surely there can't be any argument that a mix of
 both is the worse of both world.

FWIW I played around with clang-format to see what combination of rules
gave the smallest diff against the code of sw/source/filter/ww8 and
below is what I got as far as before abandoning that line of thought.

Though I do find this helpful to strip out arbitrary formatting changes
when cherry-picking commits between branches where the source commit has
bundled a stack of formatting changes into a titchy logic change.

C.

---
# BasedOnStyle:  WebKit
AccessModifierOffset: -4
ConstructorInitializerIndentWidth: 4
AlignEscapedNewlinesLeft: false
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortIfStatementsOnASingleLine: false
# AllowShortFunctionsOnASingleLine: SFS_Inline
AllowShortLoopsOnASingleLine: false
AlwaysBreakTemplateDeclarations: false
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: true
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BinPackParameters: true
ColumnLimit: 80
ConstructorInitializerAllOnOneLineOrOnePerLine: false
DerivePointerBinding: false
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: true
MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 60
PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
PenaltyExcessCharacter: 100
PenaltyReturnTypeOnItsOwnLine: 60
PointerBindsToType: true
SpacesBeforeTrailingComments: 1
Cpp11BracedListStyle: false
Standard:Cpp03
IndentWidth: 4
TabWidth:8
UseTab:  Never
BreakBeforeBraces: Allman
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
SpacesInAngles:  false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterControlStatementKeyword: true
SpaceBeforeAssignmentOperators: true
ContinuationIndentWidth: 4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/source/core/unocore/unotext.cxx |   18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit b59931d8a62f761022929f58f27d7ba22536b570
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 12:06:49 2014 +0100

Resolves: fdo#81046 don't crash on compilers that enforce exception specs

bit of a hammer here, the offending property is IsSplitAllowed if someone
wants to attempt a more subtle fix

Change-Id: I37ed623a9947473fcb5c9e2b987d7a3dd9147ffa

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index b2cf10c..83a07f3 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2138,12 +2138,20 @@ lcl_ApplyCellProperties(
 xCellCurs-gotoEnd( sal_True );
 const uno::Reference beans::XPropertyState 
 xCellTextPropState(xCellCurs, uno::UNO_QUERY);
-const beans::PropertyState state = 
xCellTextPropState-getPropertyState(rName);
-if (state == beans::PropertyState_DEFAULT_VALUE)
+try
 {
-const uno::Reference beans::XPropertySet 
-xCellTextProps(xCellCurs, uno::UNO_QUERY);
-xCellTextProps-setPropertyValue(rName, rValue);
+const beans::PropertyState state = 
xCellTextPropState-getPropertyState(rName);
+if (state == beans::PropertyState_DEFAULT_VALUE)
+{
+const uno::Reference beans::XPropertySet 
+xCellTextProps(xCellCurs, uno::UNO_QUERY);
+xCellTextProps-setPropertyValue(rName, rValue);
+}
+}
+catch (const uno::Exception e)
+{
+SAL_WARN( sw.uno, Exception when getting PropertyState: 

++ rName + . Message:  + e.Message );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Problems with extension development and templates

2014-08-12 Thread Andreas Heinlein

Am 11.08.2014 um 13:31 schrieb Stephan Bergmann:
On 08/08/2014 04:12 PM, Andreas Heinlein wrote:
We've been using for some time now an extension to deploy some settings
and templates to our users, which are now using LO 4.2.5.4 and 4.3.0.4
under Ubuntu (from the Ubuntu LibreOffice PPA). This works just fine.
Now some users need this extension under Windows, and surprisingly, it
doesn't work, under the same versions of LO.

The extensions includes some templates, adds the directory containing
them to the list of template directories and sets one of the templates
as the default template. Under Ubuntu, the default template is used and
the template directory shows up in the template selector. Under Windows,
the template directory does not show up and when trying to create a new
blank writer document, LO complains that the default template
...\Standard.ott is defective and needs to be repaired. Repairing it
is not successful. The very same template can be opened manually just
fine (from the same location where the extension installs it,
C:\Users\Username\AppData\Roaming\LibreOffice\4\uno_packages\cache\uno_packages\tmp.XYZ\opendocument\Textdokumente\Standard.ott).

All other aspects of the extension work as expected, i.e. custom
settings and AutoText.

I am attaching what I think are the relevant parts from the extension.
Maybe someone has an idea what is wrong here.
[...]
prop oor:name=FirstStartWizardCompleted oor:type=xs:boolean
valuetrue/value
/prop

One thing to note is that the deprecated FirstStartWizardCompleted
property got removed quite a while ago. But that would not explain
the problem you describe---an unknown property in an extension .xcu
file should just silently be ignored IIRC.

I would suggest you file a bug with a minimal yet complete extension
for reproduction (and report back the bug ID here).

Stephan

Hello,

thanks for the advice. I did so and filed it as bug 82506.

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

[Libreoffice-commits] core.git: configure.ac

 configure.ac |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 382ad7386698ec994e7fe0bdd4f6f0cbaeacefa0
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Aug 12 13:32:09 2014 +0200

 in replacement is *also* a GNU sed extension - not available on MacOS X

Change-Id: Ic4efe84ba6e6d0e36b520957bc56d24e14161966

diff --git a/configure.ac b/configure.ac
index 504fab5..9ae3d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8278,7 +8278,11 @@ if test $ENABLE_MARIADBC = TRUE; then
 if test $enable_bundle_mariadb = yes; then
 AC_MSG_RESULT([yes])
 BUNDLE_MARIADB=TRUE
-LIBMARIADB=lib$(echo ${MARIADB_LIBS} | sed -e 
's/[[[:space:]]]\{1,\}-l/\n/g' -e 's/^-l/\n/g' | grep -E 
'(mysqlclient|mariadb)')
+LIBMARIADB=lib$(echo ${MARIADB_LIBS} | sed -e 
's/[[[:space:]]]\{1,\}-l\([[^[:space:]]]\{1,\}\)/\
+\1\
+/g' -e 's/^-l\([[^[:space:]]]\{1,\}\)[[[:space:]]]*/\
+\1\
+/g' | grep -E '(mysqlclient|mariadb)')
 if test $_os = Darwin; then
 LIBMARIADB=${LIBMARIADB}.dylib
 elif test $_os = WINNT; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=65675

vulc...@gmx.com changed:

   What|Removed |Added

 Depends on||76995

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-08-12 Thread Eike Rathke

 sc/source/filter/excel/excdoc.cxx |2 --
 sc/source/filter/excel/xelink.cxx |5 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8c51532289db36337c4984baec1bf5a7ca9e40af
Author: Eike Rathke er...@redhat.com
Date:   Tue Aug 12 13:53:11 2014 +0200

do not write empty externalReferences element, fdo#45286 follow-up

OOXML validation spewed
- (xl/workbook.xml:2 col:700) cvc-complex-type.2.4.b: The content of
  element Â´externalReferencesÂ´ is not complete. One of
  
Â´{http://schemas.openxmlformats.org/spreadsheetml/2006/main:externalReference}Â´
  is expected.

Change-Id: I80552a0e9ffcc201d0462ac20ce37f6657e43587

diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc/source/filter/excel/excdoc.cxx
index 8dd2b15..416e411 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -371,11 +371,9 @@ void ExcTable::FillAsHeader( ExcBoundsheetList 
rBoundsheetList )
 // COUNTRY - in BIFF8 in workbook globals
 Add( new XclExpCountry( GetRoot() ) );
 
-aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( 
XML_externalReferences ) );
 // link table: SUPBOOK, XCT, CRN, EXTERNNAME, EXTERNSHEET, NAME
 aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );
 aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );
-aRecList.AppendNewRecord( new XclExpXmlEndElementRecord( 
XML_externalReferences ) );
 
 if( GetOutput() != EXC_OUTPUT_BINARY )
 lcl_AddCalcPr( aRecList, *this );
diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index 0a54a6f..f4c4224 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2454,9 +2454,14 @@ void XclExpLinkManagerImpl8::SaveXml( XclExpXmlStream 
rStrm )
 {
 if( !maXtiVec.empty() )
 {
+sax_fastparser::FSHelperPtr pWorkbook = rStrm.GetCurrentStream();
+pWorkbook-startElement( XML_externalReferences, FSEND);
+
 // externalLink, externalBook, sheetNames, sheetDataSet, externalName
 maSBBuffer.SaveXml( rStrm );
 
+pWorkbook-endElement( XML_externalReferences);
+
 // TODO: equivalent for EXTERNSHEET in OOXML?
 #if 0
 for( XclExpXtiVec::const_iterator aIt = maXtiVec.begin(), aEnd = 
maXtiVec.end(); aIt != aEnd; ++aIt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit e9d056ff4a28a4e7be833c22fd6d1e78f245ee43
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 12 14:20:28 2014 +0200

Remove invalid and unnecessary downcast

Change-Id: I2c4daa7057a4faf020b96b587c7a8348adeaeb58

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index d557064..49a260f 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1119,7 +1119,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
 // zeichengebundener Frames in fesh.cxx, SwFEShell::DelFmt()
 SwFrmFmt* pFmt = pAttr-GetFlyCnt().GetFrmFmt();
 if( pFmt )  // vom Undo auf 0 gesetzt ??
-pDoc-DelLayoutFmt( (SwFlyFrmFmt*)pFmt );
+pDoc-DelLayoutFmt( pFmt );
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - comphelper/source include/comphelper sfx2/source svtools/source

2014-08-12 Thread Armin Le Grand

 comphelper/source/container/embeddedobjectcontainer.cxx |   36 
 include/comphelper/embeddedobjectcontainer.hxx  |3 +
 sfx2/source/appl/linkmgr2.cxx   |   12 -
 svtools/source/misc/embedhlp.cxx|   29 
 4 files changed, 62 insertions(+), 18 deletions(-)

New commits:
commit 070f5923eac7a93b64d2f168d91a3983b80a22c0
Author: Armin Le Grand a...@apache.org
Date:   Thu Aug 7 09:59:26 2014 +

Resolves: #i125386# secured user request and changed some bools to bitfield

(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3)

Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
sfx2/source/appl/linkmgr2.cxx
svtools/source/misc/embedhlp.cxx

(cherry picked from commit d005acae3aa315921f2c331612131626c470bd22)

Conflicts:
include/comphelper/embeddedobjectcontainer.hxx

Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
Reviewed-on: https://gerrit.libreoffice.org/10882
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index c3b4338..4fef6c0 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -85,7 +85,10 @@ struct EmbedImpl
 uno::WeakReference  uno::XInterface  m_xModel;
 //EmbeddedObjectContainerNameMap maTempObjectContainer;
 //uno::Reference  embed::XStorage  mxTempStorage;
-bool bOwnsStorage;
+
+/// bitfield
+bool mbOwnsStorage : 1;
+bool mbUserAllowsLinkUpdate : 1;
 
 const uno::Reference  embed::XStorage  GetReplacements();
 };
@@ -116,7 +119,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
 {
 pImpl = new EmbedImpl;
 pImpl-mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
-pImpl-bOwnsStorage = true;
+pImpl-mbOwnsStorage = true;
+pImpl-mbUserAllowsLinkUpdate = true;
 pImpl-mpTempObjectContainer = 0;
 }
 
@@ -124,7 +128,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const 
uno::Reference  embed::
 {
 pImpl = new EmbedImpl;
 pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
 pImpl-mpTempObjectContainer = 0;
 }
 
@@ -132,7 +137,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const 
uno::Reference  embed::
 {
 pImpl = new EmbedImpl;
 pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
 pImpl-mpTempObjectContainer = 0;
 pImpl-m_xModel = xModel;
 }
@@ -141,11 +147,11 @@ void EmbeddedObjectContainer::SwitchPersistence( const 
uno::Reference  embed::X
 {
 ReleaseImageSubStorage();
 
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
 pImpl-mxStorage-dispose();
 
 pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
 }
 
 sal_Bool EmbeddedObjectContainer::CommitImageSubStorage()
@@ -201,7 +207,7 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer()
 {
 ReleaseImageSubStorage();
 
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
 pImpl-mxStorage-dispose();
 
 delete pImpl-mpTempObjectContainer;
@@ -1378,7 +1384,7 @@ sal_Bool 
EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
 xStream = GetGraphicStream( xObj, aMediaType );
 }
 
-if ( !xStream.is() )
+if ( !xStream.is()  getUserAllowsLinkUpdate() )
 {
 // the image must be regenerated
 // TODO/LATER: another aspect could be used
@@ -1667,6 +1673,20 @@ sal_Bool 
EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference emb
 }
 return bError;
 }
+
+bool EmbeddedObjectContainer::getUserAllowsLinkUpdate() const
+{
+return pImpl-mbUserAllowsLinkUpdate;
+}
+
+void EmbeddedObjectContainer::setUserAllowsLinkUpdate(bool bNew)
+{
+if(pImpl-mbUserAllowsLinkUpdate != bNew)
+{
+pImpl-mbUserAllowsLinkUpdate = bNew;
+}
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/embeddedobjectcontainer.hxx 
b/include/comphelper/embeddedobjectcontainer.hxx
index 616ca0f..270ef1b 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -177,6 +177,9 @@ public:
 * \return FALSE/ if no error occurred, otherwise TRUE/.
 */
 sal_Bool SetPersistentEntries(const 
com::sun::star::uno::Reference com::sun::star::embed::XStorage  
_xStorage,bool _bClearModifedFlag = true);
+
+bool

[Libreoffice-commits] core.git: include/svx

 include/svx/sdr/animation/scheduler.hxx |   52 
 1 file changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 17aab9bd958f2c1ba7345808243bcc6c8dec2cdd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 12 14:46:03 2014 +0200

Generally better to have DLLPUBLIC class with some DLLPRIVATE members

...in the same vein as 80a1a2599e04142683d2286d0e32d0e13fb45de3.

Change-Id: I3f140f9f3a767f5ac8c9c2f13096d72f8ebb6d1c

diff --git a/include/svx/sdr/animation/scheduler.hxx 
b/include/svx/sdr/animation/scheduler.hxx
index b9b8ab0..5a5ca9e 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -31,7 +31,7 @@ namespace sdr
 {
 namespace animation
 {
-class Event
+class SVX_DLLPUBLIC Event
 {
 // time of event in ms
 sal_uInt32  mnTime;
@@ -41,16 +41,16 @@ namespace sdr
 
 public:
 // constructor/destructor
-explicit Event(sal_uInt32 nTime);
-SVX_DLLPUBLIC virtual ~Event();
+SAL_DLLPRIVATE explicit Event(sal_uInt32 nTime);
+virtual ~Event();
 
 // access to mpNext
-Event* GetNext() const {  return mpNext; }
-void SetNext(Event* pNew);
+SAL_DLLPRIVATE Event* GetNext() const {  return mpNext; }
+SAL_DLLPRIVATE void SetNext(Event* pNew);
 
 // get/set time
-sal_uInt32 GetTime() const {  return mnTime; }
-void SVX_DLLPUBLIC SetTime(sal_uInt32 nNew);
+SAL_DLLPRIVATE sal_uInt32 GetTime() const {  return mnTime; }
+void SetTime(sal_uInt32 nNew);
 
 // execute event
 virtual void Trigger(sal_uInt32 nTime) = 0;
@@ -65,25 +65,25 @@ namespace sdr
 {
 namespace animation
 {
-class EventList
+class SVX_DLLPUBLIC EventList
 {
 // pointer to first entry
 Event*  mpHead;
 
 public:
 // constructor/destructor
-EventList();
-SVX_DLLPUBLIC virtual ~EventList();
+SAL_DLLPRIVATE EventList();
+virtual ~EventList();
 
 // insert/remove time dependent
-void Insert(Event* pNew);
-void Remove(Event* pOld);
+SAL_DLLPRIVATE void Insert(Event* pNew);
+SAL_DLLPRIVATE void Remove(Event* pOld);
 
 // clear list
-void Clear();
+SAL_DLLPRIVATE void Clear();
 
 // get first
-Event* GetFirst() {  return mpHead; }
+SAL_DLLPRIVATE Event* GetFirst() {  return mpHead; }
 };
 } // end of namespace animation
 } // end of namespace sdr
@@ -95,7 +95,7 @@ namespace sdr
 {
 namespace animation
 {
-class Scheduler : public Timer
+class SVX_DLLPUBLIC Scheduler : public Timer
 {
 // time in ms
 sal_uInt32  mnTime;
@@ -112,31 +112,31 @@ namespace sdr
 
 public:
 // constructor/destructor
-Scheduler();
-SVX_DLLPUBLIC virtual ~Scheduler();
+SAL_DLLPRIVATE Scheduler();
+virtual ~Scheduler();
 
 // From baseclass Timer, the timeout call
-SVX_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE;
+virtual void Timeout() SAL_OVERRIDE;
 
 // get time
-sal_uInt32 GetTime() {  return mnTime; }
+SAL_DLLPRIVATE sal_uInt32 GetTime() {  return mnTime; }
 
 // #i38135#
-void SetTime(sal_uInt32 nTime);
+SAL_DLLPRIVATE void SetTime(sal_uInt32 nTime);
 
 // execute all ripe events, removes executed ones from the 
scheduler
-void triggerEvents();
+SAL_DLLPRIVATE void triggerEvents();
 
 // re-start or stop timer according to event list
-void checkTimeout();
+SAL_DLLPRIVATE void checkTimeout();
 
 // insert/remove events, wrapper to EventList methods
-void SVX_DLLPUBLIC InsertEvent(Event* pNew);
-void RemoveEvent(Event* pOld);
+void InsertEvent(Event* pNew);
+SAL_DLLPRIVATE void RemoveEvent(Event* pOld);
 
 // get/set pause
-bool IsPaused() const { return mbIsPaused; }
-void SetPaused(bool bNew);
+SAL_DLLPRIVATE bool IsPaused() const { return mbIsPaused; }
+SAL_DLLPRIVATE void SetPaused(bool bNew);
 };
 } // end of namespace animation
 } // end of namespace sdr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

 editeng/source/editeng/impedit3.cxx |1 +
 svx/source/svdraw/svdotext.cxx  |2 ++
 svx/source/svdraw/svdotxed.cxx  |1 +
 3 files changed, 4 insertions(+)

New commits:
commit 585a092eddcc9c4ac3f39abd798c69bc2f34a0d2
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 14:45:22 2014 +0200

Experiment: setting fixed Max height from SdrTextObj

Change-Id: I734400203befe89803a07ad73b8b9a83b61e58f3

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 9944878..a9b7483 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -546,6 +546,7 @@ void ImpEditEngine::CheckAutoPageSize()
 // FIXME(matteocam)
 /* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
 ? YES Overflow!\n  : NO Overflow!\n ); */
+fprintf( stderr, aPaperSize.Height = %d\n, aPaperSize.Height() );
 // setting overflow status
 if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
 // which paragraph is the first to cause higher size of the box?
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index cbdec1e..aefaca8 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -750,6 +750,8 @@ void SdrTextObj::TakeTextRect( SdrOutliner rOutliner, 
Rectangle rTextRect, boo
 else
 {
 nHgt = 100;
+// FIXME(matteocam)
+nHgt = 2000;
 }
 
 rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 9151fe4..4f62e0b 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -189,6 +189,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 else
 {
 nMaxHgt = 100;
+nMaxHgt = 2000;
 }
 
 aPaperMax.Width()=nMaxWdt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source

 svx/source/svdraw/svdotextdecomposition.cxx |3 ++-
 svx/source/svdraw/svdotxed.cxx  |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 655a706988e4870dc577ea84373f536b8bab8b3f
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 15:01:49 2014 +0200

Experiment: ensuring that EE_CNTRL_AUTOPAGESIZE is not set

Change-Id: I86da72907044ea32b886fa6baa4d8171401c3990

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 4f62e0b..36e3d7e 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -62,6 +62,10 @@ bool SdrTextObj::BegTextEdit(SdrOutliner rOutl)
 rOutl.SetControlWord(nStat);
 }
 
+// FIXME(matteocam)
+nStat=~EE_CNTRL_AUTOPAGESIZE;
+rOutl.SetControlWord(nStat);
+
 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 if(pOutlinerParaObject!=NULL)
 {
commit 21bea773ca7778588543fb7cb4733a35e7257d1e
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 14:58:30 2014 +0200

Experiment: chained text boundaries in impDecomposeBlockTextPrimitive

Change-Id: Ia022f8ac3fa50a2c2c24fbb0193c213411452300

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 4ed8b58..882136b 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -935,7 +935,8 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 rOutliner.SetFixedCellHeight(rSdrBlockTextPrimitive.isFixedCellHeight());
 rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE);
 rOutliner.SetMinAutoPaperSize(aNullSize);
-rOutliner.SetMaxAutoPaperSize(Size(100,100));
+//rOutliner.SetMaxAutoPaperSize(Size(100,100));
+rOutliner.SetMaxAutoPaperSize(Size(100,2000));
 
 // Resolves: fdo#35779 set background color of this shape as the editeng 
background if there
 // is one. Check the shape itself, then the host page, then that page's 
master page.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/refactor-god-objects' - 7 commits - sw/inc sw/Library_sw.mk sw/qa sw/source

2014-08-12 Thread Valentin Kettner

Rebased ref, commits from common ancestor:
commit db4bfe0eeb0172d5b1da86f097f20d3c6ab727bb
Author: Valentin Kettner vakevk+libreoff...@gmail.com
Date:   Tue Aug 12 15:03:19 2014 +0200

Refactored IDocumentExternalData out of SwDoc.

Into the new class DocumentExternalDataManager.

Change-Id: Ib863daec170044c46143b47a91739d4c0940d963

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 507b94c..66eb006 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -201,6 +201,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/doc/DocumentStateManager \
 sw/source/core/doc/DocumentLayoutManager \
 sw/source/core/doc/DocumentStylePoolManager \
+sw/source/core/doc/DocumentExternalDataManager \
 sw/source/core/doc/extinput \
 sw/source/core/doc/fmtcol \
 sw/source/core/doc/ftnidx \
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3d6c265..e000a91 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -22,7 +22,6 @@
 // SwDoc interfaces
 #include IInterface.hxx
 #include IDocumentMarkAccess.hxx
-#include IDocumentExternalData.hxx
 #include com/sun/star/embed/XEmbeddedObject.hpp
 #include com/sun/star/embed/XStorage.hpp
 #include vcl/timer.hxx
@@ -191,6 +190,7 @@ class IDocumentStatistics;
 class IDocumentState;
 class IDocumentLayoutAccess;
 class IDocumentStylePoolAccess;
+class IDocumentExternalData;
 class _SetGetExpFlds;
 
 namespace sw { namespace mark {
@@ -216,6 +216,7 @@ namespace sw {
 class DocumentStateManager;
 class DocumentLayoutManager;
 class DocumentStylePoolManager;
+class DocumentExternalDataManager;
 }
 
 namespace com { namespace sun { namespace star {
@@ -252,8 +253,7 @@ void StartGrammarChecking( SwDoc rDoc );
 
 // Represents the model of a Writer document.
 class SW_DLLPUBLIC SwDoc :
-public IInterface,
-public IDocumentExternalData
+public IInterface
 {
 friend class ::sw::DocumentContentOperationsManager;
 
@@ -295,6 +295,7 @@ class SW_DLLPUBLIC SwDoc :
 const ::boost::scoped_ptr ::sw::DocumentStatisticsManager  
m_pDocumentStatisticsManager;
 const ::boost::scoped_ptr ::sw::DocumentLayoutManager  
m_pDocumentLayoutManager;
 const ::boost::scoped_ptr ::sw::DocumentStylePoolManager  
m_pDocumentStylePoolManager;
+const ::boost::scoped_ptr ::sw::DocumentExternalDataManager  
m_pDocumentExternalDataManager;
 
 // Pointer
 SwFrmFmt*mpDfltFrmFmt;   // Default formats.
@@ -603,10 +604,11 @@ public:
 IDocumentListsAccess const  getIDocumentListsAccess() const;
 IDocumentListsAccess  getIDocumentListsAccess();
 
-// IDocumentExternalData
-virtual void setExternalData(::sw::tExternalDataType eType,
- ::sw::tExternalDataPointer pPayload) 
SAL_OVERRIDE;
-virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType 
eType) SAL_OVERRIDE;
+//IDocumentExternalData
+IDocumentExternalData const  getIDocumentExternalData() const;
+IDocumentExternalData  getIDocumentExternalData();
+
+//End of Interfaces
 
 virtual void setDocReadOnly( bool b) { mbReadOnly = b; }
 virtual bool getDocReadOnly() const { return mbReadOnly; }
diff --git a/sw/source/core/doc/DocumentExternalDataManager.cxx 
b/sw/source/core/doc/DocumentExternalDataManager.cxx
new file mode 100644
index 000..3e751a3
--- /dev/null
+++ b/sw/source/core/doc/DocumentExternalDataManager.cxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include DocumentExternalDataManager.hxx
+
+namespace sw
+{
+
+void DocumentExternalDataManager::setExternalData(::sw::tExternalDataType 
eType, ::sw::tExternalDataPointer pPayload)
+{
+m_externalData[eType] = pPayload;
+}
+
+::sw::tExternalDataPointer 
DocumentExternalDataManager::getExternalData(::sw::tExternalDataType eType)
+{
+return m_externalData[eType];
+}
+
+}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1827f24..fad297ac 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -34,6 +34,7 @@
 #include DocumentStateManager.hxx
 #include

[Libreoffice-commits] core.git: bin/findunusedcode

2014-08-12 Thread Zolnai Tamás

 bin/findunusedcode |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 86f19fcb5a850181de51706fe4d1700aad174830
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Tue Aug 12 15:09:09 2014 +0200

Adapt findunusedcode to the current libgltf

Change-Id: I5f5e5f3c8b60e543892aaf683f445184e1f10f74

diff --git a/bin/findunusedcode b/bin/findunusedcode
index df865bc..d1ff0f9 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -55,11 +55,11 @@ grep ::.*\( unusedcode.all \
  | grep -v ^cppu:: \
  | grep -v ^CppUnit:: \
  | grep -v ^Dde \
- | grep -v ^glTF:: \
  | grep -v ^graphite2:: \
  | grep -v ^jvmaccess:: \
  | grep -v ^libcdr:: \
  | grep -v ^libcmis:: \
+ | grep -v ^libgltf:: \
  | grep -v ^libmspub:: \
  | grep -v ^libvisio:: \
  | grep -v ^libwpg:: \
@@ -87,9 +87,4 @@ grep ::.*\( unusedcode.all \
  | grep -v ^MathML:: \
  | grep -v ^GeneratedSaxParser:: \
  | grep -v ^GLTF:: \
- | grep -v ^FPSCounter:: \
- | grep -v ^CPhysicalCamera:: \
- | grep -v ^RenderScene:: \
- | grep -v ^ShaderProgram:: \
- | grep -v ^Texture:: \
   ../unusedcode.easy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/osx

2014-08-12 Thread Julien Nabet

 vcl/osx/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e401d50cf6c2ab09b7dd13165a179a94d86e9301
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jul 28 23:14:40 2014 +0200

fdo#39477: Mac Keyboard shortcut Option key ko in Customize dialog

There's still a problem of order of symbols between menu shortcut and the 2 
shortcuts in Customize dialog

Change-Id: I7d8235130e8ddb8aa510a20cf803fbe81038b023
Reviewed-on: https://gerrit.libreoffice.org/10600
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 76e46a52706711c11f1f62373d0db5262dd2be2f)
Reviewed-on: https://gerrit.libreoffice.org/10881

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index c799407..d2422ca 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1060,7 +1060,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 // we do not really handle Alt (see below)
 // we map it to MOD3, whichis actually Command
 if( (nKeyCode  (KEY_MOD2|KEY_MOD3)) != 0 )
-aResult.append( sal_Unicode( 0x2303 ) );
+aResult.append( sal_Unicode( 0x2325 ) );
 
 aResult.append( it-second );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit ecc5c10f26f39ccb91592f09514dd000ca244368
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 11 22:24:54 2014 +0200

fdo#81995: fix Outline numbering tab page

The ParentNumbering property is not a string.

(regression from 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53)

Change-Id: Ib33e95847b388bb1126a63812e128c96a0c00730
(cherry picked from commit 4d3c9ed257e51af55f358d2b44d5fc2e341c7202)
Reviewed-on: https://gerrit.libreoffice.org/10874
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit 03d44c7670413b730b1445eeab5210cff8245786)
Reviewed-on: https://gerrit.libreoffice.org/10880
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index bcd087f..212b626 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1585,7 +1585,7 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
 pValues[4].Name = BulletFontName;
 pValues[4].Value = pTemp-sBulletFontName;
 pValues[5].Name = ParentNumbering;
-pValues[5].Value = OUString::number(pTemp-nParentNumbering);
+pValues[5].Value = pTemp-nParentNumbering;
 pValues[6].Name = LeftMargin;
 pValues[6].Value = pTemp-nLeftMargin;
 pValues[7].Name = SymbolTextDistance;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

 svx/source/svdraw/svdotxed.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit e3d0a465dbe9c1de20c81e8b6c33283fba4c5e57
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 15:28:52 2014 +0200

Experiment: other changes

Change-Id: I75e6f7f67743430b74afcfff4f9dd3fea33daa22

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 36e3d7e..04670ce 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -63,8 +63,9 @@ bool SdrTextObj::BegTextEdit(SdrOutliner rOutl)
 }
 
 // FIXME(matteocam)
-nStat=~EE_CNTRL_AUTOPAGESIZE;
-rOutl.SetControlWord(nStat);
+sal_uIntPtr nStat1=rOutl.GetControlWord();
+nStat1 =~EE_CNTRL_AUTOPAGESIZE;
+rOutl.SetControlWord(nStat1);
 
 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 if(pOutlinerParaObject!=NULL)
@@ -138,7 +139,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 }
 Size aAnkSiz(aViewInit.GetSize());
 aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() adds 1
-Size aMaxSiz(100,100);
+Size aMaxSiz(1100,100);
 if (pModel!=NULL) {
 Size aTmpSiz(pModel-GetMaxObjSize());
 if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width();
@@ -193,7 +194,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 else
 {
 nMaxHgt = 100;
-nMaxHgt = 2000;
 }
 
 aPaperMax.Width()=nMaxWdt;
@@ -249,6 +249,9 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 aPaperMin.Height() = 0;
 }
 
+// FIXME(matteocam)
+aPaperMax.Height() = 2000;
+
 if (pPaperMin!=NULL) *pPaperMin=aPaperMin;
 if (pPaperMax!=NULL) *pPaperMax=aPaperMax;
 if (pViewInit!=NULL) *pViewInit=aViewInit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Adolfo Jayme Barrientos

 svtools/source/misc/sampletext.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 25e81910d1b560c7ef05a907abbf80fb2c647d32
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Thu Aug 7 10:15:30 2014 -0500

Related: fdo#82259 list Apple Color Emoji as a symbol font.

Note that this is a blind fix, as I donât have an OS X machine.

Change-Id: I43a98fbbee06117b914eae332d48b2793a266bce
Reviewed-on: https://gerrit.libreoffice.org/10812
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 66953cd..59440c1 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -22,6 +22,7 @@ bool isOpenSymbolFont(const Font rFont)
 bool isSymbolFont(const Font rFont)
 {
 return (rFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL) ||
+rFont.GetName().equalsIgnoreAsciiCase(Apple Color Emoji) ||
 rFont.GetName().equalsIgnoreAsciiCase(cmsy10) ||
 rFont.GetName().equalsIgnoreAsciiCase(cmex10) ||
 rFont.GetName().equalsIgnoreAsciiCase(feta26) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

 svx/source/svdraw/svdotxed.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 82cdf6e57e2d37501828c25cf7a8dfe660c1fa57
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 15:41:16 2014 +0200

No more explicit unsetting of EE_CNTRL_AUTOPAGESIZE

Change-Id: I5a2a1e0cbba7bda10192eab5505cae26e30f2b8a

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 04670ce..8569775 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -63,9 +63,9 @@ bool SdrTextObj::BegTextEdit(SdrOutliner rOutl)
 }
 
 // FIXME(matteocam)
-sal_uIntPtr nStat1=rOutl.GetControlWord();
+/*sal_uIntPtr nStat1=rOutl.GetControlWord();
 nStat1 =~EE_CNTRL_AUTOPAGESIZE;
-rOutl.SetControlWord(nStat1);
+rOutl.SetControlWord(nStat1);*/
 
 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 if(pOutlinerParaObject!=NULL)
@@ -139,7 +139,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 }
 Size aAnkSiz(aViewInit.GetSize());
 aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() adds 1
-Size aMaxSiz(1100,100);
+Size aMaxSiz(100,100);
 if (pModel!=NULL) {
 Size aTmpSiz(pModel-GetMaxObjSize());
 if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

 svx/source/svdraw/svdotxed.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a8b586318fbf65a9092d492ff4603b4cdfa1f64
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 15:52:29 2014 +0200

restoring unsetting of EE_CNTRL_AUTOPAGESIZE

Change-Id: Ic23f7d8e1646dac7ed3e0ec8d41e7ed2cb56f2aa

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 8569775..57e1ed9 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -63,9 +63,9 @@ bool SdrTextObj::BegTextEdit(SdrOutliner rOutl)
 }
 
 // FIXME(matteocam)
-/*sal_uIntPtr nStat1=rOutl.GetControlWord();
+sal_uIntPtr nStat1=rOutl.GetControlWord();
 nStat1 =~EE_CNTRL_AUTOPAGESIZE;
-rOutl.SetControlWord(nStat1);*/
+rOutl.SetControlWord(nStat1);
 
 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 if(pOutlinerParaObject!=NULL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svtools/source/misc/sampletext.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 662af47c3c1628700661a8d5ccfee784f7e2195b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 14:57:14 2014 +0100

Related: fdo#82259 OpenSymbol doesn't have 0x2706 or 0x2704 so no preview

Change-Id: I2164cb2c37c7b13759e47561002024fd2bb577f9

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 257a97f..63c0577 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -90,7 +90,7 @@ OUString 
makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice)
 static const sal_Unicode aImplSymbolFontText[] = {
 0xF021,0xF032,0xF043,0xF054,0xF065,0xF076,0xF0B7,0xF0C8,0};
 static const sal_Unicode aImplStarSymbolText[] = {
-0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0};
+0x2702,0x2708,0x270D,0xE033,0x2211,0x2288,0};
 const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : 
aImplSymbolFontText;
 OUString sSampleText(pText);
 bool bHasSampleTextGlyphs = (-1 == rDevice.HasGlyphs(rDevice.GetFont(), 
sSampleText));
commit 16076f120340673ad64df1614206f0e13e3539d5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 14:42:26 2014 +0100

Resolves: fdo#82259 use same symbol strategy on all platforms

Change-Id: Ia4f0a36c8a95849b7c8551b930873e912b673537

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 905ddec..257a97f 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -65,11 +65,6 @@ OUString 
makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice)
 
 // start just above the PUA used by most symbol fonts
 sal_uInt32 cNewChar = 0xFF00;
-#ifdef MACOSX
-// on MacOSX there are too many non-presentable symbols above the 
codepoint 0x0192
-if( !bOpenSymbol )
-cNewChar = 0x0192;
-#endif
 
 const int nMaxCount = sizeof(aText)/sizeof(*aText) - 1;
 int nSkip = aFontCharMap.GetCharCount() / nMaxCount;
commit b56bb5dce9a225bb0b8d6c57120da55e4cae7def
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 14:40:48 2014 +0100

Related: fdo#82259 all the STIX fonts are really for symbols

Change-Id: Id032f1b643199a57c6fc08ccf580a54ff2370861

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 59440c1..905ddec 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -40,6 +40,7 @@ bool isSymbolFont(const Font rFont)
 rFont.GetName().equalsIgnoreAsciiCase(MusiQwik) ||
 rFont.GetName().equalsIgnoreAsciiCase(MusiSync) ||
 rFont.GetName().equalsIgnoreAsciiCase(stmary10) ||
+rFont.GetName().startsWith(STIX) ||
 isOpenSymbolFont(rFont);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

 xmlsecurity/Library_xsec_xmlsec.mk|1 
 xmlsecurity/source/xmlsec/diagnose.cxx|   66 
--
 xmlsecurity/source/xmlsec/diagnose.hxx|   34 
-
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   36 
++---
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx  |   41 
++
 xmlsecurity/source/xmlsec/nss/secerror.cxx|   21 
+--
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   32 
++--
 7 files changed, 53 insertions(+), 178 deletions(-)

New commits:
commit 595e446affaf6da3061c10d1d865636fbf860370
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 14:41:21 2014 +0300

Get rid of xmlsec_trace() and use SAL_INFO(xmlsecurity.xmlsec)

Change-Id: I3e1db89de2019285ce313f9bae1375a5b82f6383

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index 62ba180..5fc4fc1 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/biginteger \
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl \
xmlsecurity/source/xmlsec/certvalidity \
-   xmlsecurity/source/xmlsec/diagnose \
xmlsecurity/source/xmlsec/errorcallback \
xmlsecurity/source/xmlsec/saxhelper \
xmlsecurity/source/xmlsec/serialnumberadapter \
diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx 
b/xmlsecurity/source/xmlsec/diagnose.cxx
deleted file mode 100644
index f867a77..000
--- a/xmlsecurity/source/xmlsec/diagnose.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include diagnose.hxx
-#include stdio.h
-#include stdarg.h
-#include rtl/instance.hxx
-#include rtl/bootstrap.hxx
-
-namespace xmlsecurity {
-
-struct UseDiagnose : public rtl::StaticWithInit bool, UseDiagnose
-{
-bool operator () () const
-{
-OUString value;
-bool res = rtl::Bootstrap::get( OUString(XMLSECURITY_TRACE), value);
-return res;
-}
-};
-
-/* the function will print the string when
-   - build with debug
-   - the bootstrap variable XMLSECURITY_TRACE is set.
- */
-void xmlsec_trace(const char* pszFormat, ...)
-{
-bool bDebug = false;
-
-#if OSL_DEBUG_LEVEL  1
-bDebug = true;
-#endif
-if (bDebug || UseDiagnose::get())
-{
-va_list args;
-fprintf(stderr, [xmlsecurity] );
-va_start(args, pszFormat);
-vfprintf(stderr, pszFormat, args);
-va_end(args);
-
-fprintf(stderr,\n);
-fflush(stderr);
-}
-}
-
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/diagnose.hxx 
b/xmlsecurity/source/xmlsec/diagnose.hxx
deleted file mode 100644
index e0cc393..000
--- a/xmlsecurity/source/xmlsec/diagnose.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_DIAGNOSE_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_DIAGNOSE_HXX
-
-
-namespace xmlsecurity
-{
-
-void xmlsec_trace(const char*

[Libreoffice-commits] core.git: 4 commits - bin/lo-all-static-libs external/libxmlsec external/nss ios/experimental postprocess/Rdb_services.mk RepositoryExternal.mk solenv/bin xmlsecurity/Module_xmls

 RepositoryExternal.mk| 
   2 
 bin/lo-all-static-libs   | 
  13 
 external/libxmlsec/ExternalProject_xmlsec.mk | 
   2 
 external/libxmlsec/Module_libxmlsec.mk   | 
   2 
 external/nss/UnpackedTarball_nss.mk  | 
   1 
 external/nss/nss-chromium-nss-static.patch   | 
 487 ++
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
 168 +++
 postprocess/Rdb_services.mk  | 
   3 
 solenv/bin/native-code.py| 
   1 
 xmlsecurity/Module_xmlsecurity.mk| 
   2 
 10 files changed, 676 insertions(+), 5 deletions(-)

New commits:
commit 296e0a20ca60139ec9f59096f8330a0006804ca0
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 16:56:17 2014 +0300

Some objects in NSS are not in any of the archives

Change-Id: I3df4c45d160687f22015f3b3d3c87e655e5cd7d7

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 7532164..1d93afe 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -44,6 +44,14 @@ IOS)
 oslibs=$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a
 oslibs=$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a
 oslibs=$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a
+
+# The NSS dylibs (which we don't build for iOS) are constructed
+# from a bunch of static archives and some freestanding object
+# files (that are not present in any of the static archives). We
+# need the latter too, so collect them here into an archive of
+# their own.
+ar cr $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/libLOtemp.a 
$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o
+
 # Unfortunately NSS's build mechanism copies each static archive
 # it constructs to another place, but we don't bother filtering
 # out duplicates, it shouldn't hurt.
commit d308eda13dc2168d166e51ec55e1655fb546f3f1
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 16:55:13 2014 +0300

Use Chromium's patch to build NSS statically for iOS

Change-Id: Ica2cf641bc54f6e924b759cd4cf96dd96347c53b

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 4e14e35..0ca3de2 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nspr-build-config.patch \
 external/nss/ubsan.patch.0 \
 $(if $(filter IOS,$(OS)), \
+external/nss/nss-chromium-nss-static.patch \
 external/nss/nss-ios.patch) \
 ))
 
diff --git a/external/nss/nss-chromium-nss-static.patch 
b/external/nss/nss-chromium-nss-static.patch
new file mode 100644
index 000..9d7a4e4
--- /dev/null
+++ b/external/nss/nss-chromium-nss-static.patch
@@ -0,0 +1,487 @@
+Based on 
http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/nss/patches/nss-static.patch
+
+--- a/a/nss/lib/certhigh/certvfy.cTue May 28 23:37:46 2013 +0200
 a/a/nss/lib/certhigh/certvfy.cFri May 31 17:44:06 2013 -0700
+@@ -13,9 +13,11 @@
+ #include certdb.h
+ #include certi.h
+ #include cryptohi.h
++#ifndef NSS_DISABLE_LIBPKIX
+ #include pkix.h
+ /*#include pkix_sample_modules.h */
+ #include pkix_pl_cert.h
++#endif  /* NSS_DISABLE_LIBPKIX */
+ 
+ 
+ #include nsspki.h
+@@ -24,6 +26,47 @@
+ #include pki3hack.h
+ #include base.h
+ 
++#ifdef NSS_DISABLE_LIBPKIX
++SECStatus
++cert_VerifyCertChainPkix(
++CERTCertificate *cert,
++PRBool   checkSig,
++SECCertUsage requiredUsage,
++PRTime   time,
++void*wincx,
++CERTVerifyLog   *log,
++PRBool  *pSigerror,
++PRBool  *pRevoked)
++{
++PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
++return SECFailure;
++}
++
++SECStatus
++CERT_SetUsePKIXForValidation(PRBool enable)
++{
++PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
++return SECFailure;
++}
++
++PRBool
++CERT_GetUsePKIXForValidation()
++{
++return PR_FALSE;
++}
++
++SECStatus CERT_PKIXVerifyCert(
++CERTCertificate *cert,
++SECCertificateUsage usages,
++CERTValInParam *paramsIn,
++CERTValOutParam *paramsOut,
++void *wincx)
++{
++PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
++return SECFailure;
++}
++#endif  /* NSS_DISABLE_LIBPKIX */
++
+ /*
+  * Check the validity times of a certificate
+  */
+--- a/a/nss/lib/ckfw/nssck.apiTue May 28 23:37:46 2013 +0200
 a/a/nss/lib/ckfw/nssck.apiFri May 31 17:44:06 2013 -0700
+@@ -1752,7 +1752,7 @@
+ }
+ #endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
+ 
+-static CK_RV CK_ENTRY
++CK_RV CK_ENTRY
+ __ADJOIN(MODULE_NAME,C_GetFunctionList)
+ (
+

[Bug 75025] LibreOffice 4.3 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=75025

ign_christian ign_christ...@yahoo.com changed:

   What|Removed |Added

 Depends on||82503

--- Comment #57 from ign_christian ign_christ...@yahoo.com ---
Nominating Bug 82503 : conditional format not copied to other cell

Regression against 4.2

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 svtools/source/misc/sampletext.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 198a775ebccc69e71b97f048d1d6c4b9651662ad
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 15:39:39 2014 +0100

Related: fdo#82259 Show same preview for both Symbol variants

Change-Id: Iafabbe5068a1817b5be717018536e0d31117c434

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index e90b475..dd26f80 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -41,6 +41,7 @@ bool isSymbolFont(const Font rFont)
 rFont.GetName().equalsIgnoreAsciiCase(MusiQwik) ||
 rFont.GetName().equalsIgnoreAsciiCase(MusiSync) ||
 rFont.GetName().equalsIgnoreAsciiCase(stmary10) ||
+rFont.GetName().equalsIgnoreAsciiCase(Symbol) ||
 rFont.GetName().startsWith(STIX) ||
 isOpenSymbolFont(rFont);
 }
@@ -53,6 +54,20 @@ bool canRenderNameOfSelectedFont(OutputDevice rDevice)
 
 OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice 
rDevice)
 {
+if (rDevice.GetFont().GetName() == Symbol)
+{
+static const sal_Unicode aImplAppleSymbolText[] = {
+0x03BC, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x03A9, 0x221A, 0};
+OUString sSampleText(aImplAppleSymbolText);
+bool bHasSampleTextGlyphs = (-1 == 
rDevice.HasGlyphs(rDevice.GetFont(), sSampleText));
+//It's the Apple version
+if (bHasSampleTextGlyphs)
+return OUString(aImplAppleSymbolText);
+static const sal_Unicode aImplAdobeSymbolText[] = {
+0xF06D, 0xF0B6, 0xF0E5, 0xF0D5, 0xF070, 0xF0F2, 0xF057, 0xF0D6, 0};
+return OUString(aImplAdobeSymbolText);
+}
+
 const bool bOpenSymbol = isOpenSymbolFont(rDevice.GetFont());
 
 if (!bOpenSymbol)
commit 92f3e68cd107b48ca24563e27c36afa963f392e3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Aug 12 15:40:42 2014 +0100

Related: fdo#82259 esint10 can't render its name either

Change-Id: Idcb88161391f237cf343e7bc485c170e4385

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 63c0577..e90b475 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -25,6 +25,7 @@ bool isSymbolFont(const Font rFont)
 rFont.GetName().equalsIgnoreAsciiCase(Apple Color Emoji) ||
 rFont.GetName().equalsIgnoreAsciiCase(cmsy10) ||
 rFont.GetName().equalsIgnoreAsciiCase(cmex10) ||
+rFont.GetName().equalsIgnoreAsciiCase(esint10) ||
 rFont.GetName().equalsIgnoreAsciiCase(feta26) ||
 rFont.GetName().equalsIgnoreAsciiCase(jsMath-cmsy10) ||
 rFont.GetName().equalsIgnoreAsciiCase(jsMath-cmex10) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/picture-wrap-polygon.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |   12 ++
 sw/source/filter/ww8/docxsdrexport.cxx  |   29 +++
 sw/source/filter/ww8/writerhelper.cxx   |   30 
 sw/source/filter/ww8/writerhelper.hxx   |3 +
 sw/source/filter/ww8/wrtw8esh.cxx   |   27 --
 writerfilter/source/ooxml/model.xml |1 
 7 files changed, 75 insertions(+), 27 deletions(-)

New commits:
commit b818256d1c0f467d1064a0ebc1b17d079e74f38a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Aug 12 16:48:27 2014 +0200

DOCX export: handle wrap polygon around pictures

Change-Id: I83d9d42cd48ba4dcd86c6506c7dbd6493bb4d204

diff --git a/sw/qa/extras/ooxmlexport/data/picture-wrap-polygon.docx 
b/sw/qa/extras/ooxmlexport/data/picture-wrap-polygon.docx
new file mode 100644
index 000..f858a05
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/picture-wrap-polygon.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index fc4c1c2..7dfa7ad 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -18,6 +18,7 @@
 #include com/sun/star/drawing/Hatch.hpp
 #include com/sun/star/drawing/LineJoint.hpp
 #include com/sun/star/drawing/LineStyle.hpp
+#include com/sun/star/drawing/PointSequenceSequence.hpp
 #include com/sun/star/drawing/TextVerticalAdjust.hpp
 #include com/sun/star/style/LineSpacing.hpp
 #include com/sun/star/style/LineSpacingMode.hpp
@@ -1792,6 +1793,17 @@ DECLARE_OOXMLEXPORT_TEST(testWrapTightThrough, 
wrap-tight-through.docx)
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testPictureWrapPolygon, picture-wrap-polygon.docx)
+{
+// The problem was that the wrap polygon was ignored during export.
+drawing::PointSequenceSequence aSeqSeq = 
getPropertydrawing::PointSequenceSequence(getShape(1), ContourPolyPolygon);
+// This was 0: the polygon list was empty.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aSeqSeq.getLength());
+
+drawing::PointSequence aSeq = aSeqSeq[0];
+CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aSeq.getLength());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 7265745..2c1f7bc 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -51,6 +51,7 @@
 
 
 #include IDocumentDrawModelAccess.hxx
+#include writerhelper.hxx
 
 using namespace com::sun::star;
 using namespace oox;
@@ -682,6 +683,34 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* 
pFrmFmt, const Size rS
 }
 }
 
+// Or if we have a contour.
+if (!nWrapToken  pFrmFmt-GetSurround().IsContour())
+{
+if (const SwNoTxtNode* pNd = 
sw::util::GetNoTxtNodeFromSwFrmFmt(*pFrmFmt))
+{
+const PolyPolygon* pPolyPoly = pNd-HasContour();
+if (pPolyPoly  pPolyPoly-Count())
+{
+nWrapToken = XML_wrapTight;
+m_pImpl-m_pSerializer-startElementNS(XML_wp, nWrapToken,
+   XML_wrapText, 
bothSides, FSEND);
+
+m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_wrapPolygon,
+   XML_edited, 0,
+   FSEND);
+Polygon aPoly = 
sw::util::CorrectWordWrapPolygonForExport(*pPolyPoly, pNd);
+for (sal_uInt16 i = 0; i  aPoly.GetSize(); ++i)
+m_pImpl-m_pSerializer-singleElementNS(XML_wp, (i == 0 ? 
XML_start : XML_lineTo),
+XML_x, 
OString::number(aPoly[i].X()),
+XML_y, 
OString::number(aPoly[i].Y()),
+FSEND);
+m_pImpl-m_pSerializer-endElementNS(XML_wp, XML_wrapPolygon);
+
+m_pImpl-m_pSerializer-endElementNS(XML_wp, nWrapToken);
+}
+}
+}
+
 // No? Then just approximate based on what we have.
 if (isAnchor  !nWrapToken)
 {
commit 959a843f48be63071c64ba9e20c9389ebc390e81
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Aug 12 11:40:13 2014 +0200

DOC export: factor out wrap polygon handling to to sw::util

So that it'll be possible to reuse it in the DOCX exporter.

Change-Id: Ib7371c92c4fd93d7c6f3271ca81311bac8f1a1a7

diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index 015b076..85891c3 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -660,6 +660,36 @@ namespace sw
 }
 }
 
+Polygon

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

2014-08-12 Thread Eike Rathke

 sc/source/filter/excel/xelink.cxx |   22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit e04a4d2d2c18134556bb4e001d497ca7d66c6828
Author: Eike Rathke er...@redhat.com
Date:   Tue Aug 12 17:26:29 2014 +0200

really do not write empty externalReferences element, fdo#45286 follow-up

Xti records exist also for internal sheet references in BIFF. It is not
enough to check for their presence, at least one EXC_SBTYPE_EXTERN must
be present as SUPBOOK.

Change-Id: I5553a28412465d83fd965b09908261141c51ea35

diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index f4c4224..ec074de 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -433,6 +433,9 @@ public:
 /** Writes all externalBook elements with their child elements to OOXML. */
 virtual voidSaveXml( XclExpXmlStream rStrm ) SAL_OVERRIDE;
 
+/** Whether we need to write externalReferences or not. */
+boolHasExternalReferences() const;
+
 struct XclExpSBIndex
 {
 sal_uInt16  mnSupbook;  /// SUPBOOK index for an Excel 
sheet.
@@ -2086,6 +2089,16 @@ void XclExpSupbookBuffer::SaveXml( XclExpXmlStream 
rStrm )
 }
 }
 
+bool XclExpSupbookBuffer::HasExternalReferences() const
+{
+for (size_t nPos = 0, nSize = maSupbookList.GetSize(); nPos  nSize; 
++nPos)
+{
+if (maSupbookList.GetRecord( nPos)-GetType() == EXC_SBTYPE_EXTERN)
+return true;
+}
+return false;
+}
+
 bool XclExpSupbookBuffer::GetSupbookUrl(
 XclExpSupbookRef rxSupbook, sal_uInt16 rnIndex, const OUString rUrl 
) const
 {
@@ -2452,7 +2465,7 @@ void XclExpLinkManagerImpl8::Save( XclExpStream rStrm )
 
 void XclExpLinkManagerImpl8::SaveXml( XclExpXmlStream rStrm )
 {
-if( !maXtiVec.empty() )
+if (maSBBuffer.HasExternalReferences())
 {
 sax_fastparser::FSHelperPtr pWorkbook = rStrm.GetCurrentStream();
 pWorkbook-startElement( XML_externalReferences, FSEND);
@@ -2461,13 +2474,16 @@ void XclExpLinkManagerImpl8::SaveXml( XclExpXmlStream 
rStrm )
 maSBBuffer.SaveXml( rStrm );
 
 pWorkbook-endElement( XML_externalReferences);
+}
 
-// TODO: equivalent for EXTERNSHEET in OOXML?
+// TODO: equivalent for EXTERNSHEET in OOXML?
 #if 0
+if( !maXtiVec.empty() )
+{
 for( XclExpXtiVec::const_iterator aIt = maXtiVec.begin(), aEnd = 
maXtiVec.end(); aIt != aEnd; ++aIt )
 aIt-SaveXml( rStrm );
-#endif
 }
+#endif
 }
 
 sal_uInt16 XclExpLinkManagerImpl8::InsertXti( const XclExpXti rXti )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/mailmerge-fixes-latest' - 0 commits -

2014-08-12 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/jmux/mailmerge-fixes-review'

2014-08-12 Thread Jan-Marek Glogowski

New branch 'private/jmux/mailmerge-fixes-review' available with the following 
commits:
commit 51089a0588587ffea23c4facead3c80cefee2648
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sat Aug 9 00:22:00 2014 +0200

fdo#78611 Don't create automatic rules on reset

As we reset all styles, there shouldn't be any unknown automatic
SwNumRules, because all should have been created by the style
copying! And in this case we also have to overwrite the existing
automatic SwNumRules to get a consistent copy.

In case of unknown automatic SwNumRules we just warn and ignore
any inconsistence.

Change-Id: I26e25bccc9a8c7be74f3dceb2e1f91894eac1d0a

commit db54c19ccbc6bf3605343825f836b53f2cc06d94
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Aug 3 12:10:40 2014 +0200

fdo#81782 MM: copy most document properties

Mail merge wasn't copying the document properties into the target
document. It also has to copy most document properties into the
working copy, as ConvertFieldsToText is called just there.

Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041

commit 61978c3c99d03843a7b5e8514a061afc8e1a44ec
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 15:38:32 2014 +0200

MM: restore the non-saving wizard behaviour

The wizard didn't save the MM source document, even if it was modified.

Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5

commit 3307e169db2846ba52a482f6b0caf07c9c58bc64
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 15:36:51 2014 +0200

MM: add missing CreateMonitor handling

The mail merge wizard uses a different progress dialog
(CreateDialog) then the UNO functions (PrintDialog).

This moves the CreateDialog code from the old mail merge function
and unifies some of the dialog handling.

Change-Id: I06088140f604893a33f3ee37507e551b043a193d

commit a33b00b2b78ee8e70f46ce1fde4a594d5548e637
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 15:31:00 2014 +0200

MM: refactor cancel handling for dbui dialogs

This simplifies the handling of CreateMonitor and PrintMonitor in
the combined mail merge function.

Change-Id: Iacf933ec1a6017949b29b3d5f62d5f55c4691053

commit e1be6c1e5534edf43822e58d757d4ae793d42634
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 14:26:40 2014 +0200

MM: Don't adapt the view when saving dbg documents

DoSaveCompleted updates the SwViewShell and recent file lists after
the document was saved via DoSaveAs. So we can simply drop the
call and delete the SfxMedium to save a copy.

Change-Id: I04a0710949ca60e1ff4cab24c6b504deb130db63

commit 399de756430c072a064dbb84b394412803f2e425
Author: Eilidh McAdam eilidh.mca...@gmail.com
Date:   Fri Jul 25 20:38:08 2014 +0100

Remove superfluous merge function.

The only caller of MergeDocuments now uses MergeMailFiles instead,
so MergeDocuments can be removed.

Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4

commit 9b9a9f22b1e3e088340527c3458ed2f514e9a66c
Author: Eilidh McAdam eilidh.mca...@gmail.com
Date:   Fri Jul 25 20:35:43 2014 +0100

Make UNO and wizard mail merge use same function.

Instead of MergeDocuments and MergeMailFiles duplicating largely the
same functionality, the only user of MergeDocuments (MM wizard) now
uses MergeMailFiles.

Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd

commit 369bd7727deef10c1122a291018de4a48b3a15fb
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jul 13 20:18:56 2014 +0200

Refactor a tiny bit of SwLayAction::IsShortCut

Change-Id: I13d4fbebec02bddaa27e8929188d497dde715730

commit 80872c8206b1bf2a7b25daafb53a94d342de01ef
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jul 13 20:15:55 2014 +0200

fdo#80926 Don't move anchors of invalid pages

If the anchor is valid, check if its page is valid too,
before moving anchors on view change.

Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5

commit 1fb45dc4e052a0cb1c88fa45e4601cc7a6be9a69
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jul 29 11:09:01 2014 +0200

MM: Fix language for DB dict values

Based on the code from SwCalc::VarLook.

Change-Id: I44220b0fb8332785105719f253897d2177c9c69c

commit 11ec72697670a1ba77e9931200df6da4a8771131
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sat Jul 12 23:17:31 2014 +0200

fdo#70346 MM: add mail merge data to condition dict

Currently section hide conditions are just evaluated based on
document field data.

This adds the current mail merge dataset to the condition
dictionary, so this can be used in the condition evaluation.

The dataset values are named from their columns and added initially,
therefore DB fields with identical names will overwrite the values
in the

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

 include/svx/sxcaitm.hxx|   10 +-
 svx/source/svdraw/svdattr.cxx  |2 +-
 svx/source/svdraw/svdibrow.cxx |2 +-
 svx/source/svdraw/svdocapt.cxx |4 ++--
 4 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 0765c16b6a738974fee600280b82dc46bb06b3b6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 12 17:35:51 2014 +0200

Consistency around SdrOnOffItem in svx/sxcaitm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.

Change-Id: I1a88c73c8e4c764a6beadb8bb54910d868a12d93

diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx
index 7961ff0..3b56f35 100644
--- a/include/svx/sxcaitm.hxx
+++ b/include/svx/sxcaitm.hxx
@@ -24,18 +24,10 @@
 #include svx/sdangitm.hxx
 #include svx/sdooitm.hxx
 
-
-// class SdrCaptionFixedAngleItem
+// SDRATTR_CAPTIONFIXEDANGLE SdrOnOffItem:
 // sal_True=Winkel durch SdrCaptionAngleItem vorgegeben
 // sal_False=Freier Winkel
 
-class SdrCaptionFixedAngleItem: public SdrOnOffItem {
-public:
-SdrCaptionFixedAngleItem(bool bFix=true): 
SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
-SdrCaptionFixedAngleItem(SvStream rIn) : 
SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn)  {}
-};
-
-
 // class SdrCaptionAngleItem
 // Winkelangabe in 1/100 Degree
 // Nur bei Type2, Type3 und Type4
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index c11106e..f5a275b 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -136,7 +136,7 @@ SdrItemPool::SdrItemPool(
 mppLocalPoolDefaults[SDRATTR_SHADOW3D  -SDRATTR_START]=new 
SfxVoidItem(SDRATTR_SHADOW3D);
 mppLocalPoolDefaults[SDRATTR_SHADOWPERSP   -SDRATTR_START]=new 
SfxVoidItem(SDRATTR_SHADOWPERSP );
 mppLocalPoolDefaults[SDRATTR_CAPTIONTYPE  -SDRATTR_START]=new 
SdrCaptionTypeItem  ;
-mppLocalPoolDefaults[SDRATTR_CAPTIONFIXEDANGLE-SDRATTR_START]=new 
SdrCaptionFixedAngleItem;
+mppLocalPoolDefaults[SDRATTR_CAPTIONFIXEDANGLE-SDRATTR_START]=new 
SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE, true);
 mppLocalPoolDefaults[SDRATTR_CAPTIONANGLE -SDRATTR_START]=new 
SdrCaptionAngleItem ;
 mppLocalPoolDefaults[SDRATTR_CAPTIONGAP   -SDRATTR_START]=new 
SdrCaptionGapItem   ;
 mppLocalPoolDefaults[SDRATTR_CAPTIONESCDIR-SDRATTR_START]=new 
SdrCaptionEscDirItem;
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 13f2703..70e30e6 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -764,7 +764,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* 
pSet, sal_uInt16 rI
 case SDRATTR_CAPTIONANGLE: {
 rIndent=1;
 if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) {
-bool bFixed=((const 
SdrCaptionFixedAngleItem*)pItem)-GetValue();
+bool bFixed=((const SdrOnOffItem*)pItem)-GetValue();
 if (!bFixed) return true;
 }
 } break;
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 866d60f..583222a 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -421,7 +421,7 @@ void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams rPara) 
const
 {
 const SfxItemSet rSet = GetObjectItemSet();
 rPara.eType  =((SdrCaptionTypeItem)  
(rSet.Get(SDRATTR_CAPTIONTYPE  ))).GetValue();
-
rPara.bFixedAngle=((SdrCaptionFixedAngleItem)(rSet.Get(SDRATTR_CAPTIONFIXEDANGLE))).GetValue();
+
rPara.bFixedAngle=((SdrOnOffItem)(rSet.Get(SDRATTR_CAPTIONFIXEDANGLE))).GetValue();
 rPara.nAngle =((SdrCaptionAngleItem) 
(rSet.Get(SDRATTR_CAPTIONANGLE ))).GetValue();
 rPara.nGap   =((SdrCaptionGapItem)   (rSet.Get(SDRATTR_CAPTIONGAP 
  ))).GetValue();
 rPara.eEscDir=((SdrCaptionEscDirItem)
(rSet.Get(SDRATTR_CAPTIONESCDIR))).GetValue();
commit 81bf87fec424e1d907a866d439559b7d69dee0db
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 12 16:59:46 2014 +0200

Fix apparent SdrCaptionAngleItem vs. SdrCaptionFixedAngleItem mismatch

...though it was like that ever since 
fd069bee7e57ad529c3c0974559fd2d84ec3151a initial import

Change-Id: Ib3efe7bf7a559ede52966f4763a9f9e748b6ba6a

diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 4eaefcb..866d60f 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -421,8 +421,8 @@ void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams rPara) 
const
 {
 const SfxItemSet rSet = GetObjectItemSet();
 rPara.eType  =((SdrCaptionTypeItem)  
(rSet.Get(SDRATTR_CAPTIONTYPE  ))).GetValue();
-
rPara.bFixedAngle=((SdrCaptionFixedAngleItem)(rSet.Get(SDRATTR_CAPTIONANGLE
 ))).GetValue();
-rPara.nAngle

[RfC] Review writer mail merge fixes

2014-08-12 Thread Jan-Marek Glogowski

Dear writer devs,

can you please review private/jmux/mailmerge-fixes-review, which I would
like to get merged. I can push those 25 patches to Gerrit, if this helps.

This branch contains all my mail merge bugfixes, without any speed
improvements. These improvements change some sematics, like SwPageDesc
and SwFrmFmts from vector = sorted_array, and will be in an additional
review, once finished.

As this fixes some very basic functions, most commits don't have a fdo
number assigned.

I used documents from the following bugs to check the implementation and
test mail merge correctness.


Bugfixes


fdo#34502 Field Page Number shows constant number instead of page count
fdo#62364 Mailmerge problem if list or numbering at the end of document
fdo#78611 Mail merge : corrupted paragraph numbering

fdo#81750 MAILMERGE: Input fields are duplicated and lost the first two
characters
which is in Gerrit (https://gerrit.libreoffice.org/#/c/10834/); seems I
can't have patches in a private branch and as a Gerrit review.


New features


fdo#70346 Section condition doesn't hide section with database fields
fdo#81782 MAILMERGE: Some fields (Title, Subject, Author) only printed
to the first document


Workaround
==

fdo#80395 MAILMERGE: Lines move when using mail merge
fdo#80926 Moving paragraph-bound anchor on ODT file load

The layout code is still broken (see fdo#80926). The implemented
workaround just prevents some fix anchor-code to actually break the
document.


Thanks for your review and comments

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source

 svx/source/svdraw/svdotext.cxx  |   27 ---
 svx/source/svdraw/svdotextdecomposition.cxx |3 +--
 svx/source/svdraw/svdotxed.cxx  |   25 +
 3 files changed, 30 insertions(+), 25 deletions(-)

New commits:
commit f907f74a5ef3372f275c2ef5cb51d38823383e34
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 17:39:32 2014 +0200

Reverted changes from i119885

Change-Id: I8fc1ab70e6be8801e6ad0a60d3b60f7b622fe89f

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 1cc03b0..ad1ae75 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -718,11 +718,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner rOutliner, 
Rectangle rTextRect, boo
 sal_uIntPtr nStat0=rOutliner.GetControlWord();
 Size aNullSize;
 
-// FIXME(matteocam)
-bool bChainedFrame = true; // XXX: should be returned from a method
-
-if (!bChainedFrame) {
-
 if (!bContourFrame)
 {
 rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -748,15 +743,21 @@ void SdrTextObj::TakeTextRect( SdrOutliner rOutliner, 
Rectangle rTextRect, boo
 if (eAniDirection==SDRTEXTANI_UP || 
eAniDirection==SDRTEXTANI_DOWN) nHgt=100;
 }
 
-// #i119885# Do not limit/force height to geometrical frame (vice 
versa for vertical writing)
-if(IsVerticalWriting())
-{
-nWdt = 100;
-}
-else
-{
-nHgt = 100;
-}
+// FIXME(matteocam)
+bool bChainedFrame = true; // XXX: should be returned from a method
+
+if (!bChainedFrame) {
+
+// #i119885# Do not limit/force height to geometrical frame 
(vice versa for vertical writing)
+if(IsVerticalWriting())
+{
+nWdt = 100;
+}
+else
+{
+nHgt = 100;
+}
+} // END if (!bChainedFrame)
 
 rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
 }
@@ -773,7 +774,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner rOutliner, 
Rectangle rTextRect, boo
 rOutliner.SetMinAutoPaperSize(Size(0, nAnkHgt));
 }
 }
-} // END if (!bChainedFrame)
 
 rOutliner.SetPaperSize(aNullSize);
 if (bContourFrame)
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 882136b..4ed8b58 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -935,8 +935,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 rOutliner.SetFixedCellHeight(rSdrBlockTextPrimitive.isFixedCellHeight());
 rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE);
 rOutliner.SetMinAutoPaperSize(aNullSize);
-//rOutliner.SetMaxAutoPaperSize(Size(100,100));
-rOutliner.SetMaxAutoPaperSize(Size(100,2000));
+rOutliner.SetMaxAutoPaperSize(Size(100,100));
 
 // Resolves: fdo#35779 set background color of this shape as the editeng 
background if there
 // is one. Check the shape itself, then the host page, then that page's 
master page.
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index a671681..2cbf851 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -186,16 +186,20 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 if (eAniDirection==SDRTEXTANI_UP || 
eAniDirection==SDRTEXTANI_DOWN) nMaxHgt=100;
 }
 
-// #i119885# Do not limit/force height to geometrical frame (vice 
versa for vertical writing)
-if(IsVerticalWriting())
-{
-nMaxWdt = 100;
-}
-else
-{
-nMaxHgt = 100;
+// FIXME(matteocam)
+bool bChainedFrame = true; // XXX: should be returned from a method
+
+if ( !bChainedFrame ) {
+// #i119885# Do not limit/force height to geometrical frame 
(vice versa for vertical writing)
+if(IsVerticalWriting())
+{
+nMaxWdt = 100;
+}
+else
+{
+nMaxHgt = 100;
+}
 }
-
 aPaperMax.Width()=nMaxWdt;
 aPaperMax.Height()=nMaxHgt;
 }
@@ -249,10 +253,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 aPaperMin.Height() = 0;
 }
 
-// FIXME(matteocam)
-aPaperMax.Height() = 2000;
-aPaperMin.Height() = 2000;
-
 if (pPaperMin!=NULL) *pPaperMin=aPaperMin;
 if (pPaperMax!=NULL) *pPaperMax=aPaperMax;
 if (pViewInit!=NULL)

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

 sw/qa/extras/odfimport/data/fdo82165.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   10 ++
 xmloff/source/text/XMLTextHeaderFooterContext.cxx |   13 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 555c988f3b896e16afc7bdd1bd98e48229599637
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 12 17:47:20 2014 +0200

fdo#82165: ODF import: clear all shapes when removing header content

Shapes anchored to the first or last paragraph survive setString()
so need to be deleted with some ruse.

(regression from b8499fc3dcf474050f026b8d5cd1d9037bbe42b7)

Change-Id: I00a8132583c45d1953c207932cc7f02f3065ae77

diff --git a/sw/qa/extras/odfimport/data/fdo82165.odt 
b/sw/qa/extras/odfimport/data/fdo82165.odt
new file mode 100644
index 000..65a4084
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo82165.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 299fea7..8cd4b09 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -345,6 +345,16 @@ DECLARE_ODFIMPORT_TEST(testFdo68839, fdo68839.odt)
 getPropertyOUString(xFrame2, ChainNextName));
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo82165, fdo82165.odt)
+{
+// there was a duplicate shape in the left header
+lcl_CheckShape(getShape(1), Picture 9);
+try {
+uno::Referencedrawing::XShape xShape = getShape(2);
+CPPUNIT_FAIL(IndexOutOfBoundsException expected);
+} catch (lang::IndexOutOfBoundsException const) { }
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo37606, fdo37606.odt)
 {
 SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument 
*(mxComponent.get());
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 81c12bc..6ee1e73 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include com/sun/star/text/XText.hpp
+#include com/sun/star/text/XParagraphAppend.hpp
 #include com/sun/star/text/XRelativeTextContentRemove.hpp
 #include xmloff/nmspmap.hxx
 #include xmloff/xmlnmspe.hxx
@@ -158,8 +159,16 @@ SvXMLImportContext 
*XMLTextHeaderFooterContext::CreateChildContext(
 
 if( bRemoveContent )
 {
-OUString aText;
-xText-setString( aText );
+xText-setString(OUString());
+// fdo#82165 shapes anchored at the beginning or end survive
+// setString() - kill them the hard way: SwDoc::DelFullPara()
+uno::Referencetext::XParagraphAppend const xAppend(
+xText, uno::UNO_QUERY_THROW);
+uno::Referencelang::XComponent const xPara(
+xAppend-finishParagraph(
+uno::Sequencebeans::PropertyValue()),
+uno::UNO_QUERY_THROW);
+xPara-dispose();
 }
 
 rtl::Reference  XMLTextImportHelper  xTxtImport =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source xmlsecurity/uiconfig

2014-08-12 Thread Tomaž Vajngerl

 xmlsecurity/inc/xmlsecurity/certificateviewer.hxx |3 
 xmlsecurity/source/dialogs/certificateviewer.cxx  |   21 +-
 xmlsecurity/uiconfig/ui/certgeneral.ui|  176 +++---
 3 files changed, 105 insertions(+), 95 deletions(-)

New commits:
commit 13d4f7b800a9f35717ed91f330b38513e0db4bc6
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Sat Aug 9 22:03:46 2014 +0200

Grid and separarate valid from/to for CertificateViewer

Change-Id: I32661d0ec57c9f855806a44349d20c8fe651f293

diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx 
b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index eaf2fa9..9aae278 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -81,7 +81,8 @@ private:
 FixedText*  m_pHintNotTrustedFI;
 FixedText*  m_pIssuedToFI;
 FixedText*  m_pIssuedByFI;
-FixedText*  m_pValidDateFI;
+FixedText*  m_pValidFromDateFI;
+FixedText*  m_pValidToDateFI;
 FixedImage* m_pKeyImg;
 FixedText*  m_pHintCorrespPrivKeyFI;
 public:
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx 
b/xmlsecurity/source/dialogs/certificateviewer.cxx
index b704530..02ce1d8 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -78,9 +78,10 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( 
Window* _pParent, Certif
 {
 get( m_pCertImg, certimage );
 get( m_pHintNotTrustedFI, hintnotrust );
-get( m_pIssuedToFI, issuedto );
-get( m_pIssuedByFI, issuedby );
-get( m_pValidDateFI, validdate );
+get( m_pIssuedToFI, issued_to_value );
+get( m_pIssuedByFI, issued_by_value );
+get( m_pValidFromDateFI, valid_from_value );
+get( m_pValidToDateFI, valid_to_value );
 get( m_pKeyImg, keyimage );
 get( m_pHintCorrespPrivKeyFI, privatekey );
 
@@ -107,12 +108,12 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( 
Window* _pParent, Certif
 DateTime aDateTimeEnd( DateTime::EMPTY );
 utl::typeConvert( xCert-getNotValidBefore(), aDateTimeStart );
 utl::typeConvert( xCert-getNotValidAfter(), aDateTimeEnd );
-OUString sText = m_pValidDateFI-GetText();
-sText = sText.replaceFirst( %SDATE%,
-GetSettings().GetUILocaleDataWrapper().getDate( 
aDateTimeStart.GetDate() ) );
-sText = sText.replaceFirst( %EDATE%,
-GetSettings().GetUILocaleDataWrapper().getDate( aDateTimeEnd.GetDate() 
) );
-m_pValidDateFI-SetText( sText );
+
+OUString sValidFromDate = GetSettings().GetUILocaleDataWrapper().getDate( 
aDateTimeStart.GetDate() );
+OUString sValidToDate = GetSettings().GetUILocaleDataWrapper().getDate( 
aDateTimeEnd.GetDate() );
+
+m_pValidFromDateFI-SetText(sValidFromDate);
+m_pValidToDateFI-SetText(sValidToDate);
 
 // Check if we have the private key...
 bool bHasPrivateKey = false;
@@ -120,7 +121,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( 
Window* _pParent, Certif
 if ( _pDlg-mbCheckForPrivateKey )
 {
 long nCertificateCharacters = 
_pDlg-mxSecurityEnvironment-getCertificateCharacters( xCert );
-bHasPrivateKey = ( nCertificateCharacters  
security::CertificateCharacters::HAS_PRIVATE_KEY ) ? sal_True : sal_False;
+bHasPrivateKey = ( nCertificateCharacters  
security::CertificateCharacters::HAS_PRIVATE_KEY );
 }
 if ( !bHasPrivateKey )
 {
diff --git a/xmlsecurity/uiconfig/ui/certgeneral.ui 
b/xmlsecurity/uiconfig/ui/certgeneral.ui
index 36af4fa..4ec69e2 100644
--- a/xmlsecurity/uiconfig/ui/certgeneral.ui
+++ b/xmlsecurity/uiconfig/ui/certgeneral.ui
@@ -1,11 +1,12 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.1 --
+!-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.10/
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkBox id=CertGeneral
 property name=visibleTrue/property
@@ -15,13 +16,12 @@
   object class=GtkImage id=certimage
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_left12/property
-property name=margin_top12/property
 property 
name=pixbufxmlsecurity/res/certificate_40x56.png/property
   /object
   packing
 property name=expandFalse/property
 property name=fillTrue/property
+property name=padding6/property
 property name=position0/property
   /packing
 /child
@@ -29,9 +29,6 @@
   object class=GtkLabel id=label1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source svx/source

 editeng/source/editeng/impedit3.cxx |7 ---
 svx/source/svdraw/svdotxed.cxx  |   10 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 0c2c384c82ff36da734f5ec1165560a9e3d99104
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 18:25:47 2014 +0200

Hard-coding of text box height. Using that for Overflowing Paragraphs

Change-Id: I96a9eb8337744b8c76bd735faca89085e6698490

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index a9b7483..5e0c19b 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -548,10 +548,11 @@ void ImpEditEngine::CheckAutoPageSize()
 ? YES Overflow!\n  : NO Overflow!\n ); */
 fprintf( stderr, aPaperSize.Height = %d\n, aPaperSize.Height() );
 // setting overflow status
-if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
+sal_uInt32 nHeight = 1783; // XXX: hard coded for testing
+//if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
+if (GetTextHeight()  1783) // XXX: CalcTextHeight here??
 // which paragraph is the first to cause higher size of the box?
-UpdateOverflowingParaNum( aPrevPaperSize.Height() ); // XXX: currently 
only for horizontal text
-
+UpdateOverflowingParaNum( 1783 /*aPrevPaperSize.Height()*/ ); // XXX: 
currently only for horizontal text
 aStatus.SetPageOverflow(true);
 }
 
commit 7b832c475e8386307f9473abf098279ff1ec7065
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 18:17:19 2014 +0200

Chained mode for BegTextEdit

Change-Id: I21a52ca01cbacce8d2f5e8ff735f895e9fd7c6a4

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 2cbf851..5ca8a05 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -63,9 +63,13 @@ bool SdrTextObj::BegTextEdit(SdrOutliner rOutl)
 }
 
 // FIXME(matteocam)
-sal_uIntPtr nStat1=rOutl.GetControlWord();
-nStat1 =~EE_CNTRL_AUTOPAGESIZE;
-rOutl.SetControlWord(nStat1);
+bool bIsChained = true; // XXX: get it from a method
+// disable AUTOPAGESIZE
+if ( bIsChained ) {
+sal_uIntPtr nStat1=rOutl.GetControlWord();
+nStat1 =~EE_CNTRL_AUTOPAGESIZE;
+rOutl.SetControlWord(nStat1);
+}
 
 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 if(pOutlinerParaObject!=NULL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Khaled Hosny

 svtools/source/misc/sampletext.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 56dc7aecc3194dac8012ebc252fb893125f64ebc
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Aug 12 19:25:21 2014 +0300

Related: fdo#82259 not all STIX are symbol fonts

The new STIX and STIX Math are regular fonts, as well as the old
STIXGeneral, so narrow the match a bit.

Change-Id: I82341c3e9e5dd4e0323bf76096cba8890a82f0c7

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index dd26f80..b099960 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -42,7 +42,10 @@ bool isSymbolFont(const Font rFont)
 rFont.GetName().equalsIgnoreAsciiCase(MusiSync) ||
 rFont.GetName().equalsIgnoreAsciiCase(stmary10) ||
 rFont.GetName().equalsIgnoreAsciiCase(Symbol) ||
-rFont.GetName().startsWith(STIX) ||
+rFont.GetName().startsWith(STIXIntegrals) ||
+rFont.GetName().startsWith(STIXNonUnicode) ||
+rFont.GetName().startsWith(STIXSize) ||
+rFont.GetName().startsWith(STIXVariants) ||
 isOpenSymbolFont(rFont);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/CustomTarget_autocorr.mk extras/CustomTarget_autotextshare.mk

2014-08-12 Thread Laurent Balland-Poirier

 extras/CustomTarget_autocorr.mk  |   46 ---
 extras/CustomTarget_autotextshare.mk |  101 ---
 2 files changed, 2 insertions(+), 145 deletions(-)

New commits:
commit 8791017b0ed7fe47a4367e73e1728ba1d2b15d83
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Tue Aug 12 15:32:39 2014 +0200

Simplify make file for autocorr and autotext

Build mimetype file list with other lists

Change-Id: Ia30fd6af9d312e4eb7d68b6460221a55f608a808
Reviewed-on: https://gerrit.libreoffice.org/10887
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index d119e9e..88edc87 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -240,51 +240,7 @@ extras_AUTOCORR_XMLFILES := \
zh-TW/SentenceExceptList.xml \
 
 
-extras_AUTOCORR_MIMETYPEFILES := \
-   af-ZA/mimetype \
-   bg/mimetype \
-   ca/mimetype \
-   cs/mimetype \
-   da/mimetype \
-   de/mimetype \
-   en-AU/mimetype \
-   en-GB/mimetype \
-   en-US/mimetype \
-   en-ZA/mimetype \
-   es/mimetype \
-   fa/mimetype \
-   fi/mimetype \
-   fr/mimetype \
-   ga-IE/mimetype \
-   hr/mimetype \
-   hu/mimetype \
-   is/mimetype \
-   it/mimetype \
-   ja/mimetype \
-   ko/mimetype \
-   lb-LU/mimetype \
-   lt/mimetype \
-   mn/mimetype \
-   nl-BE/mimetype \
-   nl/mimetype \
-   pl/mimetype \
-   pt-BR/mimetype \
-   pt/mimetype \
-   ro/mimetype \
-   ru/mimetype \
-   sk/mimetype \
-   sl/mimetype \
-   sr-CS/mimetype \
-   sr-Latn-CS/mimetype \
-   sr-Latn-ME/mimetype \
-   sr-Latn-RS/mimetype \
-   sr-ME/mimetype \
-   sr-RS/mimetype \
-   sv/mimetype \
-   tr/mimetype \
-   vi/mimetype \
-   zh-CN/mimetype \
-   zh-TW/mimetype \
+extras_AUTOCORR_MIMETYPEFILES := $(foreach 
lang,$(extras_AUTOCORR_LANGS),$(firstword $(subst :, ,$(lang)))/mimetype)
 
 
 ifneq ($(sort $(foreach file,$(extras_AUTOCORR_XMLFILES),$(firstword $(subst 
/, ,$(file),$(sort $(foreach lang,$(extras_AUTOCORR_LANGS),$(firstword 
$(subst :, ,$(lang))
diff --git a/extras/CustomTarget_autotextshare.mk 
b/extras/CustomTarget_autotextshare.mk
index e30c40d..844ac43 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -3814,106 +3814,7 @@ extras_AUTOTEXTSHARE_XMLFILES := \
zh-TW/template/PT2/styles.xml \
 
 
-extras_AUTOTEXTSHARE_MIMETYPEFILES := \
-   af-ZA/standard/mimetype \
-   bg/crdbus50/mimetype \
-   bg/standard/mimetype \
-   bg/template/mimetype \
-   ca/standard/mimetype \
-   cs/crdbus50/mimetype \
-   cs/crdbus54/mimetype \
-   cs/standard/mimetype \
-   cs/template/mimetype \
-   da/crdbus50/mimetype \
-   da/standard/mimetype \
-   da/template/mimetype \
-   de/crdbus50/mimetype \
-   de/standard/mimetype \
-   de/template/mimetype \
-   en-AU/standard/mimetype \
-   en-GB/crdbus50/mimetype \
-   en-GB/standard/mimetype \
-   en-GB/template/mimetype \
-   en-US/crdbus50/mimetype \
-   en-US/standard/mimetype \
-   en-US/template/mimetype \
-   en-ZA/standard/mimetype \
-   es/crdbus50/mimetype \
-   es/standard/mimetype \
-   es/template/mimetype \
-   fa/standard/mimetype \
-   fi/standard/mimetype \
-   fr/crdbus50/mimetype \
-   fr/standard/mimetype \
-   fr/template/mimetype \
-   ga-IE/standard/mimetype \
-   hr/standard/mimetype \
-   hu/crdbus50/mimetype \
-   hu/crdbus54/mimetype \
-   hu/standard/mimetype \
-   hu/template/mimetype \
-   is/standard/mimetype \
-   it/crdbus50/mimetype \
-   it/standard/mimetype \
-   it/template/mimetype \
-   ja/crdbus50/mimetype \
-   ja/standard/mimetype \
-   ja/template/mimetype \
-   km/crdbus50/mimetype \
-   km/standard/mimetype \
-   km/template/mimetype \
-   ko/crdbus50/mimetype \
-   ko/standard/mimetype \
-   ko/template/mimetype \
-   lb-LU/standard/mimetype \
-   lt/standard/mimetype \
-   mn/crdbus50/mimetype \
-   mn/standard/mimetype \
-   mn/template/mimetype \
-   nl-BE/standard/mimetype \
-   nl/crdbus50/mimetype \
-   nl/standard/mimetype \
-   nl/template/mimetype \
-   pl/crdbus50/mimetype \
-   pl/standard/mimetype \
-   pl/template/mimetype \
-   pt-BR/crdbus50/mimetype \
-   pt-BR/standard/mimetype \
-   pt-BR/template/mimetype \
-   pt/crdbus50/mimetype \
-   pt/standard/mimetype \
-   pt/template/mimetype \
-   ro/standard/mimetype \
-   ru/crdbus50/mimetype \
-   ru/standard/mimetype \
-   ru/template/mimetype \
-   sk/crdbus50/mimetype \
-

[Libreoffice-commits] core.git: extras/README

2014-08-12 Thread Laurent Balland-Poirier

 extras/README |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit bab2c1be6c7fdd78332d29682947d4ae07d07398
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Tue Aug 12 16:46:14 2014 +0200

Help on how-to add autotext

Change-Id: Ia41a3478f5a59b4c13f676eb0e21d3b573456c8f
Reviewed-on: https://gerrit.libreoffice.org/10889
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/extras/README b/extras/README
index a9783f0..9a5ac26 100644
--- a/extras/README
+++ b/extras/README
@@ -1,4 +1,4 @@
-Contains templates, clipart galleries, palettes, symbol font etc.
+Contains templates, clipart galleries, palettes, symbol font, autocorrections, 
autotexts etc.
 
 How-to add a new gallery:
+ create a directory extras/source/gallery/foo/
@@ -6,3 +6,23 @@ How-to add a new gallery:
+ add a [foo] section to extras/source/gallery/share/gallery_names.ulf
+ add a Gallery_foo.mk at the top-level (and mention in Module_extra.mk)
+ add a new GALLERY_FILELIST statement in scp2/
+
+How-to add a new autotext category
+   + create a directory extras/source/autotext/lang/xx/foo/ where xx is 
your lang code
+   + unzip your foo.bau autotext file in this directory (including an 
empty mimetype file)
+   + add xx/foo.bau in extras/AllLangPackage_autotextshare.mk
+   + in extras/CustomTarget_autotextshare.mk:
+   + add xx/foo in extras_AUTOTEXTSHARE_AUTOTEXTS
+   + add all files contained in foo.bau (except mimetype) in 
extras_AUTOTEXTSHARE_XMLFILES
+   + if foo.bau contains files with other extension than .xml, 
.rdf, .svm and .png
+   + add a CPY call at the end of the file
+
+How-to add a new autotext to an existing category
+   + create a directory extras/source/autotext/lang/xx/standard/FOO/ to 
add it in category standard of lang xx
+   + add files of the autotext (at least FOO.xml for an unformatted 
autotext)
+   + add autotext name in 
extras/source/autotext/lang/xx/standard/BlockList.xml
+   + add all files of autotext in 
extras/source/autotext/lang/xx/standard/META-INF/manifest.xml
+   + in extras/CustomTarget_autotextshare.mk:
+   + add all files of autotext in extras_AUTOTEXTSHARE_XMLFILES
+   + if some files have different extension from .xml, .rdf, .svm 
and .png
+   + add a CPY call at the end of the file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svtools/source/misc/sampletext.cxx |   38 +++--
 1 file changed, 32 insertions(+), 6 deletions(-)

New commits:
commit bea80c70375fd370f080d65089fff54abfa73870
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Aug 11 12:46:43 2014 +0100

Related: fdo#82259 add Armenian preview text

Change-Id: I3698b5cbf8c39e618faaae1321eaa4442f1b2827
(cherry picked from commit 94753833b94dee42ce2e0e7e7f3f354c2a605730)

Related: fdo#82259 stmary can render its own name, but unreadably

Change-Id: Iedff28d1290efb38eb68f83757a0787d52e28859
(cherry picked from commit 212f745c29c7399fa0d62a53d3836dc1e829e953)

Related: fdo#82259 list Apple Color Emoji as a symbol font.

Note that this is a blind fix, as I donât have an OS X machine.

Change-Id: I43a98fbbee06117b914eae332d48b2793a266bce
Reviewed-on: https://gerrit.libreoffice.org/10812
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 25e81910d1b560c7ef05a907abbf80fb2c647d32)

Related: fdo#82259 all the STIX fonts are really for symbols

Change-Id: Id032f1b643199a57c6fc08ccf580a54ff2370861
(cherry picked from commit b56bb5dce9a225bb0b8d6c57120da55e4cae7def)

Resolves: fdo#82259 use same symbol strategy on all platforms

Change-Id: Ia4f0a36c8a95849b7c8551b930873e912b673537
(cherry picked from commit 16076f120340673ad64df1614206f0e13e3539d5)

Related: fdo#82259 OpenSymbol doesn't have 0x2706 or 0x2704 so no preview

Change-Id: I2164cb2c37c7b13759e47561002024fd2bb577f9
(cherry picked from commit 662af47c3c1628700661a8d5ccfee784f7e2195b)

Related: fdo#82259 esint10 can't render its name either

Change-Id: Idcb88161391f237cf343e7bc485c170e4385
(cherry picked from commit 92f3e68cd107b48ca24563e27c36afa963f392e3)

Related: fdo#82259 Show same preview for both Symbol variants

Change-Id: Iafabbe5068a1817b5be717018536e0d31117c434
(cherry picked from commit 198a775ebccc69e71b97f048d1d6c4b9651662ad)
Reviewed-on: https://gerrit.libreoffice.org/10890
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 28ccec9..dd26f80 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -22,8 +22,10 @@ bool isOpenSymbolFont(const Font rFont)
 bool isSymbolFont(const Font rFont)
 {
 return (rFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL) ||
+rFont.GetName().equalsIgnoreAsciiCase(Apple Color Emoji) ||
 rFont.GetName().equalsIgnoreAsciiCase(cmsy10) ||
 rFont.GetName().equalsIgnoreAsciiCase(cmex10) ||
+rFont.GetName().equalsIgnoreAsciiCase(esint10) ||
 rFont.GetName().equalsIgnoreAsciiCase(feta26) ||
 rFont.GetName().equalsIgnoreAsciiCase(jsMath-cmsy10) ||
 rFont.GetName().equalsIgnoreAsciiCase(jsMath-cmex10) ||
@@ -38,6 +40,9 @@ bool isSymbolFont(const Font rFont)
 rFont.GetName().equalsIgnoreAsciiCase(Letters Laughing) ||
 rFont.GetName().equalsIgnoreAsciiCase(MusiQwik) ||
 rFont.GetName().equalsIgnoreAsciiCase(MusiSync) ||
+rFont.GetName().equalsIgnoreAsciiCase(stmary10) ||
+rFont.GetName().equalsIgnoreAsciiCase(Symbol) ||
+rFont.GetName().startsWith(STIX) ||
 isOpenSymbolFont(rFont);
 }
 
@@ -49,6 +54,20 @@ bool canRenderNameOfSelectedFont(OutputDevice rDevice)
 
 OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice 
rDevice)
 {
+if (rDevice.GetFont().GetName() == Symbol)
+{
+static const sal_Unicode aImplAppleSymbolText[] = {
+0x03BC, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x03A9, 0x221A, 0};
+OUString sSampleText(aImplAppleSymbolText);
+bool bHasSampleTextGlyphs = (-1 == 
rDevice.HasGlyphs(rDevice.GetFont(), sSampleText));
+//It's the Apple version
+if (bHasSampleTextGlyphs)
+return OUString(aImplAppleSymbolText);
+static const sal_Unicode aImplAdobeSymbolText[] = {
+0xF06D, 0xF0B6, 0xF0E5, 0xF0D5, 0xF070, 0xF0F2, 0xF057, 0xF0D6, 0};
+return OUString(aImplAdobeSymbolText);
+}
+
 const bool bOpenSymbol = isOpenSymbolFont(rDevice.GetFont());
 
 if (!bOpenSymbol)
@@ -62,11 +81,6 @@ OUString 
makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice)
 
 // start just above the PUA used by most symbol fonts
 sal_uInt32 cNewChar = 0xFF00;
-#ifdef MACOSX
-// on MacOSX there are too many non-presentable symbols above the 
codepoint 0x0192
-if( !bOpenSymbol )
-cNewChar = 0x0192;
-#endif
 
 const int nMaxCount = sizeof(aText)/sizeof(*aText) - 1;
 int

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng

 editeng/source/editeng/impedit3.cxx |   12 
 include/editeng/editstat.hxx|2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit a9a2911235bc50c7a601f4cfee7f037fc414d504
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 18:42:24 2014 +0200

aStatus.isPageOverflow cleared only explicitly

Change-Id: Ibee0dd287cd99b01bd8e18857bd4a069bee7b78a

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 5e0c19b..736e594 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -546,14 +546,18 @@ void ImpEditEngine::CheckAutoPageSize()
 // FIXME(matteocam)
 /* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
 ? YES Overflow!\n  : NO Overflow!\n ); */
-fprintf( stderr, aPaperSize.Height = %d\n, aPaperSize.Height() );
 // setting overflow status
-sal_uInt32 nHeight = 1783; // XXX: hard coded for testing
+sal_uInt32 nBoxHeight = 1783; // XXX: hard coded for testing
 //if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
-if (GetTextHeight()  1783) // XXX: CalcTextHeight here??
+if (GetTextHeight()  nBoxHeight) // XXX: CalcTextHeight here??
+{
 // which paragraph is the first to cause higher size of the box?
-UpdateOverflowingParaNum( 1783 /*aPrevPaperSize.Height()*/ ); // XXX: 
currently only for horizontal text
+UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // 
XXX: currently only for horizontal text
 aStatus.SetPageOverflow(true);
+} else
+{
+// No overflow if withing box boundaries
+aStatus.SetPageOverflow(false);
 }
 
 if ( aPaperSize != aPrevPaperSize )
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 3ab90bc..0aadd3d 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -98,7 +98,7 @@ public:
 EditStatus(){ nStatusBits = 0; nControlBits = 0;
   nPrevPara = -1; bIsPageOverflow = 
false; }
 
-voidClear() { nStatusBits = 0; bIsPageOverflow = 
false; }
+voidClear() { nStatusBits = 0; /*bIsPageOverflow = 
false;*/ }
 voidSetControlBits( sal_uLong nMask, bool bOn )
 { SetFlags( nControlBits, nMask, bOn ); }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-12 Thread Khaled Hosny

 svtools/source/misc/sampletext.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4fbf715763122215ae8d8d961d73a5b7867dd6c6
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Aug 12 19:25:21 2014 +0300

Related: fdo#82259 not all STIX are symbol fonts

The new STIX and STIX Math are regular fonts, as well as the old
STIXGeneral, so narrow the match a bit.

Change-Id: I82341c3e9e5dd4e0323bf76096cba8890a82f0c7
(cherry picked from commit 56dc7aecc3194dac8012ebc252fb893125f64ebc)
Reviewed-on: https://gerrit.libreoffice.org/10896
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index dd26f80..b099960 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -42,7 +42,10 @@ bool isSymbolFont(const Font rFont)
 rFont.GetName().equalsIgnoreAsciiCase(MusiSync) ||
 rFont.GetName().equalsIgnoreAsciiCase(stmary10) ||
 rFont.GetName().equalsIgnoreAsciiCase(Symbol) ||
-rFont.GetName().startsWith(STIX) ||
+rFont.GetName().startsWith(STIXIntegrals) ||
+rFont.GetName().startsWith(STIXNonUnicode) ||
+rFont.GetName().startsWith(STIXSize) ||
+rFont.GetName().startsWith(STIXVariants) ||
 isOpenSymbolFont(rFont);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - bin/lo-all-static-libs external/nss

 bin/lo-all-static-libs  |7 ++
 external/nss/UnpackedTarball_nss.mk |1 
 external/nss/nss-more-static.patch  |   39 
 3 files changed, 43 insertions(+), 4 deletions(-)

New commits:
commit d87cf30fe65e525f1cb50dbc5eecf2d623e7cfb3
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 19:48:00 2014 +0300

More NSS static linking patches

I noticed in the debugger that this code tried to load a freebl dylib, but
after then making it link to the freebl entry point statically, I no longer
see it being entered. Huh, confusing. Making NSS work on iOS to the extent 
we
need is a pain.

Change-Id: Iafc3785752587c38566441f566e187859022733e

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 0ca3de2..fa798d1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/ubsan.patch.0 \
 $(if $(filter IOS,$(OS)), \
 external/nss/nss-chromium-nss-static.patch \
+external/nss/nss-more-static.patch \
 external/nss/nss-ios.patch) \
 ))
 
diff --git a/external/nss/nss-more-static.patch 
b/external/nss/nss-more-static.patch
new file mode 100644
index 000..6b06a4e
--- /dev/null
+++ b/external/nss/nss-more-static.patch
@@ -0,0 +1,39 @@
+--- a/a/nss/lib/freebl/loader.c
 a/a/nss/lib/freebl/loader.c
+@@ -114,6 +114,7 @@
+ 
+ #include genload.c
+ 
++extern FREEBLGetVectorFn FREEBL_GetVector;
+ /* This function must be run only once. */
+ /*  determine if hybrid platform, then actually load the DSO. */
+ static PRStatus
+@@ -136,9 +136,9 @@
+ return PR_FAILURE;
+   }
+ 
+-  handle = loader_LoadLibrary(name);
+-  if (handle) {
+-PRFuncPtr address = PR_FindFunctionSymbol(handle, FREEBL_GetVector);
++  handle = 0;
++  {
++PRFuncPtr address = FREEBL_GetVector;
+ PRStatus status;
+ if (address) {
+   FREEBLGetVectorFn  * getVector = (FREEBLGetVectorFn *)address;
+@@ -887,6 +887,7 @@
+ void
+ BL_Unload(void)
+ {
++#if 0
+   /* This function is not thread-safe, but doesn't need to be, because it is
+* only called from functions that are also defined as not thread-safe,
+* namely C_Finalize in softoken, and the SSL bypass shutdown callback 
called
+@@ -905,6 +905,7 @@
+   blLib = NULL;
+   }
+   loadFreeBLOnce = pristineCallOnce;
++#endif
+ }
+ 
+ /* == New for 3.003 === */
commit f887a3e1d83b1607bb43c3d4957a2dc4c18b3d2c
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 18:27:24 2014 +0300

Not true, it's the dylibs that are copied

Change-Id: I2fc51f2aaf56ce98d8990b71a33abaef24d841e7

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 8cff485..11c66d4 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -54,9 +54,6 @@ IOS)
 $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o \
 $WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o
 
-# Unfortunately NSS's build mechanism copies each static archive
-# it constructs to another place, but we don't bother filtering
-# out duplicates, it shouldn't hurt.
 nsslibs=`find $WORKDIR/UnpackedTarball/nss -name 'lib*.a'`
 ;;
 *)
commit 5b4e745d91431e888da42f0c7c78c0445ae201c7
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 18:26:44 2014 +0300

More object files not in any archive

Change-Id: I658e235d345e61f2b18e9cf074d64bce9793cfc5

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 1d93afe..8cff485 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -50,7 +50,9 @@ IOS)
 # files (that are not present in any of the static archives). We
 # need the latter too, so collect them here into an archive of
 # their own.
-ar cr $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/libLOtemp.a 
$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o
+ar cr $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/libLOtemp.a \
+$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o \
+$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o
 
 # Unfortunately NSS's build mechanism copies each static archive
 # it constructs to another place, but we don't bother filtering
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source

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

New commits:
commit 67955d33fff575224ee4895025108203cb3e00f7
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 19:01:03 2014 +0200

Using CalcTextHeight for overflowing paragraphs

Change-Id: I7ad162c8287c7d9b335758c261e4289fa41ef4bc

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 3472780..8751d05 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -549,7 +549,7 @@ void ImpEditEngine::CheckAutoPageSize()
 // setting overflow status
 sal_uInt32 nBoxHeight = 1783; // XXX: hard coded for testing
 //if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
-if (CalcTextHeight()  nBoxHeight) // XXX: CalcTextHeight here??
+if (CalcTextHeight(NULL)  nBoxHeight) // XXX: CalcTextHeight here??
 {
 // which paragraph is the first to cause higher size of the box?
 UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // 
XXX: currently only for horizontal text
commit e4ee3e2a6e177c3bd192eb967d34e4f6f136ff02
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 19:00:34 2014 +0200

Using CalcTextHeight for overflowing paragraphs

Change-Id: I807107fdcbc53fdf5aa71fecc2ea1089eddbe1d9

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 736e594..3472780 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -549,7 +549,7 @@ void ImpEditEngine::CheckAutoPageSize()
 // setting overflow status
 sal_uInt32 nBoxHeight = 1783; // XXX: hard coded for testing
 //if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
-if (GetTextHeight()  nBoxHeight) // XXX: CalcTextHeight here??
+if (CalcTextHeight()  nBoxHeight) // XXX: CalcTextHeight here??
 {
 // which paragraph is the first to cause higher size of the box?
 UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // 
XXX: currently only for horizontal text
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

 svx/source/svdraw/svdotext.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5de528424f43fe65e7df1775e46b78f369dffabf
Author: matteocam matteo.campane...@gmail.com
Date:   Tue Aug 12 19:17:59 2014 +0200

Set box's chaining need as overflowing status

Change-Id: Ic6ac3786163660922cd6866c8b2c96c737e4e069

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index ad1ae75..01ea84b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1952,10 +1952,10 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 ImpAutoFitText(*pEdtOutl);
 mbInDownScale = false;
 }
-else if ( GetNextLinkInChain() != NULL   
pEditStatus-IsPageOverflow())
+else if ( GetNextLinkInChain() != NULL)
 {
 // set the need for chaining
-SetToBeChained( true );
+SetToBeChained( pEditStatus-IsPageOverflow() );
 //impDecomposeChainedTextPrimitive();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC] Personas - Weekly Report #12

2014-08-12 Thread Rachit Gupta

Hi all,

This week I made some changes to the Personas code and pushed a new branch
for code review (gsoc14-personas2).
Also, I converted RID_XMLSECTP_GENERAL to Widget Layout, which also solved
a 3 year old bug, fdo#44182
https://bugs.freedesktop.org/show_bug.cgi?id=44182.

-- 
Regards,
Rachit Gupta
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-08-12 Thread Kohei Yoshida

 filter/source/msfilter/msdffimp.cxx |  180 
 1 file changed, 82 insertions(+), 98 deletions(-)

New commits:
commit 95f0811c093680e6258f3bc973a3f7a3731a28f4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Aug 12 14:00:03 2014 -0400

Revert Resolves: #i125187# more precision where the BLIP graphic is 
located

This reverts commit 3ea17073114cae99d7c323f051a4a2ba074f043c.

That change from AOO single-handedly broke all image import from xls
binary files.

Change-Id: I384ae8f286ccc9d39e64de9da5ef6458af0a0972

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index d3ba8ca..2bf8a09 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5823,46 +5823,25 @@ void SvxMSDffManager::GetDrawingGroupContainerData( 
SvStream rSt, sal_uLong nLe
 nLenFBSE = nLength;
 // is FBSE big enough for our data
 bool bOk = ( nSkipBLIPLen + 4 + nSkipBLIPPos + 4 = nLenFBSE );
-bool bBLIPIsDirectlyEmbedded(false);
 
-if(bOk)
+if( bOk )
 {
-rSt.SeekRel(nSkipBLIPLen);
+rSt.SeekRel( nSkipBLIPLen );
 rSt.ReadUInt32( nBLIPLen );
-
-// #i125187# do not simply skip these four bytes, but read 
them. This value
-// is zero when the BLIP is embedded to the FBSE directly 
following in the
-// stream, else 1. Use this as hint to be more reliable (see 
below)
-rSt.ReadUInt32( nBLIPPos );
-
-if (0 == nBLIPPos)
-{
-bBLIPIsDirectlyEmbedded = true;
-}
-
+rSt.SeekRel( nSkipBLIPPos );
 rSt.ReadUInt32( nBLIPPos );
 bOk = rSt.GetError() == 0;
 
-nLength -= nSkipBLIPLen + 4 + nSkipBLIPPos + 4;
+nLength -= nSkipBLIPLen+ 4 + nSkipBLIPPos + 4;
 }
 
 if( bOk )
 {
-// #i125187# the original check to test if the BLIP is 
following embeded in the FBSE was
-// was (!nBLIPPos  nBLIPLen  nLenFBSE), but there are ppt 
documents
-// where this is not sufficient (what means that for BLIPs in 
the picture
-// stream the same conditions can be true sometimes). I 
experimented with various
-// ppt files and detected that the four bytes before reading 
the nBLIPPos
-// contain a flag which describes that embedding more 
reliable, thus I will
-// use it here now in the form of the bBLIPIsDirectlyEmbedded 
variable (see above).
-// This modification works with all ppt files I found which 
use directly embedded
-// BLIPs and with the file which showed the error. More work 
may be needed when
-// exceptions to this more strict schema may show up, though.
-if (0 == nBLIPPos  nBLIPLen  nLenFBSE  
bBLIPIsDirectlyEmbedded)
-{
-// get BLIP file position as directly following embedded
+// specialty:
+// If nBLIPLen is less than nLenFBSE AND nBLIPPos is NULL,
+// then we assume, that the image is in FBSE!
+if( (!nBLIPPos)  (nBLIPLen  nLenFBSE) )
 nBLIPPos = rSt.Tell() + 4;
-}
 
 // That worked great!
 // We store, that we do have one FBSE more in the pointer 
array.
commit 5fe1a59cb7408e9f6ce0e554f01c89fc44ab3041
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Aug 12 13:33:42 2014 -0400

Scope reduction in GetBLIP()  remove non-ASCII character (degree symbol).

Change-Id: I306a22b087aceed5dbb6cb2e8b67e2501589ee61

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 867c8e2..d3ba8ca 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4288,8 +4288,9 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader rHd, SvStream r
 if ( IsHardAttribute( DFF_Prop_gtextFBold ) )
 aSet.Put( SvxWeightItem( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 )  0x0020 ) != 0 ? WEIGHT_BOLD : 
WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
 
-// SJ TODO: Vertical Writing is not correct, instead 
this should be
-// replaced through CharacterRotation by 90Â°, 
therefore a new Item has to be
+// SJ TODO: Vertical Writing is not correct, instead
+// this should be replaced through CharacterRotation
+// by 90 degrees, therefore a new Item has to be
 // supported by svx core, api and xml file format

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

2014-08-12 Thread Luboš Luňák

 sw/inc/swregion.hxx |1 +
 sw/inc/undobj.hxx   |2 +-
 sw/source/core/bastyp/swregion.cxx  |6 ++
 sw/source/core/layout/trvlfrm.cxx   |   26 +-
 sw/source/core/undo/undobj.cxx  |   20 
 sw/source/filter/basflt/shellio.cxx |3 ++-
 6 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 78131b6bfc16d739e28024407de253c84cb68a8a
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Tue Aug 12 20:15:02 2014 +0200

show fly anchored inside selection as selected too

If part (or whole) document is selected and then the selection
is e.g. deleted, flys anchored there will be deleted too, so it
makes sense to show them as part of the selection.

Change-Id: I17bfccebc0cd305c19616159471f0f113c7e71d9

diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 5602c12..b290e21 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -36,6 +36,7 @@ public:
 
 // For punching from aOrigin.
 void operator-=( const SwRect rRect );
+void operator+=( const SwRect rRect );
 
 // From holes to areas, from areas to holes.
 void Invert();
diff --git a/sw/source/core/bastyp/swregion.cxx 
b/sw/source/core/bastyp/swregion.cxx
index d7cef15..dcd2eb3 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -45,6 +45,12 @@ inline void SwRegionRects::InsertRect( const SwRect rRect,
 }
 }
 
+void SwRegionRects::operator+=( const SwRect rRect )
+{
+bool f = false;
+InsertRect( rRect, 0, f );
+}
+
 /** Delete all overlaps of the Rects in array with the given rRect
 
 To do so, all existing rectangles have to be either split or deleted.
diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index f98aee6..7f63987 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1973,6 +1973,12 @@ inline void Sub( SwRegionRects rRegion, const SwRect 
rRect )
 rRegion -= rRect;
 }
 
+inline void Add( SwRegionRects rRegion, const SwRect rRect )
+{
+if( rRect.Width()  1  rRect.Height()  1 )
+rRegion += rRect;
+}
+
 /*
  * The following situations can happen:
  *  1. Start and end lie in one screen-row and in the same node
@@ -1990,6 +1996,7 @@ inline void Sub( SwRegionRects rRegion, const SwRect 
rRect )
  * Exceptions:  - The Fly in which the selection took place (if it took place
  * in a Fly)
  *  - The Flys which are underrun by the text
+ *  - The Flys which are anchored to somewhere inside the 
selection.
  * Functioning: First a SwRegion with a root gets initialized.
  *  Out of the region the inverted sections are cut out. The
  *  section gets compressed and finally inverted and thereby the
@@ -2549,6 +2556,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr rCrsr)
 //   sit in it)
 // - if in the Z-order we have Flys above those in which the StartFrm is
 //   placed
+// - if they are anchored to inside the selection and thus part of it
 const SwPageFrm *pPage  = pStartFrm-FindPageFrm();
 const SwPageFrm *pEndPage   = pEndFrm-FindPageFrm();
 
@@ -2565,7 +2573,23 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr rCrsr)
 const SwFlyFrm* pFly = static_castconst 
SwFlyFrm*(pAnchoredObj);
 const SwVirtFlyDrawObj* pObj = pFly-GetVirtDrawObj();
 const SwFmtSurround rSur = pFly-GetFmt()-GetSurround();
-if ( !pFly-IsAnLower( pStartFrm ) 
+SwPosition anchoredAt = 
*pAnchoredObj-GetFrmFmt().GetAnchor().GetCntntAnchor();
+bool inSelection = ( *pStartPos = anchoredAt  anchoredAt  
*pEndPos );
+if( anchoredAt == *pEndPos )
+{
+const SwNodes nodes = anchoredAt.GetDoc()-GetNodes();
+if( *pEndPos == SwPosition( nodes.GetEndOfContent()))
+inSelection = true;
+else
+{
+SwNodeIndex idx( nodes.GetEndOfContent());
+ if( SwCntntNode* last = nodes.GoPrevious( idx ))
+inSelection = *pEndPos == SwPosition( *last, 
last-Len());
+}
+}
+if( inSelection )
+Add( aRegion, pFly-Frm() );
+else if ( !pFly-IsAnLower( pStartFrm ) 
 (rSur.GetSurround() != SURROUND_THROUGHT 
 !rSur.IsContour()) )
 {
commit 2903d85d6197829633d7f96c95cd55821c2c20ff
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Tue Aug 12 18:39:02 2014 +0200

fix deleting an image anchored to last paragraph in document

It only compared nodes instead of SwPositions, thus refusing to delete
anything anchored at the last content node. Also, select-all makes
rEnd point to the last

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

2014-08-12 Thread Kohei Yoshida

 sc/qa/unit/data/xls/file-with-png-image.xls |binary
 sc/qa/unit/subsequent_filters-test.cxx  |   27 +++
 2 files changed, 27 insertions(+)

New commits:
commit 7256a10fb6abcecdda5b5820be79940b14c51fc2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Aug 12 15:36:55 2014 -0400

Write test for importing images from xls.

Change-Id: I84a996d20ed7ce5f9ffa48644616e59186458243

diff --git a/sc/qa/unit/data/xls/file-with-png-image.xls 
b/sc/qa/unit/data/xls/file-with-png-image.xls
new file mode 100755
index 000..36fe473
Binary files /dev/null and b/sc/qa/unit/data/xls/file-with-png-image.xls differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 8cc9510..0915878 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -18,6 +18,7 @@
 #include sfx2/docfile.hxx
 #include sfx2/sfxmodelfactory.hxx
 #include svl/stritem.hxx
+#include svx/svdograf.hxx
 
 #include drwlayer.hxx
 #include svx/svdpage.hxx
@@ -177,6 +178,7 @@ public:
 void testHybridSharedStringODS();
 void testCopyMergedNumberFormats();
 void testVBAUserFunctionXLSM();
+void testEmbeddedImageXLS();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBasicCellContentODS);
@@ -257,6 +259,7 @@ public:
 CPPUNIT_TEST(testHybridSharedStringODS);
 CPPUNIT_TEST(testCopyMergedNumberFormats);
 CPPUNIT_TEST(testVBAUserFunctionXLSM);
+CPPUNIT_TEST(testEmbeddedImageXLS);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2624,6 +2627,30 @@ void ScFiltersTest::testVBAUserFunctionXLSM()
 xDocSh-DoClose();
 }
 
+void ScFiltersTest::testEmbeddedImageXLS()
+{
+// The document has one embedded image on the first sheet.  Make sure it's
+// imported properly.
+
+ScDocShellRef xDocSh = loadDoc(file-with-png-image., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument rDoc = xDocSh-GetDocument();
+
+ScDrawLayer* pDL = rDoc.GetDrawLayer();
+CPPUNIT_ASSERT(pDL);
+const SdrPage* pPage = pDL-GetPage(0);
+CPPUNIT_ASSERT(pPage);
+const SdrObject* pObj = pPage-GetObj(0);
+CPPUNIT_ASSERT(pObj);
+const SdrGrafObj* pImageObj = dynamic_castconst SdrGrafObj*(pObj);
+CPPUNIT_ASSERT(pImageObj);
+const Graphic rGrf = pImageObj-GetGraphic();
+BitmapEx aBMP = rGrf.GetBitmapEx();
+CPPUNIT_ASSERT_MESSAGE(Bitmap content should not be empty if the image 
has been properly imported., !aBMP.IsEmpty());
+
+xDocSh-DoClose();
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( /sc/qa/unit/data )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_TiledLibreOffice_app.mk

 ios/CustomTarget_TiledLibreOffice_app.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b513f288275ae96f55e232f07bf94294c66e95a1
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 12 23:05:40 2014 +0300

LO_LIB_DIR is used in nsscrypto_initialize() so must give it a value

Its actual value is irrelevant in the nsscrypto_initialize() case for
iOS, though, as it is used to form a pathname to a hypothetical
libnssckbi.dylib (which does not exist for iOS, as we build NSS
statically), and we patch the NSS code to recognize the nssckbi name
specially in the static build case... Such elegance.

Change-Id: Ib5015a18e86cc604f80433a676faa10ac76e04ab

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk 
b/ios/CustomTarget_TiledLibreOffice_app.mk
index aa89470..9c33364 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -91,6 +91,7 @@ TiledLibreOffice_setup:
# Do we really need all these?
file=$(TiledLibreOffice_resource)/fundamentalrc; \
echo '[Bootstrap]'$$file; \
+   echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' $$file; \
echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR'  $$file; \
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
res:$${BRAND_BASE_DIR}/registry'  $$file;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Transaction #091830672431 [$299.00] requires verification

2014-08-12 Thread Peebles

A hold has been placed on your deposit  
Please complete the following simple steps.  
  
1\. Please sign in to your free account  
to verify your acceptance  
  
   **[ Sign In Here 
**](http://fileserver.jureor.net/9383/2014/2466/12/?info=eyJhIjogMSwgInUiOiAiU29sby5BZHMuQWNhZGVteSIsICJlIjogImxpYnJlb2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyIsICJ0IjogIlNvbG8uQWRzXzE0LkFjYWRlbXlfXzIwMTQwODEyMTgwODE3IiwgInYiOiAiZmlsZXNlcnZlci5qdXJlb3IubmV0In0=url=http://income-cash.com/qcc/TrafficIN/?id=91)
  
  
2\. Your deposit has been placed on hold.  
Amt: $299.00  
  
   **[ Confirm Your Address 
**](http://fileserver.jureor.net/4192/2014/1662/12/?info=eyJhIjogMSwgInUiOiAiU29sby5BZHMuQWNhZGVteSIsICJlIjogImxpYnJlb2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyIsICJ0IjogIlNvbG8uQWRzXzE0LkFjYWRlbXlfXzIwMTQwODEyMTgwODE3IiwgInYiOiAiZmlsZXNlcnZlci5qdXJlb3IubmV0In0=url=http://income-cash.com/qcc/TrafficIN/?id=91)
  
  
  
Regards,  
Lior  
Support  
  
P.S. Once  verification is complete  
You can increase your earnings  
limits by following the steps [Outlined 
HERE](http://fileserver.jureor.net/3142/2014/0703/12/?info=eyJhIjogMSwgInUiOiAiU29sby5BZHMuQWNhZGVteSIsICJlIjogImxpYnJlb2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyIsICJ0IjogIlNvbG8uQWRzXzE0LkFjYWRlbXlfXzIwMTQwODEyMTgwODE3IiwgInYiOiAiZmlsZXNlcnZlci5qdXJlb3IubmV0In0=url=http://income-cash.com/qcc/TrafficIN/?id=91)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/refactor-god-objects' - 842 commits - android/Bootstrap android/experimental avmedia/Library_avmedia.mk avmedia/source basctl/source basegfx/source basi

2014-08-12 Thread Valentin Kettner

Rebased ref, commits from common ancestor:
commit 1f4d9846aeb40af1fbb0126f666766fe6c60d8ff
Author: Valentin Kettner vakevk+libreoff...@gmail.com
Date:   Tue Aug 12 15:03:19 2014 +0200

Refactored IDocumentExternalData out of SwDoc.

Into the new class DocumentExternalDataManager.

Change-Id: Ib863daec170044c46143b47a91739d4c0940d963

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 507b94c..66eb006 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -201,6 +201,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/doc/DocumentStateManager \
 sw/source/core/doc/DocumentLayoutManager \
 sw/source/core/doc/DocumentStylePoolManager \
+sw/source/core/doc/DocumentExternalDataManager \
 sw/source/core/doc/extinput \
 sw/source/core/doc/fmtcol \
 sw/source/core/doc/ftnidx \
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3d6c265..e000a91 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -22,7 +22,6 @@
 // SwDoc interfaces
 #include IInterface.hxx
 #include IDocumentMarkAccess.hxx
-#include IDocumentExternalData.hxx
 #include com/sun/star/embed/XEmbeddedObject.hpp
 #include com/sun/star/embed/XStorage.hpp
 #include vcl/timer.hxx
@@ -191,6 +190,7 @@ class IDocumentStatistics;
 class IDocumentState;
 class IDocumentLayoutAccess;
 class IDocumentStylePoolAccess;
+class IDocumentExternalData;
 class _SetGetExpFlds;
 
 namespace sw { namespace mark {
@@ -216,6 +216,7 @@ namespace sw {
 class DocumentStateManager;
 class DocumentLayoutManager;
 class DocumentStylePoolManager;
+class DocumentExternalDataManager;
 }
 
 namespace com { namespace sun { namespace star {
@@ -252,8 +253,7 @@ void StartGrammarChecking( SwDoc rDoc );
 
 // Represents the model of a Writer document.
 class SW_DLLPUBLIC SwDoc :
-public IInterface,
-public IDocumentExternalData
+public IInterface
 {
 friend class ::sw::DocumentContentOperationsManager;
 
@@ -295,6 +295,7 @@ class SW_DLLPUBLIC SwDoc :
 const ::boost::scoped_ptr ::sw::DocumentStatisticsManager  
m_pDocumentStatisticsManager;
 const ::boost::scoped_ptr ::sw::DocumentLayoutManager  
m_pDocumentLayoutManager;
 const ::boost::scoped_ptr ::sw::DocumentStylePoolManager  
m_pDocumentStylePoolManager;
+const ::boost::scoped_ptr ::sw::DocumentExternalDataManager  
m_pDocumentExternalDataManager;
 
 // Pointer
 SwFrmFmt*mpDfltFrmFmt;   // Default formats.
@@ -603,10 +604,11 @@ public:
 IDocumentListsAccess const  getIDocumentListsAccess() const;
 IDocumentListsAccess  getIDocumentListsAccess();
 
-// IDocumentExternalData
-virtual void setExternalData(::sw::tExternalDataType eType,
- ::sw::tExternalDataPointer pPayload) 
SAL_OVERRIDE;
-virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType 
eType) SAL_OVERRIDE;
+//IDocumentExternalData
+IDocumentExternalData const  getIDocumentExternalData() const;
+IDocumentExternalData  getIDocumentExternalData();
+
+//End of Interfaces
 
 virtual void setDocReadOnly( bool b) { mbReadOnly = b; }
 virtual bool getDocReadOnly() const { return mbReadOnly; }
diff --git a/sw/source/core/doc/DocumentExternalDataManager.cxx 
b/sw/source/core/doc/DocumentExternalDataManager.cxx
new file mode 100644
index 000..3e751a3
--- /dev/null
+++ b/sw/source/core/doc/DocumentExternalDataManager.cxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include DocumentExternalDataManager.hxx
+
+namespace sw
+{
+
+void DocumentExternalDataManager::setExternalData(::sw::tExternalDataType 
eType, ::sw::tExternalDataPointer pPayload)
+{
+m_externalData[eType] = pPayload;
+}
+
+::sw::tExternalDataPointer 
DocumentExternalDataManager::getExternalData(::sw::tExternalDataType eType)
+{
+return m_externalData[eType];
+}
+
+}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1827f24..fad297ac 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -34,6 +34,7 @@
 #include DocumentStateManager.hxx
 #include

[Libreoffice-commits] core.git: 8 commits - sw/inc sw/Library_sw.mk sw/qa sw/source

2014-08-12 Thread Valentin Kettner

 sw/Library_sw.mk  |7 
 sw/inc/IDocumentFieldsAccess.hxx  |2 
 sw/inc/IDocumentLineNumberAccess.hxx  |   42 
 sw/inc/IDocumentRedlineAccess.hxx |1 
 sw/inc/IDocumentState.hxx |2 
 sw/inc/doc.hxx|  252 -
 sw/inc/docary.hxx |2 
 sw/inc/fmtcol.hxx |3 
 sw/inc/frmfmt.hxx |2 
 sw/inc/node.hxx   |5 
 sw/qa/core/macros-test.cxx|3 
 sw/qa/core/uwriter.cxx|   39 
 sw/qa/extras/inc/swmodeltestbase.hxx  |5 
 sw/qa/extras/uiwriter/uiwriter.cxx|2 
 sw/source/core/access/accpara.cxx |3 
 sw/source/core/attr/format.cxx|6 
 sw/source/core/bastyp/calc.cxx|6 
 sw/source/core/crsr/annotationmark.cxx|6 
 sw/source/core/crsr/bookmrk.cxx   |5 
 sw/source/core/crsr/crsrsh.cxx|3 
 sw/source/core/crsr/crstrvl.cxx   |   23 
 sw/source/core/crsr/findattr.cxx  |3 
 sw/source/core/crsr/findcoll.cxx  |3 
 sw/source/core/crsr/findtxt.cxx   |3 
 sw/source/core/crsr/pam.cxx   |   11 
 sw/source/core/crsr/swcrsr.cxx|   34 
 sw/source/core/crsr/trvltbl.cxx   |9 
 sw/source/core/crsr/unocrsr.cxx   |7 
 sw/source/core/doc/CntntIdxStore.cxx  |9 
 sw/source/core/doc/DocumentChartDataProviderManager.cxx   |3 
 sw/source/core/doc/DocumentContentOperationsManager.cxx   |  268 -
 sw/source/core/doc/DocumentDeviceManager.cxx  |   10 
 sw/source/core/doc/DocumentDrawModelManager.cxx   |   13 
 sw/source/core/doc/DocumentExternalDataManager.cxx|   34 
 sw/source/core/doc/DocumentFieldsManager.cxx  | 1669 
 sw/source/core/doc/DocumentLayoutManager.cxx  |  519 ++
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx |6 
 sw/source/core/doc/DocumentRedlineManager.cxx | 2677 +
 sw/source/core/doc/DocumentSettingManager.cxx |   10 
 sw/source/core/doc/DocumentStateManager.cxx   |  134 
 sw/source/core/doc/DocumentStatisticsManager.cxx  |  248 +
 sw/source/core/doc/DocumentStylePoolManager.cxx   | 2200 ++
 sw/source/core/doc/DocumentTimerManager.cxx   |   26 
 sw/source/core/doc/acmplwrd.cxx   |5 
 sw/source/core/doc/doc.cxx|  465 --
 sw/source/core/doc/docbm.cxx  |3 
 sw/source/core/doc/docchart.cxx   |3 
 sw/source/core/doc/doccomp.cxx|   68 
 sw/source/core/doc/doccorr.cxx|   10 
 sw/source/core/doc/docdesc.cxx|   35 
 sw/source/core/doc/docdraw.cxx|   11 
 sw/source/core/doc/docedt.cxx |   41 
 sw/source/core/doc/docfld.cxx | 1831 
 sw/source/core/doc/docfly.cxx |   28 
 sw/source/core/doc/docfmt.cxx |   62 
 sw/source/core/doc/docftn.cxx |   26 
 sw/source/core/doc/docglbl.cxx|6 
 sw/source/core/doc/docglos.cxx|   11 
 sw/source/core/doc/doclay.cxx |  503 --
 sw/source/core/doc/docnew.cxx |  101 
 sw/source/core/doc/docnum.cxx |   74 
 sw/source/core/doc/docredln.cxx   | 2872 --
 sw/source/core/doc/docsort.cxx|   22 
 sw/source/core/doc/doctxm.cxx |   45 
 sw/source/core/doc/ftnidx.cxx |3 
 sw/source/core/doc/htmltbl.cxx|7 
 sw/source/core/doc/lineinfo.cxx   |9 
 sw/source/core/doc/notxtfrm.cxx   |3 
 sw/source/core/doc/number.cxx |8 
 sw/source/core/doc/poolfmt.cxx| 2117 --
 sw/source/core/doc/swserv.cxx |3 
 sw/source/core/doc/tblcpy.cxx |   16 
 sw/source/core/doc/tblrwcl.cxx|   25

[Libreoffice-commits] core.git: 5 commits - canvas/Library_oglcanvas.mk canvas/source slideshow/Library_OGLTrans.mk slideshow/Module_slideshow.mk slideshow/opengl slideshow/Package_opengl.mk slideshow

 canvas/Library_oglcanvas.mk|1 
 canvas/source/opengl/ogl_canvasbitmap.cxx  |2 
 canvas/source/opengl/ogl_canvascustomsprite.cxx|2 
 canvas/source/opengl/ogl_spritecanvas.cxx  |2 
 canvas/source/opengl/ogl_spritedevicehelper.cxx|3 
 canvas/source/opengl/ogl_spritedevicehelper.hxx|1 
 slideshow/Library_OGLTrans.mk  |2 
 slideshow/Module_slideshow.mk  |1 
 slideshow/Package_opengl.mk|   18 
 slideshow/opengl/basicVertexShader.glsl|   37 +
 slideshow/opengl/dissolveFragmentShader.glsl   |   48 
++
 slideshow/opengl/staticFragmentShader.glsl |   64 
+++
 slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx  |  191 
--
 slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx  |   75 
---
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx   |  111 
-
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |   11 
 16 files changed, 198 insertions(+), 371 deletions(-)

New commits:
commit 3c99db4ca0405ab74f0e327ef9444c6cfdb7fc5b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Aug 13 02:01:52 2014 +0200

fix problems around shaders

Change-Id: I1577fb81cb3cf1fac3f5ba5d560d96cb83d4483d

diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk
index 3959028..5d9978b 100644
--- a/slideshow/Module_slideshow.mk
+++ b/slideshow/Module_slideshow.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,slideshow))
 $(eval $(call gb_Module_add_targets,slideshow,\
 $(if $(filter TRUE,$(ENABLE_OPENGL)),Library_OGLTrans) \
 Library_slideshow \
+   Package_opengl \
 ))
 
 # not working
diff --git a/slideshow/Package_opengl.mk b/slideshow/Package_opengl.mk
index 866bfd0..a7e9a8c 100644
--- a/slideshow/Package_opengl.mk
+++ b/slideshow/Package_opengl.mk
@@ -10,9 +10,9 @@
 $(eval $(call 
gb_Package_Package,slideshow_opengl_shader,$(SRCDIR)/slideshow/opengl))
 
 $(eval $(call 
gb_Package_add_files,slideshow_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\
-   slideshow/opengl/basicVertexShader.glsl \
-   slideshow/opengl/dissolveFragmentShader.glsl \
-   slideshow/opengl/staticFragmentShader.glsl \
+   basicVertexShader.glsl \
+   dissolveFragmentShader.glsl \
+   staticFragmentShader.glsl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 63d5753..222590c 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -1473,7 +1473,7 @@ private:
 
 GLuint StaticNoiseTransition::makeShader_()
 {
-return OpenGLHelper::LoadShaders( basicVertexShader.glsl, 
staticFragmentShader.glsl );
+return OpenGLHelper::LoadShaders( basicVertexShader, 
staticFragmentShader );
 }
 
 shared_ptrOGLTransitionImpl
@@ -1524,7 +1524,7 @@ private:
 
 GLuint DissolveTransition::makeShader_()
 {
-return OpenGLHelper::LoadShaders( basicVertexShader.glsl, 
dissolveFragmentShader.glsl );
+return OpenGLHelper::LoadShaders( basicVertexShader, 
dissolveFragmentShader );
 }
 
 shared_ptrOGLTransitionImpl
commit b4ed7cc37eb50380b3eccfba12edf08805dc25b5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Aug 12 05:56:45 2014 +0200

make OGLTrans build on windows

We still need to fix a number of issues around pixmap to make it really 
useful.

Change-Id: I747d735d043d91d51809801edd9b778622b6063c

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 361ad13..673d72a 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -383,7 +383,9 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( 
const Reference presenta
 
 GLWindow rGLWindow(mpContext-getOpenGLWindow());
 
+#ifdef UNX
 mbTextureFromPixmap = rGLWindow.HasGLXExtension( 
GLX_EXT_texture_from_pixmap );
+#endif
 mbGenerateMipmap = rGLWindow.HasGLExtension( GL_SGIS_generate_mipmap );
 
 glEnable(GL_CULL_FACE);
commit 140b031935da665c3cd75d89d2dc685d82f04b1c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Aug 11 21:44:10 2014 +0200

we always have GLX 1.3, even on the baseline

Change-Id: I381aca6e09a63d21bcbdf2625c4d829f84819bf8

diff --git

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

2014-08-12 Thread Kohei Yoshida

 sc/source/filter/excel/xeescher.cxx |5 ++
 sc/source/filter/excel/xestyle.cxx  |5 +-
 sc/source/filter/inc/xeescher.hxx   |2 +
 sc/source/filter/xcl97/xcl97rec.cxx |   70 +++-
 4 files changed, 70 insertions(+), 12 deletions(-)

New commits:
commit 692878e3bb83c0fc104c5cca946c25ccf2d84ab2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Aug 12 21:24:17 2014 -0400

bnc#822170: Let's not even try to export invalid chart objects.

If we do, at best, Excel will complain about the document needing
repair.  At worst Excel will skip some of the other valid drawing
objects from being loaded.

Change-Id: If3794d0ae9d8b44b124020bb12b5369dfebc95ae

diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index 1223057..f3cd939 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1190,6 +1190,11 @@ void XclExpChartObj::WriteShapeTransformation( 
sax_fastparser::FSHelperPtr pFS,
 pFS-endElementNS( XML_xdr, XML_xfrm );
 }
 
+const css::uno::Referencecss::chart::XChartDocument 
XclExpChartObj::GetChartDoc() const
+{
+return mxChartDoc;
+}
+
 XclExpNote::XclExpNote( const XclExpRoot rRoot, const ScAddress rScPos,
 const ScPostIt* pScNote, const OUString rAddText ) :
 XclExpRecord( EXC_ID_NOTE ),
diff --git a/sc/source/filter/inc/xeescher.hxx 
b/sc/source/filter/inc/xeescher.hxx
index 7171046..1703630 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -303,6 +303,8 @@ public:
 virtual voidWriteChartObj( sax_fastparser::FSHelperPtr pDrawing, 
XclExpXmlStream rStrm );
 void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const 
XShapeRef rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 
nRotation = 0 );
 
+const css::uno::Referencecss::chart::XChartDocument GetChartDoc() const;
+
 private:
 typedef boost::shared_ptr XclExpChart  XclExpChartRef;
 XclExpChartRef  mxChart;/// The chart itself (BOF/EOF 
substream data).
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx 
b/sc/source/filter/xcl97/xcl97rec.cxx
index e28bccf..ba20be7 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -71,6 +71,8 @@
 #include com/sun/star/sheet/XCellAddressable.hpp
 #include com/sun/star/sheet/XCellRangeAddressable.hpp
 #include com/sun/star/embed/Aspects.hpp
+#include com/sun/star/chart2/XCoordinateSystemContainer.hpp
+#include com/sun/star/chart2/XChartTypeContainer.hpp
 #include oox/token/tokens.hxx
 #include oox/export/shapes.hxx
 #include oox/export/utils.hxx
@@ -163,6 +165,8 @@ void XclExpObjList::Save( XclExpStream rStrm )
 pSolverContainer-Save( rStrm );
 }
 
+namespace {
+
 static bool IsVmlObject( const XclObj *rObj )
 {
 switch( rObj-GetObjType() )
@@ -186,10 +190,61 @@ static sal_Int32 GetVmlObjectCount( XclExpObjList rList )
 return nNumVml;
 }
 
+bool IsValidObject( const XclObj rObj )
+{
+if (rObj.GetObjType() == EXC_OBJTYPE_CHART)
+{
+// Chart object.  Make sure it's a valid chart object.  We skip
+// invalid chart objects from exporting to prevent Excel from
+// complaining on load.
+
+const XclExpChartObj rChartObj = static_castconst 
XclExpChartObj(rObj);
+uno::Referencechart2::XChartDocument 
xChartDoc(rChartObj.GetChartDoc(), uno::UNO_QUERY);
+if (!xChartDoc.is())
+return false;
+
+uno::Referencechart2::XDiagram xDiagram = 
xChartDoc-getFirstDiagram();
+if (!xDiagram.is())
+return false;
+
+uno::Referencechart2::XCoordinateSystemContainer 
xCooSysContainer(xDiagram, uno::UNO_QUERY);
+if (!xCooSysContainer.is())
+return false;
+
+uno::Sequenceuno::Referencechart2::XCoordinateSystem  xCooSysSeq = 
xCooSysContainer-getCoordinateSystems();
+if (!xCooSysSeq.getLength())
+return false;
+
+for (sal_Int32 nCooSys = 0; nCooSys  xCooSysSeq.getLength(); 
++nCooSys)
+{
+Referencechart2::XChartTypeContainer 
xChartTypeCont(xCooSysSeq[nCooSys], uno::UNO_QUERY);
+if (!xChartTypeCont.is())
+return false;
+
+uno::Sequenceuno::Referencechart2::XChartType  xChartTypeSeq = 
xChartTypeCont-getChartTypes();
+if (!xChartTypeSeq.getLength())
+// No chart type.  Not good.
+return false;
+}
+}
+
+return true;
+}
+
 static void SaveDrawingMLObjects( XclExpObjList rList, XclExpXmlStream 
rStrm, sal_Int32 nDrawingMLCount )
 {
-sal_Int32 nVmlObjects = GetVmlObjectCount( rList );
-if( (rList.size() - nVmlObjects) == 0 )
+std::vectorXclObj* aList;
+aList.reserve(rList.size());
+std::vectorXclObj*::iterator it = rList.begin(), itEnd = rList.end();
+for (; it != itEnd; ++it)
+{
+if (IsVmlObject(*it) ||

[Libreoffice-commits] dev-tools.git: scripts/Bugzilla.pm

2014-08-12 Thread Michael Meeks

 scripts/Bugzilla.pm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 997c556fb60aca4e93f171d275bb488517a1a548
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Aug 12 22:46:51 2014 -0400

Longer blacklist.

diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm
index 2a7715f..7cfc1f7 100644
--- a/scripts/Bugzilla.pm
+++ b/scripts/Bugzilla.pm
@@ -59,6 +59,7 @@ my %sadly_non_libreoffice = (
 'almos' = 1,
 'Andreas Boll' = 1,
 'Tapani PÃ¤lli' = 1,
+'Matt Turner' = 1,
 );
 
 sub get_url($)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=79641

Bug 79641 depends on bug 81517, which changed state.

Bug 81517 Summary: FILEOPEN: pictures in .xls spreadsheets no longer displayed
https://bugs.freedesktop.org/show_bug.cgi?id=81517

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 10 commits - chart2/opengl chart2/source

 chart2/opengl/screenTextFragmentShader.glsl|3 
 chart2/source/view/charttypes/GL3DBarChart.cxx |  386 -
 chart2/source/view/inc/3DChartObjects.hxx  |3 
 chart2/source/view/inc/GL3DBarChart.hxx|   32 +-
 chart2/source/view/inc/GL3DRenderer.hxx|   10 
 chart2/source/view/main/3DChartObjects.cxx |5 
 chart2/source/view/main/GL3DRenderer.cxx   |   78 -
 7 files changed, 424 insertions(+), 93 deletions(-)

New commits:
commit 0da2a52dc13e594c9196de9b28cd12c681b9
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Aug 13 06:14:30 2014 +0200

use references where possible

Change-Id: Ie629d3d8b6d3048a0b34bb80f27eba6044d7f695

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 0d5dd13..0299b92 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -928,11 +928,11 @@ void GL3DBarChart::contextDestroyed()
 mbValidContext = false;
 }
 
-void GL3DBarChart::addScreenTextShape(OUString nStr, glm::vec2 rLeftTop, 
float nTextHeight, glm::vec3 rPos, sal_uInt32 nEvent)
+void GL3DBarChart::addScreenTextShape(OUString nStr, glm::vec2 rLeftTop, 
float nTextHeight, const glm::vec3 rPos, sal_uInt32 nEvent)
 {
 maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), 
*mpTextCache, nStr, nEvent));
-opengl3D::TextCacheItem aTextCache = mpTextCache-getText(nStr);
-float nRectWidth = (float)aTextCache.maSize.Width() / 
(float)aTextCache.maSize.Height() * 0.05;
+const opengl3D::TextCacheItem rTextCache = mpTextCache-getText(nStr);
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.05;
 opengl3D::ScreenText* pScreenText = 
static_castopengl3D::ScreenText*(maScreenTextShapes.back());
 pScreenText-setPosition(rLeftTop, glm::vec2(rLeftTop.x + nRectWidth, 
rLeftTop.y - nTextHeight), rPos);
 }
@@ -1018,8 +1018,8 @@ void GL3DBarChart::updateClickEvent()
 {
 aBarValue = OUString(Value: ) + OUString::number(*it);
 maScreenTextShapes.push_back(new 
opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, 
CALC_POS_EVENT_ID));
-opengl3D::TextCacheItem aTextCache = 
mpTextCache-getText(aBarValue);
-float nRectWidth = (float)aTextCache.maSize.Width() / 
(float)aTextCache.maSize.Height() * 0.03;
+const opengl3D::TextCacheItem rTextCache = 
mpTextCache-getText(aBarValue);
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.03;
 std::mapsal_uInt32, const BarInformation::const_iterator itr 
= maBarMap.find(mSelectBarId);
 const BarInformation rBarInfo = itr-second;
 glm::vec3 aTextPos = glm::vec3(rBarInfo.maPos.x + BAR_SIZE_X / 
2.0f,
@@ -1038,9 +1038,9 @@ void GL3DBarChart::updateClickEvent()
 }
 }
 
-float GL3DBarChart::calcScrollDistance(glm::mat4 rMVP, glm::vec3 aPos)
+float GL3DBarChart::calcScrollDistance(const glm::mat4 rMVP, const glm::vec3 
rPos)
 {
-glm::vec4 aScreenPos = rMVP * glm::vec4(aPos, 1.0);
+glm::vec4 aScreenPos = rMVP * glm::vec4(rPos, 1.0);
 glm::vec3 aActualPos = glm::vec3(aScreenPos.x / aScreenPos.w, aScreenPos.y 
/ aScreenPos.w, 0.0);
 return glm::length(aActualPos);
 }
@@ -1159,8 +1159,8 @@ void GL3DBarChart::updateScroll()
 {
 OUString aBarValue = OUString(Value: ) + 
OUString::number(aBarInfoList[i].mnVal);
 maScreenTextShapes.push_back(new 
opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, 
CALC_POS_EVENT_ID));
-opengl3D::TextCacheItem aTextCache = 
mpTextCache-getText(aBarValue);
-float nRectWidth = (float)aTextCache.maSize.Width() / 
(float)aTextCache.maSize.Height() * 0.03;
+const opengl3D::TextCacheItem rTextCache = 
mpTextCache-getText(aBarValue);
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.03;
 glm::vec3 aTextPos = glm::vec3(aBarInfoList[i].maPos.x + 
BAR_SIZE_X / 2.0f,
   aBarInfoList[i].maPos.y + BAR_SIZE_Y / 
2.0f,
   aBarInfoList[i].maPos.z);
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx 
b/chart2/source/view/inc/GL3DBarChart.hxx
index f50895f..3f8ea1d 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -90,11 +90,11 @@ private:
 void updateDataUpdateFPS();
 DECL_LINK(updateTimer, void*);
 int calcTimeInterval(TimeValue startTime, TimeValue endTime);
-void addScreenTextShape(OUString nStr, glm::vec2 rLeftTop, float 
nTextHeight, glm::vec3 rPos = glm::vec3(0.0f, 0.0f, 0.0f), sal_uInt32 nEvent = 
0);
+void addScreenTextShape(OUString nStr,

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

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43983f88763c2b1cf25d5360be6aabfe3c003422
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Aug 13 07:46:02 2014 +0300

WaE: 'bIsSdtEndBefore' may be used uninitialized in this function

Change-Id: I8b906d495ccbb463dc91a21b03b05a40a0acdbf4

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index feb11e0..9f203a9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4413,7 +4413,7 @@ void  
DomainMapper_Impl::ImportGraphic(writerfilter::Reference Properties ::Po
 {
 if(aCharGrabBag[j].Name == SdtEndBefore)
 {
-bool bIsSdtEndBefore;
+bool bIsSdtEndBefore = false;
 aCharGrabBag[j].Value = bIsSdtEndBefore;
 if (bIsSdtEndBefore)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Best Email Scanner app for mobile and tablet

2014-08-12 Thread Email Scanner

I have published an android Email Scanner app for email hunter, completely free here:  Amazon store:  Amazon Email Scanner appSamsung store: Samsung Email Scanner appPlease rock!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-qa] Reminder: QA Meeting tomorrow!

2014-08-12 Thread Robinson Tryon

Agenda and more details here:
https://wiki.documentfoundation.org/QA/Meetings/2014/August_13

I'll see you there!

Best,
--R


-- 
Robinson Tryon
QA Engineer - The Document Foundation
Volunteer Coordinator - LibreOffice Community Outreach
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 82492] New: DOCX: Corruption: File conatining a Shape followed by an SDT gets corrupt

https://bugs.freedesktop.org/show_bug.cgi?id=82492

  Priority: medium
Bug ID: 82492
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: DOCX: Corruption: File conatining a Shape followed by
an SDT gets corrupt
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: pallavi.jad...@synerzip.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.4.0.0.alpha0+ Master
 Component: Writer
   Product: LibreOffice

Created attachment 104466
  -- https://bugs.freedesktop.org/attachment.cgi?id=104466action=edit
Shape followed by SDT

Steps to reproduce :
1] Open attached file in LO
2] Perform save_as to DOCX
3] Open saved file in MS Office-2010

Current behavior :
File gets corrupt after Roundtrip.

Expected behavior :
File should get open on MS Office-2010 without corruption.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 82492] DOCX: Corruption: File conatining a Shape followed by an SDT gets corrupt

https://bugs.freedesktop.org/show_bug.cgi?id=82492

pallavi.jad...@synerzip.com changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |pallavi.jad...@synerzip.com
   |desktop.org |

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 82493] New: Excel 2003 XML files cannot be opened anymore

https://bugs.freedesktop.org/show_bug.cgi?id=82493

  Priority: medium
Bug ID: 82493
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Excel 2003 XML files cannot be opened anymore
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: antic...@mobilmir.ru
  Hardware: x86 (IA32)
Status: UNCONFIRMED
   Version: 4.3.0.4 release
 Component: filters and storage
   Product: LibreOffice

Created attachment 104468
  -- https://bugs.freedesktop.org/attachment.cgi?id=104468action=edit
Excel 2003 XML file from bank, cannot be opened in 4.3.0.4, can be in 4.1.6

In previous versions (4.1.6 works for sure), I've been able to open Office 2003
files, received from my bank.

Though I had to convert its encoding (originally they are in cp1251, and LO4.x
only supported UTF-8), I've done that with special script, and it didn't take
much time.

But with 4.3.0.4 that's not the case, LO simply refuses to recognize that
format, and opens it as plaintext, or in plaintext parse mode if I open it as a
sheet.

Example XMLs attached.

It's getting worse and worse, as with 3.x I was able to open this files as
received, without conveting encoding. Now I can't open them at all, and have to
fall back to 4.1 (4.2 seems too buggy for me).

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 82405] FILEOPEN: PPTX chart trimmed on both sides

https://bugs.freedesktop.org/show_bug.cgi?id=82405

Owen Genat owen.ge...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #5 from Owen Genat owen.ge...@gmail.com ---
As per comment 3 and comment 4, confirmed. Status set to NEW.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 82493] Excel 2003 XML files cannot be opened anymore

https://bugs.freedesktop.org/show_bug.cgi?id=82493

Maxim Monastirsky momonas...@gmail.com changed:

   What|Removed |Added

 CC||momonas...@gmail.com

--- Comment #1 from Maxim Monastirsky momonas...@gmail.com ---
Hi Anton,

(In reply to comment #0)
 Though I had to convert its encoding (originally they are in cp1251, and
 LO4.x only supported UTF-8), I've done that with special script, and it
 didn't take much time.
It's fixed for the upcoming 4.3.1 release, see Bug 63756.

 But with 4.3.0.4 that's not the case, LO simply refuses to recognize that
 format, and opens it as plaintext, or in plaintext parse mode if I open it
 as a sheet.
Can't reproduce. Tested under Windows 7 and Fedora 20.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 82465] Permanent crashes in writer with images

https://bugs.freedesktop.org/show_bug.cgi?id=82465

--- Comment #6 from thorsten.bran...@brace.de ---
@V Stuart Foote

thank you. It was a migration (in fact multiple migrations over the time).

1) will try

2) unfortunately the local disk space here is only for the operating system,
all data is (and has to be) on the network. It is a 1GB network and usually I
get around 35 Mbyte/s transfer, which should be sufficient.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 81853] Allow User to Store Settings to Override Copy/Paste to Only Copy/Paste Specific Things (such as formulas, values, etc...)

https://bugs.freedesktop.org/show_bug.cgi?id=81853

Chris Wilson ch...@chris-wilson.co.uk changed:

   What|Removed |Added

 CC||ming@intel.com

--- Comment #2 from Chris Wilson ch...@chris-wilson.co.uk ---
*** Bug 81898 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 81970] Crash when closing preview mode on doc with comments