[PATCH] Separate template region ids from thumbnail ids.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3075
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/3075/1
Separate template region ids from thumbnail ids.
- Update all actions to use the new system.
Change-Id: I22da25a4bbba4604f5df42f440e6532076d39457
---
M sfx2/inc/sfx2/templatecontaineritem.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/doc/templatedlg.cxx
7 files changed, 90 insertions(+), 55 deletions(-)
diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx
b/sfx2/inc/sfx2/templatecontaineritem.hxx
index 4768604..527571c 100644
--- a/sfx2/inc/sfx2/templatecontaineritem.hxx
+++ b/sfx2/inc/sfx2/templatecontaineritem.hxx
@@ -17,6 +17,7 @@
{
public:
+sal_uInt16 mnRegionId;
BitmapEx maPreview2;
BitmapEx maPreview3;
BitmapEx maPreview4;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index 7ea226c..da51114 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -42,6 +42,8 @@
virtual void showRegion (ThumbnailViewItem *pItem);
+sal_uInt16 getCurRegionItemId () const;
+
sal_uInt16 getRegionId (size_t pos) const;
std::vectorOUString getFolderNames ();
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 8d7f46a..467ac74 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -192,6 +192,8 @@
sal_uInt16 GetItemId( const Point rPos ) const;
+sal_uInt16 getNextItemId () const;
+
long GetItemWidth() const { return mnItemWidth; }
long GetItemHeight() const { return mnItemHeight; }
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index baa72ee..eb725ba 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -375,7 +375,7 @@
{
// Fill templates
-mnCurRegionId = pContainerItem-mnId-1;
+mnCurRegionId = pContainerItem-mnRegionId+1;
maCurRegionName = pContainerItem-maTitle;
maFTName.SetText(maCurRegionName);
showRegion(pItem);
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index ddab413..dd99ceb 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -61,6 +61,7 @@
TemplateContainerItem* pItem = new TemplateContainerItem( *this );
pItem-mnId = i+1;
+pItem-mnRegionId = i;
pItem-maTitle = aRegionName;
pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
@@ -100,11 +101,11 @@
// Check if we are currently browsing a region or root folder
if (mnCurRegionId)
{
-sal_uInt16 nItemId = mnCurRegionId + 1;
+sal_uInt16 nRegionId = mnCurRegionId - 1; //Is offset by 1
for (size_t i = 0; i maRegions.size(); ++i)
{
-if (maRegions[i]-mnId == nItemId)
+if (maRegions[i]-mnRegionId == nRegionId)
{
showRegion(maRegions[i]);
break;
@@ -128,6 +129,7 @@
TemplateContainerItem *pCur = maRegions[i];
TemplateContainerItem *pItem = new TemplateContainerItem(*this);
pItem-mnId = pCur-mnId;
+pItem-mnRegionId = pCur-mnRegionId;
pItem-maTitle = pCur-maTitle;
pItem-maTemplates = pCur-maTemplates;
pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
@@ -147,7 +149,7 @@
{
mnHeaderHeight = maAllButton.GetSizePixel().getHeight() +
maAllButton.GetPosPixel().Y() * 2;
-mnCurRegionId = pItem-mnId-1;
+mnCurRegionId = static_castTemplateContainerItem*(pItem)-mnRegionId+1;
maCurRegionName = pItem-maTitle;
maAllButton.Show(true);
maFTName.Show(true);
@@ -155,6 +157,17 @@
insertItems(reinterpret_castTemplateContainerItem*(pItem)-maTemplates);
maOpenRegionHdl.Call(NULL);
+}
+
+sal_uInt16 TemplateLocalView::getCurRegionItemId() const
+{
+for (size_t i = 0; i maRegions.size(); ++i)
+{
+if (maRegions[i]-mnRegionId == mnCurRegionId-1)
+return maRegions[i]-mnId;
+}
+
+return 0;
}
sal_uInt16 TemplateLocalView::getRegionId(size_t pos) const
@@ -197,6 +210,7 @@
sal_uInt16 TemplateLocalView::createRegion(const OUString rName)
{
sal_uInt16 nRegionId = mpDocTemplates-GetRegionCount();// Next
regionId
+sal_uInt16 nItemId = getNextItemId();
if (!mpDocTemplates-InsertDir(rName,nRegionId))
return false;
@@ -205,14 +219,16 @@
// Insert to the region cache list and to the thumbnail item list
TemplateContainerItem* pItem = new TemplateContainerItem( *this );
-
[PATCH] Fix deleting templates through Template Manager.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3076
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3076/1
Fix deleting templates through Template Manager.
Change-Id: Ic59d3d666ae5f3808ef7dd7324589a731a841186
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index c537321..1cea676d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1088,29 +1088,18 @@
else
{
sal_uInt16 nRegionItemId = maView-getCurRegionItemId();
+std::setconst ThumbnailViewItem*,selection_cmp_fn aSelTemplates =
maSelTemplates; //Avoid invalid iterators
std::setconst ThumbnailViewItem*,selection_cmp_fn::const_iterator
pIter;
-for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
+for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end();
++pIter)
{
-if (maView-removeTemplate((*pIter)-mnId,nRegionItemId))
-maSelTemplates.erase(pIter++);
-else
+if (!maView-removeTemplate((*pIter)-mnId,nRegionItemId))
{
if (aTemplateList.isEmpty())
aTemplateList = (*pIter)-maTitle;
else
aTemplateList = aTemplateList + \n + (*pIter)-maTitle;
-
-++pIter;
}
-}
-
-if (maSelTemplates.empty())
-{
-mpTemplateBar-SetItemDown(TBI_TEMPLATE_DELETE,false);
-mpTemplateBar-Show(false);
-mpViewBar-Show();
-mpActionBar-Show();
}
}
--
To view, visit https://gerrit.libreoffice.org/3076
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic59d3d666ae5f3808ef7dd7324589a731a841186
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix exporting selected search results in Template Manager.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3078
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3078/1
Fix exporting selected search results in Template Manager.
Change-Id: I0716b3f2833bdcc78a67f1b0874b92a59df705f7
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index cd4b999..7e6525a 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -900,7 +900,7 @@
OUString aPath = aPathObj.GetMainURL( INetURLObject::NO_DECODE
);
-if
(!maView-exportTo(pItem-mnDocId,pItem-mnRegionId+1,aPath))
+if
(!maView-exportTo(pItem-mnAssocId,pItem-mnRegionId,aPath))
{
if (aTemplateList.isEmpty())
aTemplateList = pItem-maTitle;
--
To view, visit https://gerrit.libreoffice.org/3078
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0716b3f2833bdcc78a67f1b0874b92a59df705f7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Delete the correct template from the selected search results...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3077
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3077/1
Delete the correct template from the selected search results.
Change-Id: I2fe82b20e9b4a78a3e8e587a5720054f845d
---
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templatesearchview.cxx
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/inc/templatesearchview.hxx
M sfx2/source/inc/templatesearchviewitem.hxx
6 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index da51114..17eb140 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -46,6 +46,8 @@
sal_uInt16 getRegionId (size_t pos) const;
+OUString getRegionName(const sal_uInt16 nRegionId) const;
+
std::vectorOUString getFolderNames ();
std::vectorTemplateItemProperties
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index dd99ceb..c6dd5b5 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -177,6 +177,11 @@
return maRegions[pos]-mnId;
}
+OUString TemplateLocalView::getRegionName(const sal_uInt16 nRegionId) const
+{
+return mpDocTemplates-GetRegionName(nRegionId);
+}
+
std::vectorOUString TemplateLocalView::getFolderNames()
{
size_t n = maRegions.size();
@@ -193,9 +198,9 @@
{
std::vectorTemplateItemProperties aItems;
-for (size_t i = 0; i maRegions.size(); ++i)
+if (mnCurRegionId)
{
-TemplateContainerItem *pFolderItem =
static_castTemplateContainerItem*(maRegions[i]);
+TemplateContainerItem *pFolderItem = maRegions[mnCurRegionId-1];
for (size_t j = 0; j pFolderItem-maTemplates.size(); ++j)
{
@@ -203,6 +208,19 @@
aItems.push_back(pFolderItem-maTemplates[j]);
}
}
+else
+{
+for (size_t i = 0; i maRegions.size(); ++i)
+{
+TemplateContainerItem *pFolderItem = maRegions[i];
+
+for (size_t j = 0; j pFolderItem-maTemplates.size(); ++j)
+{
+if (rFunc(pFolderItem-maTemplates[j]))
+aItems.push_back(pFolderItem-maTemplates[j]);
+}
+}
+}
return aItems;
}
diff --git a/sfx2/source/control/templatesearchview.cxx
b/sfx2/source/control/templatesearchview.cxx
index 775abbc..eaec8dc 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -20,14 +20,15 @@
{
}
-void TemplateSearchView::AppendItem(sal_uInt16 nItemId, sal_uInt16 nRegionId,
sal_uInt16 nIdx,
+void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16
nRegionId, sal_uInt16 nIdx,
const OUString rTitle, const OUString
rSubtitle,
const OUString rPath,
const BitmapEx rImage)
{
TemplateSearchViewItem *pItem = new TemplateSearchViewItem(*this);
-pItem-mnId = nItemId;
-pItem-mnIdx = nIdx;
+pItem-mnId = getNextItemId();
+pItem-mnAssocId = nAssocItemId;
+pItem-mnDocId = nIdx;
pItem-mnRegionId = nRegionId;
pItem-maPreview1 = rImage;
pItem-maTitle = rTitle;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 1cea676d..cd4b999 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -653,56 +653,47 @@
IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
{
-// if the search view is hidden, hide the folder view and display search
one
-if (!mpCurView-isNonRootRegionVisible() !mpSearchView-IsVisible())
-{
-mpSearchView-Clear();
-mpSearchView-Show();
-mpCurView-Hide();
-}
-
OUString aKeyword = mpSearchEdit-GetText();
if (!aKeyword.isEmpty())
{
-if (mpCurView-isNonRootRegionVisible())
+mpSearchView-Clear();
+
+// if the search view is hidden, hide the folder view and display
search one
+if (!mpSearchView-IsVisible())
{
-mpCurView-filterItems(ViewFilter_Keyword(aKeyword));
+mpSearchView-Show();
+mpCurView-Hide();
}
-else
+
+bool bDisplayFolder = !mpCurView-isNonRootRegionVisible();
+
+std::vectorTemplateItemProperties aItems =
+maView-getFilteredItems(SearchView_Keyword(aKeyword));
+
+for (size_t i = 0; i aItems.size(); ++i)
{
-mpSearchView-Clear();
+TemplateItemProperties *pItem = aItems[i];
-std::vectorTemplateItemProperties aItems =
-maView-getFilteredItems(SearchView_Keyword(aKeyword));
+OUString aFolderName;
-size_t nCounter
[PATCH] Fix moving selected search results in Template Manager.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3079
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3079/1
Fix moving selected search results in Template Manager.
Change-Id: I51ae74f91845255dc1f332e33c8e708e5af1ead0
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7e6525a..2f86818 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1441,7 +1441,7 @@
const TemplateSearchViewItem *pItem =
static_castconst TemplateSearchViewItem*(*aIter);
-if(!maView-moveTemplate(pItem,pItem-mnRegionId+1,nItemId))
+if(!maView-moveTemplate(pItem,pItem-mnRegionId,nItemId))
{
if (aTemplateList.isEmpty())
aTemplateList = (*aIter)-maTitle;
--
To view, visit https://gerrit.libreoffice.org/3079
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51ae74f91845255dc1f332e33c8e708e5af1ead0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - cppunit/ExternalPackage_cppunit.mk icu/ExternalProject_icu.mk
cppunit/ExternalPackage_cppunit.mk |2 +- icu/ExternalProject_icu.mk |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 92b963ef5f7aa8f1bbacd1803f6e066bf1394b8d Author: David Tardon dtar...@redhat.com Date: Fri Mar 15 16:04:29 2013 +0100 @touch does not exist Change-Id: Ic81a31d738bedcd6a35eb42d365dacc2af7ebe93 diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index 7525080..aea42c0 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : --enable-layout --disable-static --enable-shared --disable-samples \ $(MAKE) \ for lib in icudata icuin icuuc icule icutu; do \ - @touch $$lib; \ + touch $$lib; \ done \ ,source) endif commit 02bb492622ddba085481426a52d0c273381d7404 Author: David Tardon dtar...@redhat.com Date: Fri Mar 15 16:03:54 2013 +0100 add missing \ Change-Id: I9df137849a628089eb03b714d5f61e8d4084be17 diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index 610b510..7525080 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : LIBS=$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP)) \ LDFLAGS=-L$(COMPATH)/lib -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc) \ - ./configure + ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ --enable-layout --disable-static --enable-shared --disable-samples \ commit 930fe0581794e2ae6aaa62c2c716ed655a0f2885 Author: David Tardon dtar...@redhat.com Date: Fri Mar 15 15:11:48 2013 +0100 fix library name Change-Id: I70dd4c9a54af8b6eeeaa6b075c5e54e296c670f1 diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk index d5f3f53..6ebe243 100644 --- a/cppunit/ExternalPackage_cppunit.mk +++ b/cppunit/ExternalPackage_cppunit.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppun $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe)) else $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dll.a,src/cppunit/.libs/libcppunit.dll.a)) $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe)) endif else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/window/salframe.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 5da2b4b903308fe1cf18f2feae20e602d744fe9f Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 08:38:16 2013 +0200 Need vcl/syswin.hxx for WINDOWSTATE_* Change-Id: Ic4f729554d92652f38d783bb237448e8469e6faf diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index a0038f1..854b88c 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -27,6 +27,7 @@ #include vcl/svapp.hxx #include vcl/window.hxx #include vcl/timer.hxx +#include vcl/syswin.hxx #include aqua/saldata.hxx #include aqua/salgdi.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/Library_postgresql-sdbc-impl.mk
connectivity/Library_postgresql-sdbc-impl.mk | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) New commits: commit 3e786028a31565a05a09b3cc36233f50688c7f8a Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Mar 27 07:33:54 2013 +0100 postgresql-sdbc-impl: does not need these externals for MSVC Hopefully.. blind fix for the build. Change-Id: I3c59ceba4eee9eb9950332433045dcb6337bef49 diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index d733f01..0a0e893 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -60,11 +60,13 @@ endif $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ - openssl \ - openldap \ - nss3 \ - plc4 \ - ssl3 \ + $(if $(filter-out MSC,$(COM)), \ + openssl \ + openldap \ + nss3 \ + plc4 \ + ssl3 \ + ) \ )) ifneq ($(SYSTEM_POSTGRESQL),YES) ___ 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/ui/app/appopt.cxx |6 ++---
sw/source/ui/app/swmodul1.cxx| 10 -
sw/source/ui/docvw/edtwin3.cxx |4 +--
sw/source/ui/inc/view.hxx| 16 +++---
sw/source/ui/misc/pggrid.cxx |8 +++
sw/source/ui/ribbar/inputwin.cxx |8 +++
sw/source/ui/uiview/view.cxx | 10 -
sw/source/ui/uiview/view0.cxx|2 -
sw/source/ui/uiview/viewfunc.hxx |4 +--
sw/source/ui/uiview/viewmdi.cxx | 10 -
sw/source/ui/uiview/viewport.cxx | 42 +++
sw/source/ui/uno/unomod.cxx |6 ++---
12 files changed, 63 insertions(+), 63 deletions(-)
New commits:
commit 95c586d5c034115fd252c5fb0e4637bf9dc68a4d
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 08:56:50 2013 +0200
Change the German Lineal to Ruler in identifiers
Change-Id: I69f80a3a889b2bae148ac502d472d490c71ecb49
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index d6dbd72..dc1f422 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -177,12 +177,12 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
FieldUnit eUnit = pPref-GetHScrollMetric();
if(pAppView)
-pAppView-GetHLinealMetric(eUnit);
+pAppView-GetHRulerMetric(eUnit);
pRet-Put(SfxUInt16Item( FN_HSCROLL_METRIC, static_cast sal_uInt16
(eUnit)));
eUnit = pPref-GetVScrollMetric();
if(pAppView)
-pAppView-GetVLinealMetric(eUnit);
+pAppView-GetVRulerMetric(eUnit);
pRet-Put(SfxUInt16Item( FN_VSCROLL_METRIC, static_cast sal_uInt16
(eUnit) ));
pRet-Put(SfxUInt16Item( SID_ATTR_METRIC, static_cast sal_uInt16
(pPref-GetMetric()) ));
pRet-Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, pPref-IsApplyCharUnit()));
@@ -322,7 +322,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const
SfxItemSet rSet )
FieldUnit eUnit = (FieldUnit)pMetricItem-GetValue();
pPref-SetVScrollMetric(eUnit);
if(pAppView)
-pAppView-ChangeVLinealMetric(eUnit);
+pAppView-ChangeVRulerMetric(eUnit);
}
if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False,
pItem ) )
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 024aafd..eb485a6 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -96,9 +96,9 @@ static void lcl_SetUIPrefs(const SwViewOption rPref, SwView*
pView, ViewShell*
// Rulers on / off
if(pNewPref-IsViewVRuler())
-pView-CreateVLineal();
+pView-CreateVRuler();
else
-pView-KillVLineal();
+pView-KillVRuler();
// TabWindow on / off
if(pNewPref-IsViewHRuler())
@@ -236,7 +236,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool
bWeb )
{
if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView)))
{
-pTmpView-ChangeVLinealMetric(eVScrollMetric);
+pTmpView-ChangeVRulerMetric(eVScrollMetric);
pTmpView-ChangeTabMetric(eHScrollMetric);
}
@@ -273,7 +273,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric,
sal_Bool bHorizontal, sal_Bo
if( bHorizontal )
pTmpView-ChangeTabMetric(eMetric);
else
-pTmpView-ChangeVLinealMetric(eMetric);
+pTmpView-ChangeVRulerMetric(eMetric);
}
pTmpView = SwModule::GetNextView(pTmpView);
}
@@ -331,7 +331,7 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar,
sal_Bool bWeb)
{
if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView)))
{
-pTmpView-ChangeVLinealMetric(eVScrollMetric);
+pTmpView-ChangeVRulerMetric(eVScrollMetric);
pTmpView-ChangeTabMetric(eHScrollMetric);
}
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index ca77b50..542201c 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -87,7 +87,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
// Notify for page number update
sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent rMEvt, sal_Bool
bVerticalMode)
{
-SvxRuler rRuler = bVerticalMode ? m_rView.GetVLineal() :
m_rView.GetHLineal();
+SvxRuler rRuler = bVerticalMode ? m_rView.GetVRuler() :
m_rView.GetHRuler();
return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER )
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1)
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2));
@@ -99,7 +99,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent rMEvt,
sal_Bool bVertical
sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent rMEvt,
const bool bVerticalMode )
{
-SvxRuler rRuler = bVerticalMode ? m_rView.GetVLineal() :
m_rView.GetHLineal();
+SvxRuler rRuler = bVerticalMode ? m_rView.GetVRuler() :
m_rView.GetHRuler();
return
Re: Module build broken on master.
On Tue, Mar 26, 2013 at 05:07:15PM -0400, Kohei Yoshida wrote: On 03/26/2013 04:52 PM, Kohei Yoshida wrote: Any ideas? So, reverting this commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=207e370a167b7856346c1bff0c735cd2688e2e6e fixes this. Since keeping the module build working is quite important, I'll have to revert this for now. Peter, could you take a second look at this, and hopefully come up with a change that doesn't break module build? seems like lastword - firstword causes the trouble. Any reason for that? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/model.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 7cab4ce3ba74b73b129d9932d58be7006afdac2f Author: Miklos Vajna vmik...@suse.cz Date: Wed Mar 27 09:38:41 2013 +0100 ooxml tokenizer: CT_TblLayout - CT_TblLayoutType That's how it's called in the spec's W3C XML Schema. Change-Id: I6fc6452af493e61c302948a617d427c118ada0b2 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 60c4c57..8bfce16 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17893,7 +17893,7 @@ /choice /list /define - define name=CT_TblLayout + define name=CT_TblLayoutType attribute name=type ref name=ST_TblLayout/ xs:documentationTable Layout Setting/xs:documentation @@ -18095,7 +18095,7 @@ /optional optional element name=tblLayout -ref name=CT_TblLayout/ +ref name=CT_TblLayoutType/ /element /optional optional @@ -18150,7 +18150,7 @@ /optional optional element name=tblLayout -ref name=CT_TblLayout/ +ref name=CT_TblLayoutType/ /element /optional optional @@ -22942,8 +22942,8 @@ value tokenid=ooxml:Value_wordprocessingml_ST_TblLayout_fixedfixed/value value tokenid=ooxml:Value_wordprocessingml_ST_TblLayout_autofitautofit/value /resource -resource name=CT_TblLayout resource=Value tag=table - attribute name=type tokenid=ooxml:CT_TblLayout_type action=setValue/ +resource name=CT_TblLayoutType resource=Value tag=table + attribute name=type tokenid=ooxml:CT_TblLayoutType_type action=setValue/ /resource resource name=ST_TblOverlap resource=List value tokenid=ooxml:Value_ST_TblOverlap_nevernever/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/nsplugin/source/nsp_func.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d84142a4a44e522d1d23adcf0577d5bb567eab70
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 27 09:51:51 2013 +0100
Prevent duplicate definitions
Change-Id: I4cbc231bdac93ed3dca3fb6140c5c85e9eb4339d
diff --git a/extensions/source/nsplugin/source/nsp_func.hxx
b/extensions/source/nsplugin/source/nsp_func.hxx
index 047a1ec..1e99bbb 100644
--- a/extensions/source/nsplugin/source/nsp_func.hxx
+++ b/extensions/source/nsplugin/source/nsp_func.hxx
@@ -76,7 +76,7 @@ typedef int NSP_PIPE_FD;
//for pipe()
typedef HANDLE NSP_PIPE_FD;
-SECURITY_ATTRIBUTES NSP_pipe_access = { sizeof(SECURITY_ATTRIBUTES), NULL,
TRUE};
+static SECURITY_ATTRIBUTES NSP_pipe_access = { sizeof(SECURITY_ATTRIBUTES),
NULL, TRUE};
#define NSP_Inherited_Pipe(fd) (!CreatePipe(fd[0], fd[1], NSP_pipe_access,
1024*10))
#define NSP_Close_Pipe(fp)CloseHandle(fp)
//for write(), read()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/TexEdit.xcu| 30 filter/source/config/fragments/filters/WriterPlus.xcu | 32 -- 2 files changed, 1 insertion(+), 61 deletions(-) New commits: commit 3a550b773d1bc292759532833a807d5fc98b7549 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 27 10:08:08 2013 +0100 Fixing a mistake from yesterday Change-Id: I923bb9ef647034254702003c89062c8f9e5a71fa diff --git a/filter/source/config/fragments/filters/TexEdit.xcu b/filter/source/config/fragments/filters/TexEdit.xcu index d505f85..36b353d 100644 --- a/filter/source/config/fragments/filters/TexEdit.xcu +++ b/filter/source/config/fragments/filters/TexEdit.xcu @@ -21,36 +21,6 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=x-defaultTexEdit v2 Document/value -/prop -prop oor:name=FileFormatVersionvalue0/value/prop -prop oor:name=Typevaluewriter_TexEdit/value/prop -prop oor:name=TemplateName/ -prop oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop -/node -!-- - * 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 . --- -node oor:name=TexEdit oor:op=replace -prop oor:name=FlagsvalueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value/prop -prop oor:name=UIComponent/ -prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop -prop oor:name=UserDatavalue/value/prop -prop oor:name=UIName value xml:lang=x-defaultTex-Edit v2 Document/value /prop prop oor:name=FileFormatVersionvalue0/value/prop diff --git a/filter/source/config/fragments/filters/WriterPlus.xcu b/filter/source/config/fragments/filters/WriterPlus.xcu index fbf016f..db17c2a 100644 --- a/filter/source/config/fragments/filters/WriterPlus.xcu +++ b/filter/source/config/fragments/filters/WriterPlus.xcu @@ -21,40 +21,10 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=x-defaultWriterPlus/value +value xml:lang=x-defaultWriterPlus Document/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluewriter_WriterPlus/value/prop prop oor:name=TemplateName/ prop oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop /node -!-- - * 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 . --- -node oor:name=WritePlus oor:op=replace -prop oor:name=FlagsvalueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value/prop -prop oor:name=UIComponent/ -prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop -prop oor:name=UserDatavalue/value/prop -prop oor:name=UIName -value xml:lang=x-defaultWriter Plus Document/value -/prop -prop oor:name=FileFormatVersionvalue0/value/prop -prop oor:name=Typevaluewriter_WritePlus/value/prop -prop oor:name=TemplateName/ -prop oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop -/node ___ Libreoffice-commits mailing
[Libreoffice-commits] core.git: sal/android
sal/android/lo-bootstrap.c |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 50bab8605e8288f9dcca013a625cb0e5715e76f6
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 27 10:21:38 2013 +0100
-Werror=unused-macros
Change-Id: I3c64ed78577988767a7da859e68a7f63f890f7dc
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 99da6ab..27738dd 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -54,14 +54,9 @@
#include osl/detail/android-bootstrap.h
#undef LOGI
-#undef LOGW
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, lo-bootstrap,
__VA_ARGS__))
-#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, lo-bootstrap,
__VA_ARGS__))
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR,
lo-bootstrap, __VA_ARGS__))
-#define LOGF(...) ((void)__android_log_print(ANDROID_LOG_FATAL,
lo-bootstrap, __VA_ARGS__))
-
-#define ROUND_DOWN(ptr,multiple) (void *)(((unsigned) (ptr)) ~((multiple)-1))
#define MAX(a,b) ((a) (b) ? (a) : (b))
@@ -80,8 +75,6 @@ static JavaVM *the_java_vm;
/* compression methods */
#define STORE0
-#define DEFLATE 8
-#define LZMA14
struct local_file_header {
uint32_t signature;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
rsc/source/tools/rsctools.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 49a89c84dbf2b74d9e3693f8df8362468d42276b
Author: Andras Timar ati...@suse.com
Date: Wed Mar 27 02:23:38 2013 -0700
stop uninitialized memory leaking into resource files.
Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 136019e..d760634 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -268,7 +268,10 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
{
if( !pMem )
+{
pMem = (char *)rtl_allocateMemory( nLen );
+memset( pMem, 0, nLen );
+}
return( pMem + nSize );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/pyweb-wizard'
New branch 'feature/pyweb-wizard' available with the following commits: commit e408b18432008e10412ba0f3a0d5d2bcc34913bf Author: Javier Fernandez jfernan...@igalia.com Date: Fri Mar 8 12:56:16 2013 + Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b commit 2202afcefe61c3624f906fc768d60f84aca36947 Author: Javier Fernandez jfernan...@igalia.com Date: Wed Mar 6 10:04:59 2013 + Pack and register the Web wizard. Change-Id: I8e43d228e842f24b054afc6bf59040667a6703d5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] stop uninitialized memory leaking into resource files.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3080
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3080/1
stop uninitialized memory leaking into resource files.
Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042
---
M rsc/source/tools/rsctools.cxx
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 02507cc..a9dfb1b 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -377,7 +377,10 @@
char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
{
if( !pMem )
+{
pMem = (char *)rtl_allocateMemory( nLen );
+memset( pMem, 0, nLen );
+}
return( pMem + nSize );
}
--
To view, visit https://gerrit.libreoffice.org/3080
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bug 42796 - Macro assigned to dataform Before Unload or While Unloading events are not called when form container is closed
Hi All I've fallen foul of this bug in recent days so have decided to have a look at it to see if I can provide a patch. It's been around since November 2011 so possibly no one's looked at it recently. In the bug report it was confirmed that a macro assigned to either the Before Unloading or When Unloading events of a dataform are not called when the form document is closed. However, when editing a form and the Design Mode option is toggled the events are called. Also the events when the form is loaded are called under all circumstances. So hopefully here should be enough clues there to provide a solution. As I haven't provided a patch for a couple of year might take me some time to get back into the swing of things. If anyone has any suggestions as to where to look fist it would be gratefully appreciated. Posted this to the bug report and the mailing list Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - rsc/source
rsc/source/tools/rsctools.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit e0b71d9c2bede069fa8757c40b782784d93a4bb1
Author: Andras Timar ati...@suse.com
Date: Wed Mar 27 02:23:38 2013 -0700
stop uninitialized memory leaking into resource files.
Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042
Reviewed-on: https://gerrit.libreoffice.org/3080
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 02507cc..a9dfb1b 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -377,7 +377,10 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
char * RscWriteRc :: GetPointer( sal_uInt32 nSize )
{
if( !pMem )
+{
pMem = (char *)rtl_allocateMemory( nLen );
+memset( pMem, 0, nLen );
+}
return( pMem + nSize );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] stop uninitialized memory leaking into resource files.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3080 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3080 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - config_host/config_features.h.in config_host/README configure.ac desktop/source framework/source sc/source sfx2/inc sfx2/source solenv/gbuild sw/source vcl/
config_host/README |1
config_host/config_features.h.in| 47
configure.ac|4 +
desktop/source/app/app.cxx |8 ++-
desktop/source/app/cmdlineargs.cxx |4 +
desktop/source/app/officeipcthread.cxx | 11 ++--
desktop/source/app/userinstall.cxx |4 +
desktop/source/deployment/registry/help/dp_help.cxx |5 +-
framework/source/services/autorecovery.cxx |3 -
sc/source/ui/docshell/docsh.cxx |8 ++-
sc/source/ui/docshell/docsh4.cxx| 10 ++--
sc/source/ui/unoobj/confuno.cxx |6 +-
sc/source/ui/view/viewfunc.cxx |4 +
sfx2/inc/sfx2/objsh.hxx |4 +
sfx2/source/doc/docfile.cxx | 10 ++--
sfx2/source/doc/objmisc.cxx |3 -
sfx2/source/doc/objstor.cxx |4 +
sfx2/source/doc/objxtor.cxx |3 -
sfx2/source/doc/sfxbasemodel.cxx|4 +
sfx2/source/view/viewfrm.cxx|5 +-
solenv/gbuild/Helper.mk |4 -
solenv/gbuild/gbuild.mk |3 -
sw/source/ui/uiview/viewport.cxx|5 +-
vcl/source/app/dbggui.cxx |3 -
vcl/source/filter/graphicfilter.cxx |2
vcl/source/gdi/pdfwriter_impl.cxx |2
vcl/source/window/window.cxx|4 +
27 files changed, 125 insertions(+), 46 deletions(-)
New commits:
commit 79863bd45491bc258131019050e15a209a0352f8
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 11:55:58 2013 +0200
WaE: macro is not used
Change-Id: I1a063d7ffa1ab051fe4c3d57f4c8c33d4cd3fe87
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index dddc3a5..2070b76 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -64,8 +64,10 @@
#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF
+#ifndef DISABLE_DYNLOADING
#define IMPORT_FUNCTION_NAMEGraphicImport
#define EXPORT_FUNCTION_NAMEGraphicExport
+#endif
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index d49f5fa..1307193 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -99,7 +99,9 @@ using ::rtl::OUStringBuffer;
#define DEBUG_DISABLE_PDFCOMPRESSION // also do not compress streams
#endif
+#if !defined(ANDROID) !defined(IOS)
#define MAX_SIGNATURE_CONTENT_LENGTH 0x4000
+#endif
#ifdef DO_TEST_PDF
class PDFTestOutputStream : public PDFOutputStream
commit a8c3c673eaec987e9fe47123f60e5f9d34a4e93f
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 11:35:40 2013 +0200
Use config_features.h instead of -DLIBO_FEATURE_*
Change-Id: Idc198beb6d759dbe3bad6ea58d896c1555b4cc0f
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6a3e3de..1f57c2e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include sal/config.h
#include iostream
@@ -1387,7 +1389,7 @@ int Desktop::Main()
CommandLineArgs rCmdLineArgs = GetCommandLineArgs();
-#ifdef LIBO_FEATURE_DESKTOP
+#if HAVE_FEATURE_DESKTOP
OUString aUnknown( rCmdLineArgs.GetUnknown() );
if ( !aUnknown.isEmpty() )
{
@@ -1452,7 +1454,7 @@ int Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, desktop (lo119109) Desktop::Main -
Lockfile );
m_xLockfile.reset(new Lockfile);
-#ifdef LIBO_FEATURE_DESKTOP
+#if HAVE_FEATURE_DESKTOP
if ( !rCmdLineArgs.IsHeadless() !rCmdLineArgs.IsInvisible()
!rCmdLineArgs.IsNoLockcheck() !m_xLockfile-check(
Lockfile_execWarning ))
{
@@ -1539,7 +1541,7 @@ int Desktop::Main()
*/
Application::GetDefaultDevice();
-#ifdef LIBO_FEATURE_DESKTOP
+#ifndef DISABLE_EXTENSIONS
// Check if bundled or shared extensions were added /removed
// and process those extensions (has to be done before checking
// the extension dependencies!
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index b8cf153..aded249 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include cmdlineargs.hxx
#include vcl/svapp.hxx
#include rtl/uri.hxx
@@ -442,7 +444,7 @@ bool CommandLineArgs::InterpretCommandLineParameter( const
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/rtfexport/data/fdo30983.rtf| 43
sw/qa/extras/rtfexport/rtfexport.cxx| 13
sw/source/filter/inc/rtf.hxx|4 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 20 +++--
writerfilter/source/rtftok/rtffly.hxx |4 +-
5 files changed, 78 insertions(+), 6 deletions(-)
New commits:
commit b4845db4260db70cb3aaf03758cb4a1ca5fa88ed
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Mar 27 10:58:53 2013 +0100
fdo#30983 RTF filter: fix handling of RTF_PVPG and RTF_PHPG
There were two issues here:
1) The export filter never exported these keywords.
2) The flymaincnt RTF extension we inherited from OOo actually never
worked (i.e. it's like this since 7b0b5cdf, the initial import...), as
RTFVertOrient / RTFHoriOrient's second parameter was stored in 1 bit, so
text::RelOrientation::PAGE_FRAME (7) was read back as 1 instead.
Note that I want to get rid of this flymaincnt extension in the exporter
anyway soon, so killing the RTFVertOrient / RTFHoriOrient duplication is
pointless: the sw version will go away.
Change-Id: I5335567833ecf87e6b0ba7c73150a7b95c57f237
diff --git a/sw/qa/extras/rtfexport/data/fdo30983.rtf
b/sw/qa/extras/rtfexport/data/fdo30983.rtf
new file mode 100644
index 000..bd4dd96
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo30983.rtf
@@ -0,0 +1,43 @@
+{\rtf1\ansi\deff4\adeflang1025
+\paperh15840\paperw12240\margl902\margr958\margt1440\margb735\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn902\margrsxn958\margtsxn1440\margbsxn735\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\absw2380\absh-1244\pvpg\posy465\phpg\posx8437
+{\*\flymaincnt96\flyvert29040\flyhorz30464\flyanchor4\pgndec}
+\s111\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\loch\f1\rtlch \ltrch\loch\loch\f5
+5983 Red Pine Blvd}
+\par \s111\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+White Bear Township, MN 55110}
+\par \s110\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+Home 651-426-9645}
+\par \s110\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+Cell 651-245-1843}
+\par \s110\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+E-mail dadso...@gmail.com}
+\par \pard
+\pard\plain \s123\sl240\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\li2160\ri0\lin2160\rin0\fi0\sb0\sa440\ltrpar\cf0\expnd-4\expndtw-20\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs48\lang1033\li-11\ri0\lin-11\rin0\fi0\sb0\sa144
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+M}
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+ichael P. Soucheray}
+\par \pard\plain \s114\sl220\slmult0\ql\widctlpar\tx2160\tqr\tx6480
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\li0\ri-360\lin0\rin-360\fi0\sb220\sa40\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs20\lang1033\li-11\ri0\lin-11\rin0\fi0\sb0\sa144
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+Experienced general}
+\par }
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 5294670..fffb959 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -32,6 +32,7 @@
#include com/sun/star/text/XPageCursor.hpp
#include com/sun/star/text/XTextViewCursorSupplier.hpp
#include com/sun/star/view/XViewSettingsSupplier.hpp
+#include com/sun/star/text/RelOrientation.hpp
#include vcl/svapp.hxx
#include swmodeltestbase.hxx
@@ -70,6 +71,7 @@ public:
void testFdo53604();
void testFdo52286();
void testFdo61507();
+void testFdo30983();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -115,6 +117,7 @@ void Test::run()
{fdo53604.odt, Test::testFdo53604},
{fdo52286.odt, Test::testFdo52286},
{fdo61507.rtf, Test::testFdo61507},
+{fdo30983.rtf, Test::testFdo30983},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -482,6 +485,16 @@ void Test::testFdo61507()
CPPUNIT_ASSERT_EQUAL(6, getLength());
}
+void Test::testFdo30983()
+{
+// These were 'page text area', not 'entire page', i.e. both the horizontal
+// and vertical positions
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/alloc_arena.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 7f52bb5ed454c06978220ac0d0631348360b644d Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 11:05:01 2013 +0100 Hopefully _BSD_SOURCE not needed anywhere for MAP_ANON (-Werror=unused-macros on Android) Change-Id: I393face32e7d4782b5c8037fa8ebeb21ec3c6e7a diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index b3f2a7f..d35ba1f 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _BSD_SOURCE 1 /* sys/mman.h: MAP_ANON */ #include alloc_arena.hxx #include alloc_impl.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/all/log.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c2010e77ef70a99e4861192b0cb34de1f6ce61e Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 11:06:28 2013 +0100 -Werror=unused-macros (Android) Change-Id: I7b88ff1a8c53fbb875d5cb84060c726fd7d06c9c diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index ad81c83..6106ac3 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -51,7 +51,7 @@ #if defined WNT #include process.h #define OSL_DETAIL_GETPID _getpid() -#else +#elif !defined ANDROID #include unistd.h #define OSL_DETAIL_GETPID getpid() #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr4.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 00e9accbc591791b6529105807a2944cd92dde78 Author: Petr Kraus petr_kr...@email.cz Date: Tue Mar 26 18:16:44 2013 +0100 fdo#42781 WaE: unreachable code Encapsulate whole switch case code by #if so it does not produce unreachable code when TRUE Also found second occurence in function overload. Change-Id: I2f726b4e9cad56850ce360e48f96f45137befe96 Reviewed-on: https://gerrit.libreoffice.org/3066 Reviewed-by: Christoph Brill egore...@gmail.com Reviewed-by: Tomáš Chvátal tchva...@suse.cz Tested-by: Tomáš Chvátal tchva...@suse.cz diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index bfd9494..a3d77ff 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -543,10 +543,10 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress rPos, const ScBaseCel break; #if OSL_DEBUG_LEVEL 0 case CELLTYPE_DESTROYED: -#endif SetError(errCellNoValue); fValue = 0.0; break; +#endif } return fValue; @@ -610,10 +610,10 @@ double ScInterpreter::GetCellValueOrZero( ScCellIterator rIter ) break; #if OSL_DEBUG_LEVEL 0 case CELLTYPE_DESTROYED: -#endif SetError(errCellNoValue); fValue = 0.0; break; +#endif } return fValue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#42781 WaE: unreachable code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3066 Approvals: Christoph Brill: Looks good to me, but someone else must approve Tomáš Chvátal: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3066 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f726b4e9cad56850ce360e48f96f45137befe96 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Petr Kraus petr_kr...@email.cz Gerrit-Reviewer: Christoph Brill egore...@gmail.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a21266f2233dc2cc6a69eed4afc0baf77c74e52f Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 11:07:58 2013 +0100 Use explicit SHELL=/usr/bin/env bash in Makefile.in after all ...instead of SHELL=@BASH@ from d3f7d05d1b9bb29e168c49bda1e1a28734567993 Clean up OOO_SHELL which could expand to SHELL=/bin/sh which, at least on Mac OS X 10.7 with /usr/bin/make 3.81, could apparently lead to recipe lines calling ooinstall being directly exec'ed from make and failing to find ooinstall in solenv/bin, instead of going via the shell and taking into account PATH from included config_host.mk. Change-Id: I841dc30f72d1d8841c64f48408a669eb6a37a1f3 diff --git a/Makefile.in b/Makefile.in index 79740bb..626c726 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all endif -SHELL=@BASH@ +SHELL=/usr/bin/env bash SRCDIR := @SRC_ROOT@ BUILDDIR := @BUILDDIR@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - jvmfwk/plugins sfx2/source
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |4 ++--
sfx2/source/appl/shutdownicon.cxx |7 ---
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a429142bfb282f7bd8166d4e91052cb5009608bd
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 12:19:16 2013 +0200
WaE: macro RUNNING_ON_VALGRIND is not used
Change-Id: Ie60882c86008506a331087a241f15e931c5eacee
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 9ac4503..27b704d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -57,13 +57,13 @@
#ifdef ANDROID
#include osl/detail/android-bootstrap.h
-#endif
-
+#else
#if defined HAVE_VALGRIND_HEADERS
#include valgrind/valgrind.h
#else
#define RUNNING_ON_VALGRIND 0
#endif
+#endif
#define SUN_MICRO Sun Microsystems Inc.
commit f241e2b0c70dbbbe682cd719e135f5c54b924183
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 12:15:54 2013 +0200
WaE: macro is not used
Change-Id: I5feb344a98465e5bd85e233cb4bb4b34c93344dd
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index c6df67a..59af38e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -115,9 +115,6 @@ extern C {
}
#endif
-#define DOSTRING( x ) #x
-#define STRING( x ) DOSTRING( x )
-
bool ShutdownIcon::LoadModule( osl::Module **pModule,
oslGenericFunction *pInit,
oslGenericFunction *pDeInit )
@@ -147,6 +144,10 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
oslGenericFunction pTmpInit = NULL;
oslGenericFunction pTmpDeInit = NULL;
+
+#define DOSTRING( x ) #x
+#define STRING( x ) DOSTRING( x )
+
if ( pPlugin-loadRelative( thisModule, OUString (STRING( PLUGIN_NAME )
) ) )
{
pTmpInit = pPlugin-getFunctionSymbol(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/signal.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit b8e68951d56cfd01cf63c3ee04b49a862b685bc5
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 27 11:31:12 2013 +0100
-Werror=unused-macros (Android)
Change-Id: Ibd06e49e78a6d6a69521a65b53b056e85b64765b
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index e80a4eb..24c170a 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -21,8 +21,6 @@
/* system headers */
#include system.h
-#define MAX_STACK_FRAMES 256
-
#if defined( MACOSX )
#if defined( INTEL )
@@ -55,6 +53,10 @@
#endif /* defined SOLARIS */
+#if defined INCLUDE_BACKTRACE
+#define MAX_STACK_FRAMES 256
+#endif
+
#include osl/diagnose.h
#include osl/mutex.h
#include osl/signal.h
@@ -409,8 +411,6 @@ static int fputs_xml( const char *string, FILE *stream )
/* Create intermediate files and run crash reporter */
-#define REPORTENV_PARAM -crashreportenv:
-
#if defined SAL_ENABLE_CRASH_REPORT defined INCLUDE_BACKTRACE \
defined LINUX
@@ -496,6 +496,9 @@ dynamic_section_offset(const char *name)
static int ReportCrash( int Signal )
{
#ifdef SAL_ENABLE_CRASH_REPORT
+
+#define REPORTENV_PARAM -crashreportenv:
+
static sal_Bool bCrashReporterExecuted = sal_False;
sal_BoolbAutoCrashReport = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.0.2 RC2 test builds available
Hi *, for the upcoming new version 4.0.2, the RC2 builds now start to be available on pre-releases. This build is slated to be second release candidate build on the way towards 4.0.2, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#4.0.2_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 4.0.2 RC1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-2-release-4.0.2.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/chart/seriesconverter.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c0518f245c02fd9d1d48f56429ebf59ac776c4c6
Author: Muthu Subramanian sumu...@suse.com
Date: Wed Mar 27 16:20:42 2013 +0530
n#734735: [PPTX] Use number format, if available, for charts.
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 3cc38d0..9ef1f3f 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -235,6 +235,9 @@ void DataLabelsConverter::convertFromModel( const
Reference XDataSeries rxDa
for( DataLabelsModel::DataLabelVector::iterator aIt =
mrModel.maPointLabels.begin(), aEnd = mrModel.maPointLabels.end(); aIt != aEnd;
++aIt )
{
(*aIt)-maNumberFormat.maFormatCode =
mrModel.maNumberFormat.maFormatCode;
+if( !mrModel.maNumberFormat.maFormatCode.isEmpty() )
+(*aIt)-maNumberFormat.mbSourceLinked = false;
+
DataLabelConverter aLabelConv( *this, **aIt );
aLabelConv.convertFromModel( rxDataSeries, rTypeGroup );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/drawingml/chart/seriesconverter.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 551377c9637b9dbcfd70ed144043b82c89159e99
Author: Muthu Subramanian sumu...@suse.com
Date: Wed Mar 27 16:20:42 2013 +0530
n#734735: [PPTX] Use number format, if available, for charts.
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 0522376..7f0831a 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -245,6 +245,9 @@ void DataLabelsConverter::convertFromModel( const
Reference XDataSeries rxDa
for( DataLabelsModel::DataLabelVector::iterator aIt =
mrModel.maPointLabels.begin(), aEnd = mrModel.maPointLabels.end(); aIt != aEnd;
++aIt )
{
(*aIt)-maNumberFormat.maFormatCode =
mrModel.maNumberFormat.maFormatCode;
+if( !mrModel.maNumberFormat.maFormatCode.isEmpty() )
+(*aIt)-maNumberFormat.mbSourceLinked = false;
+
DataLabelConverter aLabelConv( *this, **aIt );
aLabelConv.convertFromModel( rxDataSeries, rTypeGroup );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svddrgmt.cxx |3 --- svx/source/svdraw/svdedtv1.cxx |3 --- 2 files changed, 6 deletions(-) New commits: commit f8e1b64c52c26f6026fd13bcbef8e515dcef2015 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 12:41:41 2013 +0200 WaE: macro is not used: _MATH_H weirdness Change-Id: I283767ba44012a740d49f1b8d9d1f6bf80d8b664 diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b618ac1..3dad382 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -20,9 +20,6 @@ #include svddrgm1.hxx #include math.h -#ifndef _MATH_H -#define _MATH_H -#endif #include tools/bigint.hxx #include vcl/svapp.hxx diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index d843567..7e316f7 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -21,9 +21,6 @@ #include svx/svdedtv.hxx #include math.h -#ifndef _MATH_H -#define _MATH_H -#endif #include tools/bigint.hxx #include svl/itemiter.hxx #include vcl/msgbox.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Configuration_filter.mk writerperfect/source
filter/Configuration_filter.mk |1 - writerperfect/source/writer/MWAWImportFilter.cxx |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 5a88a8193a9ff81237c202e647d1c19eb827c0d0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 27 11:43:01 2013 +0100 HanMac J import is really really initial :) Change-Id: I86e450326e5a0ae5499ec2f4ebdc5bcb9ca68390 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 192a68f..f590c0d 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -327,7 +327,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter writer_DocMaker \ writer_eDoc_Document \ writer_FullWrite_Professional \ - writer_HanMac_Word_J \ writer_HanMac_Word_K \ writer_LightWayText \ writer_Mac_Word \ diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 828d468..b00accde 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -941,7 +941,7 @@ throw( com::sun::star::uno::RuntimeException ) sTypeName = writer_HanMac_Word_K; break; case MWAWDocument::HMACJ: // HanMac Word-J ( almost nothing done for J document) -sTypeName = writer_HanMac_Word_J; +// sTypeName = writer_HanMac_Word_J; break; case MWAWDocument::LWTEXT: // LightWayText ( only v4.5 Mac format ) sTypeName = writer_LightWayText; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/osl solenv/bin
sal/osl/unx/file.cxx |4 solenv/bin/concat-deps.c | 38 ++ 2 files changed, 22 insertions(+), 20 deletions(-) New commits: commit b2d2118f76b8bc95dc2aae76b7c3f7a697b0da24 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 11:40:26 2013 +0100 -Werror,-Wunused-macros Change-Id: I3c43fcfe7216a833f1dbe298098b72de52f0f155 diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 5d44f1f..765bacd 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -14,26 +14,26 @@ #ifdef __APPLE__ #ifdef __x86_64__ -#define CORE_BIG_ENDIAN 0 -#define CORE_LITTLE_ENDIAN 1 +#undef CORE_BIG_ENDIAN +#define CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 64 /* big value - no alignment */ #else -#define CORE_BIG_ENDIAN 1 -#define CORE_LITTLE_ENDIAN 0 +#define CORE_BIG_ENDIAN +#undef CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 4 #endif #endif #ifdef _AIX -#define CORE_BIG_ENDIAN 1 -#define CORE_LITTLE_ENDIAN 0 +#define CORE_BIG_ENDIAN +#undef CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 4 #endif /* Def _AIX */ #ifdef _MSC_VER #define __windows -#define CORE_BIG_ENDIAN 0 -#define CORE_LITTLE_ENDIAN 1 +#undef CORE_BIG_ENDIAN +#define CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 64 /* big value - no alignment */ #endif /* Def _MSC_VER */ @@ -42,8 +42,8 @@ defined(__DragonFly__) || defined(__FreeBSD_kernel__) #include sys/param.h #if __BYTE_ORDER == __LITTLE_ENDIAN -#define CORE_BIG_ENDIAN 0 -#define CORE_LITTLE_ENDIAN 1 +#undef CORE_BIG_ENDIAN +#define CORE_LITTLE_ENDIAN #if defined(__x86_64) || defined(__i386) #define USE_MEMORY_ALIGNMENT 64 #else @@ -51,8 +51,8 @@ #endif #else /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ #if __BYTE_ORDER == __BIG_ENDIAN -#define CORE_BIG_ENDIAN 1 -#define CORE_LITTLE_ENDIAN 0 +#define CORE_BIG_ENDIAN +#undef CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 4 #endif /* __BYTE_ORDER == __BIG_ENDIAN */ #endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ @@ -60,12 +60,12 @@ #ifdef __sun #ifdef __sparc -#define CORE_BIG_ENDIAN 1 -#define CORE_LITTLE_ENDIAN 0 +#define CORE_BIG_ENDIAN +#undef CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 4 #else /* Ndef __sparc */ -#define CORE_BIG_ENDIAN 0 -#define CORE_LITTLE_ENDIAN 1 +#undef CORE_BIG_ENDIAN +#define CORE_LITTLE_ENDIAN #define USE_MEMORY_ALIGNMENT 4 #endif /* Ndef __sparc */ #endif /* Def __sun */ @@ -342,19 +342,17 @@ struct hash #define rot(x,k) (((x)(k)) | ((x)(32-(k -#if CORE_BIG_ENDIAN +#if defined CORE_BIG_ENDIAN #define MASK_C1 0xFF00 #define MASK_C2 0x #define MASK_C3 0xFF00 -#else -#if CORE_LITTLE_ENDIAN +#elif defined CORE_LITTLE_ENDIAN #define MASK_C1 0xFF #define MASK_C2 0x #define MASK_C3 0xFF #else #error Missing Endianness definition #endif -#endif #define mix(a,b,c) \ commit c1ea7a2fb43a8f51134fafba78b3acc68f10fcf4 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 11:35:40 2013 +0100 At least Mac OS X SDK 10.7 doesn't experience TimeValue clash here (causes -Werror,-Wunused-macros, rather) Change-Id: I1dc05a5cf73aec7827df662342f5d9189215e64e diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index c6f55dc..bffca6d 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -43,9 +43,13 @@ #define HAVE_O_EXLOCK // add MACOSX Time Value +#if MACOSX_SDK_VERSION 1070 #define TimeValue CFTimeValue +#endif #include CoreFoundation/CoreFoundation.h +#if MACOSX_SDK_VERSION 1070 #undef TimeValue +#endif #endif /* MACOSX */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/signal.c |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6c8cdfe24380461c3eb81cac39ac6425cad17715 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 12:45:25 2013 +0200 WaE: macro is not used: STACKTYPE Change-Id: If20c7637d13f37029e447e779586fcfad21c3305 diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index 24c170a..4ce8fd5 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -26,7 +26,9 @@ #if defined( INTEL ) #include backtrace.h #define INCLUDE_BACKTRACE +#ifdef SAL_ENABLE_CRASH_REPORT #define STACKTYPE MacOsX_X86 +#endif #endif /* INTEL */ #endif /* MACOSX */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdpage.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 6e9be7c8a3c2145d923612889f209fe4874139c3 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 12:47:31 2013 +0200 WaE: macro _STRING_H is not used Change-Id: Iabc3ab2d455a768f7af159490e0c26b694c01f34 diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 50e4e3b..3d181c2 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -26,9 +26,6 @@ #include sot/clsids.hxx #include svx/svdview.hxx #include string.h -#ifndef _STRING_H -#define _STRING_H -#endif #include vcl/svapp.hxx #include tools/diagnose_ex.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#30983 RTF filter: fix handling of RTF_PVPG and RTF_PHPG
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3081
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3081/1
fdo#30983 RTF filter: fix handling of RTF_PVPG and RTF_PHPG
There were two issues here:
1) The export filter never exported these keywords.
2) The flymaincnt RTF extension we inherited from OOo actually never
worked (i.e. it's like this since 7b0b5cdf, the initial import...), as
RTFVertOrient / RTFHoriOrient's second parameter was stored in 1 bit, so
text::RelOrientation::PAGE_FRAME (7) was read back as 1 instead.
Note that I want to get rid of this flymaincnt extension in the exporter
anyway soon, so killing the RTFVertOrient / RTFHoriOrient duplication is
pointless: the sw version will go away.
(cherry picked from commit b4845db4260db70cb3aaf03758cb4a1ca5fa88ed)
Change-Id: I5335567833ecf87e6b0ba7c73150a7b95c57f237
---
A sw/qa/extras/rtfexport/data/fdo30983.rtf
M sw/qa/extras/rtfexport/rtfexport.cxx
M sw/source/filter/inc/rtf.hxx
M sw/source/filter/ww8/rtfattributeoutput.cxx
M writerfilter/source/rtftok/rtffly.hxx
5 files changed, 78 insertions(+), 6 deletions(-)
diff --git a/sw/qa/extras/rtfexport/data/fdo30983.rtf
b/sw/qa/extras/rtfexport/data/fdo30983.rtf
new file mode 100644
index 000..bd4dd96
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo30983.rtf
@@ -0,0 +1,43 @@
+{\rtf1\ansi\deff4\adeflang1025
+\paperh15840\paperw12240\margl902\margr958\margt1440\margb735\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn902\margrsxn958\margtsxn1440\margbsxn735\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\absw2380\absh-1244\pvpg\posy465\phpg\posx8437
+{\*\flymaincnt96\flyvert29040\flyhorz30464\flyanchor4\pgndec}
+\s111\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\loch\f1\rtlch \ltrch\loch\loch\f5
+5983 Red Pine Blvd}
+\par \s111\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+White Bear Township, MN 55110}
+\par \s110\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+Home 651-426-9645}
+\par \s110\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+Cell 651-245-1843}
+\par \s110\sl200\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs16\lang1033
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+E-mail dadso...@gmail.com}
+\par \pard
+\pard\plain \s123\sl240\slmult0\ql\widctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\li2160\ri0\lin2160\rin0\fi0\sb0\sa440\ltrpar\cf0\expnd-4\expndtw-20\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs48\lang1033\li-11\ri0\lin-11\rin0\fi0\sb0\sa144
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+M}
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+ichael P. Soucheray}
+\par \pard\plain \s114\sl220\slmult0\ql\widctlpar\tx2160\tqr\tx6480
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\aspalpha\li0\ri-360\lin0\rin-360\fi0\sb220\sa40\ltrpar\cf0\dbch\af6\langfe255\dbch\af6\afs20\alang1025\loch\f6\fs20\lang1033\li-11\ri0\lin-11\rin0\fi0\sb0\sa144
+{\dbch\af5\rtlch \ltrch\loch\loch\f5
+Experienced general}
+\par }
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 18ddf1b..0610516 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -32,6 +32,7 @@
#include com/sun/star/text/XPageCursor.hpp
#include com/sun/star/text/XTextViewCursorSupplier.hpp
#include com/sun/star/view/XViewSettingsSupplier.hpp
+#include com/sun/star/text/RelOrientation.hpp
#include unotools/tempfile.hxx
#include vcl/svapp.hxx
@@ -71,6 +72,7 @@
void testFdo53604();
void testFdo52286();
void testFdo61507();
+void testFdo30983();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -116,6 +118,7 @@
{fdo53604.odt, Test::testFdo53604},
{fdo52286.odt, Test::testFdo52286},
{fdo61507.rtf, Test::testFdo61507},
+{fdo30983.rtf, Test::testFdo30983},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -488,6 +491,16 @@
CPPUNIT_ASSERT_EQUAL(6, getLength());
}
+void Test::testFdo30983()
+{
+// These were 'page text area', not 'entire page', i.e. both the horizontal
+// and vertical positions were incorrect.
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
[Libreoffice-commits] core.git: desktop/unx
desktop/unx/source/splashx.c | 12 1 file changed, 12 deletions(-) New commits: commit 71907bb06ae6fc3c0ea1485b6ed0efaed196a57a Author: Thomas Arnhold tho...@arnhold.org Date: Wed Mar 27 11:49:40 2013 +0100 -Wunused-macros Change-Id: Ia147a72a4bbd5cec45a2a74b721a81ff8c4340c2 diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 2a5f654..339218c 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -99,18 +99,6 @@ struct splash #define PROGRESS_YOFFSET 18 #define PROGRESS_BARSPACE 2 -#define UINT8( x ) ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) ) - -#define UINT16( x ) ( ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) ) + \ - ( ( (unsigned int)( ( (uint8_t *)( x ) )[1] ) ) 8 ) ) - -#define UINT32( x ) ( ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) ) + \ - ( ( (unsigned int)( ( (uint8_t *)( x ) )[1] ) ) 8 ) + \ - ( ( (unsigned int)( ( (uint8_t *)( x ) )[2] ) ) 16 ) + \ - ( ( (unsigned int)( ( (uint8_t *)( x ) )[3] ) ) 24 ) ) - -#define MAX( x, y ) ( ( (x) (y) )? (x): (y) ) - /* libpng-1.2.41 */ #ifndef PNG_TRANSFORM_GRAY_TO_RGB # define PNG_TRANSFORM_GRAY_TO_RGB 0x2000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_features.h.in config_host.mk.in configure.ac desktop/source solenv/gbuild
config_host.mk.in |1
config_host/config_features.h.in |9
++
configure.ac |7
+
desktop/source/app/app.cxx|2 -
desktop/source/deployment/manager/dp_activepackages.cxx | 13
+-
desktop/source/deployment/manager/dp_activepackages.hxx |6
+++-
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 13
+-
solenv/gbuild/gbuild.mk |1
8 files changed, 30 insertions(+), 22 deletions(-)
New commits:
commit ab7ac5884c5a824999b58d2a800cae64cb8e359a
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 12:56:59 2013 +0200
Use config_features.h instead of -DDISABLE_EXTENSIONS
Change-Id: I4fe5cd27b77d44b9b33af0ae3c3754e3b85c2ca3
diff --git a/config_host.mk.in b/config_host.mk.in
index 8457cb3..83aad60 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -96,7 +96,6 @@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
export DISABLE_EXPORT=@DISABLE_EXPORT@
-export DISABLE_EXTENSIONS=@DISABLE_EXTENSIONS@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 48ac1dc..1cc2476 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -21,6 +21,15 @@
#define HAVE_FEATURE_DESKTOP 0
+/* EXTENSIONS - Whether we have any extension mechanism at all
+ *
+ * Primarily intended for non-desktop platforms where supporting
+ * extensions can be complicated, or even prohibited by the OS (as on
+ * iOS).
+ */
+
+#define HAVE_FEATURE_EXTENSIONS 0
+
/* HELP - Whether we have the normal desktop-style help mechanism
*
* Can be turned on/off also for desktop environments with
diff --git a/configure.ac b/configure.ac
index 6647b05..970ae68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2157,13 +2157,10 @@ if test -z $enable_extensions; then
fi
fi
-DISABLE_EXTENSIONS=''
if test $enable_extensions = yes; then
BUILD_TYPE=$BUILD_TYPE EXTENSIONS
-else
-DISABLE_EXTENSIONS='TRUE'
+AC_DEFINE(HAVE_FEATURE_EXTENSIONS)
fi
-AC_SUBST(DISABLE_EXTENSIONS)
if test -z $enable_scripting; then
# Disable scripting for iOS unless specifically overridden
@@ -2659,7 +2656,7 @@ AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
AC_MSG_CHECKING([whether to treat the installation as read-only])
if test \( -z $enable_readonly_installset -a $ENABLE_MACOSX_SANDBOX = YES
\) -o \
-$DISABLE_EXTENSIONS = TRUE; then
+$enable_extensions != yes; then
enable_readonly_installset=yes
fi
if test $enable_readonly_installset = yes; then
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1f57c2e..e9301bf 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1541,7 +1541,7 @@ int Desktop::Main()
*/
Application::GetDefaultDevice();
-#ifndef DISABLE_EXTENSIONS
+#if HAVE_FEATURE_EXTENSIONS
// Check if bundled or shared extensions were added /removed
// and process those extensions (has to be done before checking
// the extension dependencies!
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx
b/desktop/source/deployment/manager/dp_activepackages.cxx
index 1a4081f..1eaeb09 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
#include sal/config.h
@@ -43,7 +44,7 @@
// key: 0xFF UTF8(identifier)
// value: UTF8(tempname) 0xFF UTF8(filename) 0xFF UTF8(mediatype)
-#ifndef DISABLE_EXTENSIONS
+#if HAVE_FEATURE_EXTENSIONS
namespace {
@@ -117,7 +118,7 @@ namespace dp_manager {
ActivePackages::ActivePackages() {}
ActivePackages::ActivePackages(::rtl::OUString const url, bool readOnly)
-#ifndef DISABLE_EXTENSIONS
+#if HAVE_FEATURE_EXTENSIONS
: m_map(url, readOnly)
#endif
{
@@ -137,7 +138,7 @@ bool ActivePackages::get(
Data * data, ::rtl::OUString const id, ::rtl::OUString const fileName)
const
{
-#ifndef DISABLE_EXTENSIONS
+#if HAVE_FEATURE_EXTENSIONS
::rtl::OString v;
if (m_map.get(v, newKey(id))) {
if (data != NULL) {
@@ -162,7 +163,7 @@ bool ActivePackages::get(
ActivePackages::Entries ActivePackages::getEntries() const {
Entries es;
-#ifndef DISABLE_EXTENSIONS
+#if HAVE_FEATURE_EXTENSIONS
::dp_misc::t_string2string_map m(m_map.getEntries());
for (::dp_misc::t_string2string_map::const_iterator i(m.begin());
i != m.end();
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/check/updatecheck.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit e717c5b929cdb790147c55c20889ed9042374394 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 12:06:09 2013 +0100 -Werror,-Wunused-macros Change-Id: I083b936a6b20f070748c281d5814d5e57dedf864 diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index cea6ec7..d2ac583 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -64,11 +64,8 @@ namespace uno = com::sun::star::uno ; #define PROPERTY_TITLE BubbleHeading #define PROPERTY_TEXT BubbleText -#define PROPERTY_IMAGE BubbleImageURL #define PROPERTY_SHOW_BUBBLEBubbleVisible #define PROPERTY_CLICK_HDL MenuClickHDL -#define PROPERTY_DEFAULT_TITLE DefaultHeading -#define PROPERTY_DEFAULT_TEXT DefaultText #define PROPERTY_SHOW_MENUICON MenuIconVisible extern C bool SAL_CALL WNT_hasInternetConnection(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/unx
desktop/unx/source/splashx.c |2 -- 1 file changed, 2 deletions(-) New commits: commit 0ac88c0bbc95465a08d14be0033a136a14c56557 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 13:06:39 2013 +0200 WaE: macro is not used: USE_LIBPNG Change-Id: I900d4957d964332ef97cb389d17206438f94743c diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 339218c..2f7d548 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -36,8 +36,6 @@ #include X11/extensions/Xinerama.h #endif -#define USE_LIBPNG - #include osl/endian.h #include fcntl.h #include stdint.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice LTO
Thank you Peter for your patch, I hope it will help me. Unfortunately, I face now some kind of undefined symbol in saxparser, please let see bugzilla. Martin On 25 March 2013 20:00, Peter Foley pefol...@verizon.net wrote: I haven't run into the mentioned bug, but compiling with LTO is so slow that I've only done it once or twice. The multiple definition errors should all be fixed now. Thanks, Peter On Mon, Mar 25, 2013 at 5:25 AM, Jan Holesovsky ke...@suse.cz wrote: Hi Martin Martin Liška píše v Ne 24. 03. 2013 v 20:26 +0100: Looks like there's a big issue that must be done in a build system of libreoffice: https://bugs.freedesktop.org/show_bug.cgi?id=61627 to clear the way for gcc LTO optimization? What do you think about that? Please let me move the conversation to the LibreOffice developers mailing list - I hope you don't mind :-) Bjoern has a plan regarding the includes; we plan to do the change after 4.0.2 is out, but need to check which of the possible approaches is better. Other than that - Peter Foley is recently working on merged libraries, might be good to check the most recent master to see what is the status today, and if you are still hitting the problem (I suspect you are going to, but...) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Init: fixed typo in the SystemDialog class.
Hi Petr, On Tue, 2013-03-26 at 18:03 +0100, Petr Mladek wrote: I guess that you did not merge the following two commits by purpose: + https://gerrit.libreoffice.org/#/c/3027/ Pack and register the Web wizard. Right :-) currently we just leave the Java one enabled. I do not see any comments in gerrit. What are the plans here? ;-) My hope was that Xisco would have some time to review it at some stage. I merged the other commit just now (FWIW). Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[MERGE FAILED] Ugly Hack: using our own WebConfigSet while the Topic stuff ...
Michael Meeks has submitted this change and it FAILED to merge. Change subject: Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. .. Your change could not be merged due to a path conflict. Please merge (or rebase) the change locally and upload the resolution for review. -- To view, visit https://gerrit.libreoffice.org/3028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merge-failed Gerrit-Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Javier Fernandez javier@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] solve fdo#62805
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3082
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3082/1
solve fdo#62805
move m_pCurrentBuffer to RTFParserState
Change-Id: Ied16ee1704d35c6bd0368b26a210131b60bc91a3
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
2 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4fbb6cc..d2fb17f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -255,7 +255,6 @@
m_aTableBuffer(),
m_aSuperBuffer(),
m_aShapetextBuffer(),
-m_pCurrentBuffer(0),
m_bHasFootnote(false),
m_pSuperstream(0),
m_nHeaderFooterPositions(),
@@ -438,7 +437,7 @@
if (m_bNeedPap)
{
m_bNeedPap = false; // reset early, so we can avoid recursion when
calling ourselves
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const
pParagraphProperties(
getProperties(m_aStates.top().aParagraphAttributes,
m_aStates.top().aParagraphSprms)
@@ -466,14 +465,14 @@
else
{
RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aParagraphAttributes,
m_aStates.top().aParagraphSprms));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
}
}
void RTFDocumentImpl::runProps()
{
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const pProperties =
getProperties(m_aStates.top().aCharacterAttributes,
m_aStates.top().aCharacterSprms);
Mapper().props(pProperties);
@@ -481,7 +480,7 @@
else
{
RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aCharacterAttributes,
m_aStates.top().aCharacterSprms));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
}
@@ -840,7 +839,7 @@
}
writerfilter::ReferenceProperties::Pointer_t const pProperties(new
RTFReferenceProperties(aAttributes, aSprms));
checkFirstRun();
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
Mapper().props(pProperties);
// Make sure we don't loose these properties with a too early reset.
@@ -849,7 +848,7 @@
else
{
RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
return 0;
}
@@ -949,7 +948,7 @@
void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
{
sal_uInt8 sValue[] = { nValue };
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
Mapper().startCharacterGroup();
// Should we send run properties?
@@ -960,10 +959,10 @@
}
else
{
-m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
RTFValue::Pointer_t pValue(new RTFValue(*sValue));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_TEXT,
pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
}
}
@@ -1110,31 +1109,31 @@
return;
}
-if (!m_pCurrentBuffer m_aStates.top().nDestinationState !=
DESTINATION_FOOTNOTE)
+if (!m_aStates.top().pCurrentBuffer m_aStates.top().nDestinationState
!= DESTINATION_FOOTNOTE)
Mapper().startCharacterGroup();
-else if (m_pCurrentBuffer)
+else if (m_aStates.top().pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
-m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
pValue));
}
if (m_aStates.top().nDestinationState == DESTINATION_NORMAL
|| m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT
|| m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT)
runProps();
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
Mapper().utext(reinterpret_castsal_uInt8 const*(rString.getStr()),
rString.getLength());
else
{
RTFValue::Pointer_t pValue(new RTFValue(rString));
-
[PATCH] minor update in rtfdocumentimpl.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3083
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3083/1
minor update in rtfdocumentimpl.cxx
Change-Id: Ie32166edbc3efb603ccb5e98d8c2cac66ecc2f47
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d2fb17f..c7fa7f1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -839,6 +839,7 @@
}
writerfilter::ReferenceProperties::Pointer_t const pProperties(new
RTFReferenceProperties(aAttributes, aSprms));
checkFirstRun();
+
if (!m_aStates.top().pCurrentBuffer)
{
Mapper().props(pProperties);
@@ -850,6 +851,7 @@
RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
+
return 0;
}
@@ -948,7 +950,9 @@
void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
{
sal_uInt8 sValue[] = { nValue };
-if (!m_aStates.top().pCurrentBuffer)
+RTFBuffer_t* pCurrentBuffer = m_aStates.top().pCurrentBuffer;
+
+if (!pCurrentBuffer)
{
Mapper().startCharacterGroup();
// Should we send run properties?
@@ -959,10 +963,10 @@
}
else
{
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
+pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
RTFValue::Pointer_t pValue(new RTFValue(*sValue));
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_TEXT,
pValue));
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
+pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
}
}
@@ -1109,31 +1113,37 @@
return;
}
-if (!m_aStates.top().pCurrentBuffer m_aStates.top().nDestinationState
!= DESTINATION_FOOTNOTE)
+RTFBuffer_t* pCurrentBuffer = m_aStates.top().pCurrentBuffer;
+
+if (!pCurrentBuffer m_aStates.top().nDestinationState !=
DESTINATION_FOOTNOTE)
Mapper().startCharacterGroup();
-else if (m_aStates.top().pCurrentBuffer)
+else if (pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, pValue));
}
+
if (m_aStates.top().nDestinationState == DESTINATION_NORMAL
|| m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT
|| m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT)
runProps();
-if (!m_aStates.top().pCurrentBuffer)
+
+if (!pCurrentBuffer)
Mapper().utext(reinterpret_castsal_uInt8 const*(rString.getStr()),
rString.getLength());
else
{
RTFValue::Pointer_t pValue(new RTFValue(rString));
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_UTEXT,
pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_UTEXT, pValue));
}
+
m_bNeedCr = true;
-if (!m_aStates.top().pCurrentBuffer m_aStates.top().nDestinationState
!= DESTINATION_FOOTNOTE)
+
+if (!pCurrentBuffer m_aStates.top().nDestinationState !=
DESTINATION_FOOTNOTE)
Mapper().endCharacterGroup();
-else if(m_aStates.top().pCurrentBuffer)
+else if(pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, pValue));
}
}
@@ -2371,6 +2381,7 @@
{
if (!m_aStates.top().pCurrentBuffer)
m_aStates.top().pCurrentBuffer = m_aSuperBuffer;
+
RTFValue::Pointer_t pValue(new RTFValue(superscript));
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_RPrBase_vertAlign, pValue);
}
@@ -2707,12 +2718,14 @@
case RTF_POSY: nId = NS_ooxml::LN_CT_FramePr_y;
m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, 0); break;
default: break;
}
+
if (nId 0)
{
m_bNeedPap = true;
// Don't try to support text frames inside tables for now.
if (m_aStates.top().pCurrentBuffer != m_aTableBuffer)
m_aStates.top().aFrame.setSprm(nId, nParam);
+
return 0;
}
@@ -4276,6 +4289,7 @@
else if (m_xDocumentProperties.is())
m_xDocumentProperties-setTitle(aState.aDestinationText.makeStringAndClear());
}
+
if (aState.pCurrentBuffer == m_aSuperBuffer)
{
OSL_ASSERT(m_aStates.top().pCurrentBuffer
[PATCH] use of aState instead of m_aStates.top in popState
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3085
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3085/1
use of aState instead of m_aStates.top in popState
Change-Id: I6814e48a92a1b24823c6884a151aa6a139410ff2
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e732688..d4896ef 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -209,10 +209,10 @@
return NULL;
}
-static util::DateTime lcl_getDateTime(std::stackRTFParserState aStates)
+static util::DateTime lcl_getDateTime(RTFParserState aState)
{
-return util::DateTime(0 /*100sec*/, 0 /*sec*/, aStates.top().nMinute,
aStates.top().nHour,
-aStates.top().nDay, aStates.top().nMonth, aStates.top().nYear);
+return util::DateTime(0 /*100sec*/, 0 /*sec*/, aState.nMinute,
aState.nHour,
+aState.nDay, aState.nMonth, aState.nYear);
}
static void lcl_DestinationToMath(OUStringBuffer rDestinationText,
oox::formulaimport::XmlStreamBuilder rMathBuffer)
@@ -3821,12 +3821,12 @@
sal_Int32 nReplaces = 1;
for (int i = 0; i aOrig.getLength(); i++)
{
-if (std::find(m_aStates.top().aLevelNumbers.begin(),
m_aStates.top().aLevelNumbers.end(), i+1)
-!= m_aStates.top().aLevelNumbers.end())
+if (std::find(aState.aLevelNumbers.begin(),
aState.aLevelNumbers.end(), i+1)
+!= aState.aLevelNumbers.end())
{
aBuf.append(sal_Unicode('%'));
// '1.1.1' - '%1.%2.%3', but '1.' (with '2.' prefix
omitted) is %2.
-aBuf.append(sal_Int32(nReplaces++ +
m_aStates.top().nListLevelNum + 1 - m_aStates.top().aLevelNumbers.size()));
+aBuf.append(sal_Int32(nReplaces++ +
aState.nListLevelNum + 1 - aState.aLevelNumbers.size()));
}
else
aBuf.append(aOrig.copy(i, 1));
@@ -3836,14 +3836,11 @@
}
break;
case DESTINATION_SHAPEPROPERTYNAME:
+
aState.aShape.aProperties.push_back(make_pair(m_aStates.top().aDestinationText.makeStringAndClear(),
OUString()));
+break;
case DESTINATION_SHAPEPROPERTYVALUE:
-case DESTINATION_SHAPEPROPERTY:
-{
-if (m_aStates.top().nDestinationState ==
DESTINATION_SHAPEPROPERTYNAME)
-
aState.aShape.aProperties.push_back(make_pair(m_aStates.top().aDestinationText.makeStringAndClear(),
OUString()));
-else if (m_aStates.top().nDestinationState ==
DESTINATION_SHAPEPROPERTYVALUE aState.aShape.aProperties.size())
-aState.aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
-}
+if (aState.aShape.aProperties.size())
+aState.aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
break;
case DESTINATION_PICPROP:
case DESTINATION_SHAPEINSTRUCTION:
@@ -3878,7 +3875,7 @@
break;
case DESTINATION_DATAFIELD:
{
-OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
m_aStates.top().nCurrentEncoding);
+OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
aState.nCurrentEncoding);
// decode hex dump
OStringBuffer aBuf;
const char *str = aStr.getStr();
@@ -3915,9 +3912,9 @@
nLength = aStr.toChar();
aStr = aStr.copy(1);
OString aDefaultText = aStr.copy(0, nLength);
-RTFValue::Pointer_t pNValue(new
RTFValue(OStringToOUString(aName, m_aStates.top().nCurrentEncoding)));
+RTFValue::Pointer_t pNValue(new
RTFValue(OStringToOUString(aName, aState.nCurrentEncoding)));
m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFData_name, pNValue);
-RTFValue::Pointer_t pDValue(new
RTFValue(OStringToOUString(aDefaultText, m_aStates.top().nCurrentEncoding)));
+RTFValue::Pointer_t pDValue(new
RTFValue(OStringToOUString(aDefaultText, aState.nCurrentEncoding)));
m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFTextInput_default,
pDValue);
m_bFormField = false;
@@ -3925,15 +3922,15 @@
break;
case DESTINATION_CREATIONTIME:
if (m_xDocumentProperties.is())
-
m_xDocumentProperties-setCreationDate(lcl_getDateTime(m_aStates));
+
[PATCH] unit test for fdo#62805
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3086
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3086/1
unit test for fdo#62805
Change-Id: Iebc1a63496aaf54b9e459d0ed53db5cae49929ac
---
A sw/qa/extras/rtfimport/data/fdo62805.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/sw/qa/extras/rtfimport/data/fdo62805.rtf
b/sw/qa/extras/rtfimport/data/fdo62805.rtf
new file mode 100644
index 000..fee2b59
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo62805.rtf
@@ -0,0 +1,21 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New
Roman};}{\f4\fswiss\fprq2\fcharset0 Nimbus Sans L{\*\falt
Arial};}{\f5\fnil\fprq2\fcharset0 DejaVu Sans;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1036
Style par d\u233\'e9faut;}
+{\s15\sbasedon0\snext16\sb240\sa120\keepn\dbch\af5\dbch\af5\afs28\loch\f4\fs28
Titre;}
+{\s16\sbasedon0\snext16\sb0\sa120 Corps de texte;}
+{\s17\sbasedon16\snext17\sb0\sa120 Liste;}
+{\s18\sbasedon0\snext18\sb120\sa120\noline\i\afs24\ai\fs24 L\u233\'e9gende;}
+{\s19\sbasedon0\snext19\noline Index;}
+{\s20\sbasedon0\snext20\noline Contenu de tableau;}
+}{\info{\author
test}{\creatim\yr2013\mo3\dy27\hr11\min43}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
LibreOffice}{\vern4000}}\deftab709
+\viewscale110
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse455\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
Style par d\u233\'e9faut;}}
+\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1036{\rtlch
\ltrch\loch
+Test}
+\par
+{\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrhair\brdrw1\brdrcf1\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\clbrdrr\brdrhair\brdrw1\brdrcf1\cellx9638\pard\plain
\s20\noline\intbl{\rtlch \ltrch\loch
+test in cell}\cell\row}
+test\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 4d042dc..591e6ba 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -113,7 +113,7 @@
void testFdo52052();
void testInk();
void testFdo52389();
-void testFdo49655();
+void testFdo49655_62805();
void testFdo52475();
void testFdo55493();
void testCopyPastePageStyle();
@@ -231,7 +231,8 @@
{fdo52052.rtf, Test::testFdo52052},
{ink.rtf, Test::testInk},
{fdo52389.rtf, Test::testFdo52389},
-{fdo49655.rtf, Test::testFdo49655},
+{fdo49655.rtf, Test::testFdo49655_62805},
+{fdo62805.rtf, Test::testFdo49655_62805},
{fdo52475.rtf, Test::testFdo52475},
{fdo55493.rtf, Test::testFdo55493},
{copypaste-pagestyle.rtf, Test::testCopyPastePageStyle},
@@ -859,12 +860,17 @@
CPPUNIT_ASSERT_EQUAL(6, getLength());
}
-void Test::testFdo49655()
+void Test::testFdo49655_62805()
{
/*
+ * 49655 :
* The problem was that the table was not imported due to the ' ' string
in the middle of the table definition.
*
* xray ThisComponent.TextTables.Count 'was 0
+ *
+ * 62805 :
+ * The problem was that the table was not imported due to the absence of
\pard after \row.
+ * The table was instead in a group (the '}' replace the \pard).
*/
uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
--
To view, visit https://gerrit.libreoffice.org/3086
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc1a63496aaf54b9e459d0ed53db5cae49929ac
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Maxime de Roucy mdero...@linagora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/tool/callform.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 644cf72f7c5bb217ea2c3769e5cfd958346e2c7f
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 13:31:09 2013 +0200
WaE: macro is not used
Change-Id: I51ffa344e414d549daf642ad961e489a83b2be37
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index d46409b..8fd8ea2 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -65,6 +65,7 @@ typedef void (CALLTYPE* FARPROC) ( void );
}
+#ifndef DISABLE_DYNLOADING
#define GETFUNCTIONCOUNTGetFunctionCount
#define GETFUNCTIONDATA GetFunctionData
#define SETLANGUAGE SetLanguage
@@ -72,6 +73,7 @@ typedef void (CALLTYPE* FARPROC) ( void );
#define ISASYNC IsAsync
#define ADVICE Advice
#define UNADVICEUnadvice
+#endif
class ModuleData
{
commit 1c48417cf7f726e86bbb84a5403b56d925ce5610
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 27 13:29:01 2013 +0200
Bypass FuncData::getParamDesc() too in the DISABLE_DYNLOADING case
Change-Id: Ia115355af6e556fb848235691be68edd2462752d
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 7117c71..d46409b 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -391,6 +391,12 @@ const OUString FuncData::GetModuleName() const
bool FuncData::getParamDesc( OUString aName, OUString aDesc, sal_uInt16
nParam ) const
{
+#ifdef DISABLE_DYNLOADING
+(void) aName;
+(void) aDesc;
+(void) nParam;
+return false;
+#else
bool bRet = false;
if ( nParam = nParamCount )
{
@@ -414,6 +420,7 @@ bool FuncData::getParamDesc( OUString aName, OUString
aDesc, sal_uInt16 nParam
aDesc = OUString();
}
return bRet;
+#endif
}
FuncCollection::FuncCollection() {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/sdremote-1.0.6'
Tag 'sdremote-1.0.6' created by Petr Mladek pmla...@suse.cz at 2013-03-27 12:31 -0700 Tag sdremote-1.0.6 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUtilAAoJEPQ0oe+v7q6jGegQAK8OQCQHiIAG0whl/gT7bl7f eXhrQJWD5YKIbXOe9OQTuBJmQE+gAyLc+sU+8QsL7Un8SdiuZLzz5BRcSVc5Bzxv kYLpGG3JkncBf9soJ6wdpmbmt7i3WC/c3Dl8DBTMHJJmghdncw2jfhnt/ZQJ3i1f ftmAMHK7mEnU2V5BA5yhVfPy494ruSxt0gJqB1nrRk5H5bGLM+Kozxuwkbvyq3yk X6wR9hxwCaWcqrwJIZ7fFYoemxs2HSoI9aPPymr70q7xTEe1yvnP0SnGaSZc/0zr YWBLu+hWRKXyaY3g489sjKlW4b4kOWsfNXP3YUr5fZQW5x3jQyRwntuhPALTgxBr 06pFCCc88WjU+uxHh4OMij2IkwU5jaH+/E/RFDS9eP8vKrzeDq+09jk4vvZTBHGO MVlxpByflHVoO8dcO9zsyCGpivi2hRED6ZG7MZ43f3CHSdmdJQ0THxl8j1AI32F1 YRx7uqRtRR0AIyLnk+hKNU7pXHjM0ugi1cSnDxGuj9C3WI5X+xEAnYNfR1531rhP WK0Zho3IGKfUMyd9KFi+Ii5OHruaWYQ7uU09M2aq3WQTZGz/oAe2aNbIirO11loB RIMbR1ibiCsZVhqvvUF4j/Ym3mFfPJTRVfgAP7o2KxKeB9XDj+LbqHLErltexvu7 7KAtGU/eEerGaOuh13SA =c7Qr -END PGP SIGNATURE- Changes since sdremote-1.0.2-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/sdremote-1.0.6'
Tag 'sdremote-1.0.6' created by Petr Mladek pmla...@suse.cz at 2013-03-27 12:31 -0700 Tag sdremote-1.0.6 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUtilAAoJEPQ0oe+v7q6jCaoQAKXN4iakIrrQMgtTc/2dHG1H IB1d2I1SSbIulL5ApVrUN6LJyAZZGlWcSmHsqKmoUkkh0Lodp0+F9s7tgW7kHg7x JDqVFae/LG/lALDcfJnU5msZUj3Ib9Dlrw6WxisJcPMSTK62FaZqmd3y5W7bEZbz Um6Exe34weVPYNfC8wc36NvVCWJ3NVsmjOwi3sQgWqL4bAR1s3P5Xpw/P7XghGG0 xtdHhAPTKPi52SsDZ9uWy6XH8I58PFTMs/3stPXF3xsrxgDrS6zcoXf4FIj8aZfF FfZif+J313UiVyg6MlRvUWHAJ0oRngrIaHqsm76hjRG12m5qcdkyYUsbAMSWuGZg TgFydglRUSmqJ6ZkXPhzGPz+5CCgilL3bwpIWC8v0IG4QyoeA6prgfQ1rckZnqM6 2cMz7QzCJJutGhqSq/mbNTE+qsxvA+cGyjEBvqIZYQyRQWJhLXRreELosCn5UiVR TfS/Yqhj5DlUNkwzaaJA0CGB9sqAVqrkla5sp4ppS82pRI0pQPTBy5XkZVa6L78j Ejjyb3bnRtCMey26D1JqOIbMyrJGGWSAVtGFgrXE0Y/a9dgd/Ub7KWiGv1JLBZj6 mKl4dEge6k1Poc+WPVsRmZytbz7dK7ZDfmB9mDMGV78Nh6QCrwY1S8SjfJIpl+yH 2vr58h18DS4rBvUg3nqx =BUk3 -END PGP SIGNATURE- Changes since sdremote-1.0.2: Petr Mladek (1): Impress Remote 1.0.6, tag sdremote-1.0.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/sdremote-1.0.6'
Tag 'sdremote-1.0.6' created by Petr Mladek pmla...@suse.cz at 2013-03-27 12:31 -0700 Tag sdremote-1.0.6 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUtilAAoJEPQ0oe+v7q6j3zsP/RWyyMFIj6KiPO6mZvmX91rP stlPifJLwLrTHfZlDhXNBDUkjHh3WmQnRZWR0Y4Y1O4RuPoaMdKGbCeWls8OL4bE 4yPT4Vq5UWARNJb2ZYwzC/ix6AJmvIKhB1dyPyEpPJbVNMqEDsyk8je+XQRFrXOb 8cXKq0rpd4iW8K5ocRyID1H4E8UfcdQzpse2ZY/zve2clRx7sV/Tn3O57ycBQ6/4 b8hBhKRPwRQRKP2YZG16TLsabgKLNwJe7pb8qtCGkBNbWe+c7BSmsZnaXUg1CS/8 KxJb6iJ+h/q7rgc7qkVOIx93MYVnj3nNTGXma1v8n5klEm0hiAPcRBV0zC4SwXHj EWtRSjU3ZiSROdzEd0GrV+6lJENOktI6eMfKbK9f/3fwCMSFUOOpmZt3Gk4GXUE7 UffrvMH2Cco1tODq07aNj/kQJCt9MK3UgjcZlx+8yWU3u/Q3WBrALAvG26WHxwVG 3Xi6JnWNyh04Khlk9m4lqOhmtRXu4xUgkCSHz+sK8kekwhr2h9DhX9PwqNoaUz9Y 9wfG61gS3cIT55h3EFZP2gsI9f+9OB7u6MPkhY2WJeKA3fW0OfRZJx4iFLou3dVG WRq24c8AIlay+BrlKQf8GUFb9ouYXbJ8acj5i3lCo5aLFoQjTOMxCV8/NiOMdfA0 JOLgVJrJ/1/2GzjWF46P =aDbp -END PGP SIGNATURE- Changes since sdremote-1.0.2-5: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/sdremote-1.0.6'
Tag 'sdremote-1.0.6' created by Petr Mladek pmla...@suse.cz at 2013-03-27 12:31 -0700 Tag sdremote-1.0.6 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUtilAAoJEPQ0oe+v7q6j5BEP/RY/gvfGg7jClXw0d276lFbW jUDHtIqsdPjQbLVxmJoy9UV2uMYFbshsrdsmPV84yhTqJcnGmpb6CzVtW4uHAjyk Kb0msAQrkkCw+e8ZvwnJE/4dHA6ZxJvYDhNIgZ7ikUuu9Vk5PZ8dDxh5VKsrvN2q E7cywyax8ClADluymNGmP/GDqQJwBPGTkQLfZlz+HRTCpttmkWKWzZjY72aFgJT9 uA1JUHb/zzH4VUuU4uXyvj4EIQhSmeJmhuE52wIrDs3fWHT2zj4acPCA8jQXL50E 3HviS/3kgeCaFdGuklSSJFPyPo+DTPjd7qTLoMywuIaWIL4QfzatDJu1BKix967Y CIZ98F6faS2r3kpGhj6crSs/8OqM0aChci4pUrQMjLd70CrwJavvAyod9RUiTbnH wBQ6bIz++IkAmM7QDCGstSZWhhKWRd+HOQUjm4V8WPyeLC2doEL8AoWrIKdzeYJS Llow0iJI370m59UKX26eiZMLW6GC9NgPSQSnvWOrBbx/G12VVglrwPhc2zQkvWMC VdzJw0fNZqRTThmVp5yH3Zq3TrwXLJoFkL7DQ9Vx5xtUapGN/iK/sDa5tmuVdlcv QgYtc0ekYVG1TGI2i9EybyK37p2oMQIBmoJQ/soIuoddHcQhriEDSkPjGwQBYFA5 lzWpS/Xp19J4zIlWqpql =IAxX -END PGP SIGNATURE- Changes since sdremote-1.0.0-344: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ddc9d165930f475cbcef21603656835fba7ba35b Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 27 12:40:10 2013 +0100 Bump android remote version to 1.0.6+, version code to 8 Change-Id: Id8585bbc7f44ef59a27271119bdb1df701b9692f diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 0efbc23..23a6c92 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionCode=8 +android:versionName=1.0.6+ Impress Remote android:installLocation=auto uses-permission android:name=android.permission.INTERNET / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4560c49c1e87c6c08d18734fef8d1420e048ad0e Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 27 12:40:10 2013 +0100 Bump android remote version to 1.0.6+, version code to 8 Change-Id: Id8585bbc7f44ef59a27271119bdb1df701b9692f diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index d1d53df..d279fbb 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote -android:versionCode=7 -android:versionName=1.0.5+ Impress Remote +android:versionCode=8 +android:versionName=1.0.6+ Impress Remote android:installLocation=auto uses-permission android:name=android.permission.INTERNET / ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please just tell people to do './logerrit setup' to get started, also: gerrit draft changes
On 26/03/13 14:52, Bjoern Michaelsen wrote: with: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=646b992ee306f83fa7175cc957cba9dc2277155a There's a typo of $GERRIUSER for $GERRITUSER in there by the look of it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sccomp/source
sccomp/source/solver/solver.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6a6aa4b9249027a168db42ccff877e34e44d3872 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 12:50:44 2013 +0100 Missing #include sal/config.h Change-Id: I5223b11089d038d5c3f6c086432a6b2a8fd119c8 diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index a20b24b..7ff43b1 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -26,6 +26,8 @@ * / +#include sal/config.h + #undef LANGUAGE_NONE #if defined SAL_W32 #define WINAPI __stdcall ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/accimplaccess.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 787bdc61ddf169c562002ecfe07025c1b8e8a2ef
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 27 12:55:05 2013 +0100
-Werror=unused-macros
Change-Id: I8548078dd6b9fc3555bfb5e23a683879ee3de3fa
diff --git a/comphelper/source/misc/accimplaccess.cxx
b/comphelper/source/misc/accimplaccess.cxx
index f70fa54..32e4cec 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -30,9 +30,6 @@ namespace comphelper
{
//.
-#define BITFIELDSIZE( sizeof( sal_Int64 ) * 8 )
-// maximum number of bits we have in a sal_Int64
-
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Exception;
@@ -89,7 +86,7 @@ namespace comphelper
//-
void OAccessibleImplementationAccess::setStateBit( const sal_Int16
_nState, const sal_Bool _bSet )
{
-OSL_ENSURE( _nState = 0 static_cast sal_uInt16 (_nState)
BITFIELDSIZE, OAccessibleImplementationAccess::setStateBit: no more bits
(shutting down the universe now)! );
+OSL_ENSURE( _nState = 0 static_cast sal_uInt16 (_nState)
sizeof( sal_Int64 ) * 8, OAccessibleImplementationAccess::setStateBit: no more
bits (shutting down the universe now)! );
sal_uInt64 nBitMask( 1 );
nBitMask = _nState;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/check/updatecheckconfig.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit cdf0f6cf2b157ee187a74b786813e1d3dff9fd2b Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 12:57:15 2013 +0100 -Werror,-Wunused-macros Change-Id: I4df79952596b267a0e744a2b9a11a1e128624e74 diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index f72b022..8f0de9a 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -46,7 +46,6 @@ namespace util = com::sun::star::util ; namespace uno = com::sun::star::uno ; #define LAST_CHECK LastCheck -#define VERSION_FOUND UpdateVersionFound #define UPDATE_VERSION UpdateVersion #define UPDATE_BUILDID UpdateBuildId #define UPDATE_DESCRIPTION UpdateDescription ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 83 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx |5 -
2 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit ea8602bd116198aa076903d9b6ad91cfa96d0464
Author: Maxime de Roucy mdero...@linagora.com
Date: Mon Mar 25 16:33:55 2013 +0100
solve fdo#62805
move m_pCurrentBuffer to RTFParserState
Change-Id: Ied16ee1704d35c6bd0368b26a210131b60bc91a3
Reviewed-on: https://gerrit.libreoffice.org/3082
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 47d2af1..d057a67 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -255,7 +255,6 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_aTableBuffer(),
m_aSuperBuffer(),
m_aShapetextBuffer(),
-m_pCurrentBuffer(0),
m_bHasFootnote(false),
m_pSuperstream(0),
m_nHeaderFooterPositions(),
@@ -438,7 +437,7 @@ void RTFDocumentImpl::checkNeedPap()
if (m_bNeedPap)
{
m_bNeedPap = false; // reset early, so we can avoid recursion when
calling ourselves
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const
pParagraphProperties(
getProperties(m_aStates.top().aParagraphAttributes,
m_aStates.top().aParagraphSprms)
@@ -466,14 +465,14 @@ void RTFDocumentImpl::checkNeedPap()
else
{
RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aParagraphAttributes,
m_aStates.top().aParagraphSprms));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
}
}
void RTFDocumentImpl::runProps()
{
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const pProperties =
getProperties(m_aStates.top().aCharacterAttributes,
m_aStates.top().aCharacterSprms);
Mapper().props(pProperties);
@@ -481,7 +480,7 @@ void RTFDocumentImpl::runProps()
else
{
RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aCharacterAttributes,
m_aStates.top().aCharacterSprms));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
}
@@ -840,7 +839,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
}
writerfilter::ReferenceProperties::Pointer_t const pProperties(new
RTFReferenceProperties(aAttributes, aSprms));
checkFirstRun();
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
Mapper().props(pProperties);
// Make sure we don't loose these properties with a too early reset.
@@ -849,7 +848,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
else
{
RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
return 0;
}
@@ -949,7 +948,7 @@ bool RTFFrame::inFrame()
void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
{
sal_uInt8 sValue[] = { nValue };
-if (!m_pCurrentBuffer)
+if (!m_aStates.top().pCurrentBuffer)
{
Mapper().startCharacterGroup();
// Should we send run properties?
@@ -960,10 +959,10 @@ void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool
bRunProps)
}
else
{
-m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
RTFValue::Pointer_t pValue(new RTFValue(*sValue));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue));
-m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_TEXT,
pValue));
+m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
}
}
@@ -1110,31 +1109,31 @@ void RTFDocumentImpl::text(OUString rString)
return;
}
-if (!m_pCurrentBuffer m_aStates.top().nDestinationState !=
DESTINATION_FOOTNOTE)
+if (!m_aStates.top().pCurrentBuffer m_aStates.top().nDestinationState
!= DESTINATION_FOOTNOTE)
Mapper().startCharacterGroup();
-else if (m_pCurrentBuffer)
+else if (m_aStates.top().pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
-m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, pValue));
+
[PUSHED] solve fdo#62805
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3082 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3082 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied16ee1704d35c6bd0368b26a210131b60bc91a3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 39 +
1 file changed, 27 insertions(+), 12 deletions(-)
New commits:
commit 8c9b05685ff32b309e3447f2030c86e6a1ab9293
Author: Maxime de Roucy mdero...@linagora.com
Date: Mon Mar 25 16:40:37 2013 +0100
minor update in rtfdocumentimpl.cxx
Change-Id: Ie32166edbc3efb603ccb5e98d8c2cac66ecc2f47
Reviewed-on: https://gerrit.libreoffice.org/3083
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d057a67..27ca5de 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -839,6 +839,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
}
writerfilter::ReferenceProperties::Pointer_t const pProperties(new
RTFReferenceProperties(aAttributes, aSprms));
checkFirstRun();
+
if (!m_aStates.top().pCurrentBuffer)
{
Mapper().props(pProperties);
@@ -850,6 +851,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_PROPS,
pValue));
}
+
return 0;
}
@@ -948,7 +950,9 @@ bool RTFFrame::inFrame()
void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
{
sal_uInt8 sValue[] = { nValue };
-if (!m_aStates.top().pCurrentBuffer)
+RTFBuffer_t* pCurrentBuffer = m_aStates.top().pCurrentBuffer;
+
+if (!pCurrentBuffer)
{
Mapper().startCharacterGroup();
// Should we send run properties?
@@ -959,10 +963,10 @@ void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool
bRunProps)
}
else
{
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
+pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
RTFValue::Pointer_t()));
RTFValue::Pointer_t pValue(new RTFValue(*sValue));
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_TEXT,
pValue));
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
+pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
RTFValue::Pointer_t()));
}
}
@@ -1109,31 +1113,37 @@ void RTFDocumentImpl::text(OUString rString)
return;
}
-if (!m_aStates.top().pCurrentBuffer m_aStates.top().nDestinationState
!= DESTINATION_FOOTNOTE)
+RTFBuffer_t* pCurrentBuffer = m_aStates.top().pCurrentBuffer;
+
+if (!pCurrentBuffer m_aStates.top().nDestinationState !=
DESTINATION_FOOTNOTE)
Mapper().startCharacterGroup();
-else if (m_aStates.top().pCurrentBuffer)
+else if (pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN,
pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, pValue));
}
+
if (m_aStates.top().nDestinationState == DESTINATION_NORMAL
|| m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT
|| m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT)
runProps();
-if (!m_aStates.top().pCurrentBuffer)
+
+if (!pCurrentBuffer)
Mapper().utext(reinterpret_castsal_uInt8 const*(rString.getStr()),
rString.getLength());
else
{
RTFValue::Pointer_t pValue(new RTFValue(rString));
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_UTEXT,
pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_UTEXT, pValue));
}
+
m_bNeedCr = true;
-if (!m_aStates.top().pCurrentBuffer m_aStates.top().nDestinationState
!= DESTINATION_FOOTNOTE)
+
+if (!pCurrentBuffer m_aStates.top().nDestinationState !=
DESTINATION_FOOTNOTE)
Mapper().endCharacterGroup();
-else if(m_aStates.top().pCurrentBuffer)
+else if(pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
-m_aStates.top().pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN,
pValue));
+pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, pValue));
}
}
@@ -2380,6 +2390,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
{
if (!m_aStates.top().pCurrentBuffer)
m_aStates.top().pCurrentBuffer = m_aSuperBuffer;
+
RTFValue::Pointer_t pValue(new RTFValue(superscript));
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_RPrBase_vertAlign, pValue);
}
@@ -2716,12 +2727,14 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_POSY: nId = NS_ooxml::LN_CT_FramePr_y;
m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, 0); break;
default: break;
}
+
if (nId 0)
{
m_bNeedPap =
[Libreoffice-commits] core.git: wizards/com wizards/Pyuno_web.mk
wizards/Pyuno_web.mk| 80 +++ wizards/com/sun/star/wizards/web/WebConfigSet.py| 209 wizards/com/sun/star/wizards/web/data/CGContent.py |6 wizards/com/sun/star/wizards/web/data/CGExporter.py |4 wizards/com/sun/star/wizards/web/data/CGSession.py |6 wizards/com/sun/star/wizards/web/data/CGSettings.py | 18 - 6 files changed, 306 insertions(+), 17 deletions(-) New commits: commit 6db890bfbb4cc86d0963599b70033b4eb32ff154 Author: Javier Fernandez jfernan...@igalia.com Date: Fri Mar 8 12:56:16 2013 + Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b diff --git a/wizards/Pyuno_web.mk b/wizards/Pyuno_web.mk new file mode 100644 index 000..93b312f --- /dev/null +++ b/wizards/Pyuno_web.mk @@ -0,0 +1,80 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Pyuno_Pyuno,web,$(SRCDIR)/wizards/com/sun/star/wizards/web)) + +$(eval $(call gb_Pyuno_add_files,web,\ + CallWizard.py \ + BackgroundsDialog.py \ + ErrorHandler.py \ + AbstractErrorHandler.py \ + FTPDialog.py \ + FTPDialogResources.py \ + IconsDialog.py \ + ImageListDialog.py \ + LogTaskListener.py \ + Process.py \ + ProcessErrorHandler.py \ + ProcessErrors.py \ + ProcessStatusRenderer.py \ + StatusDialog.py \ + StylePreview.py \ + TOCPreview.py \ + WWD_Events.py \ + WWD_General.py \ + WWD_Startup.py \ + WWHID.py \ + WebWizard.py \ + WebWizardConst.py \ + WebWizardDialog.py \ + WebWizardDialogResources.py \ + TypeDetection.py \ + ExtensionVerifier.py\ + WebConfigSet.py\ + __init__.py \ + data/CGArgument.py \ + data/CGContent.py \ + data/CGDesign.py \ + data/CGDocument.py \ + data/CGExporter.py \ + data/CGFilter.py \ + data/CGGeneralInfo.py \ + data/CGIconSet.py \ + data/CGImage.py \ + data/CGLayout.py \ + data/CGPublish.py \ + data/CGSession.py \ + data/CGSessionName.py \ + data/CGSettings.py \ + data/CGStyle.py\ + data/__init__.py \ + export/Exporter.py \ + export/AbstractExporter.py \ + export/CopyExporter.py \ + export/__init__.py \ +)) +$(eval $(call gb_Pyuno_set_componentfile_full,web,wizards/com/sun/star/wizards/web/web,vnd.openoffice.pymodule:wizards.web,.CallWizard)) diff --git a/wizards/com/sun/star/wizards/web/WebConfigSet.py b/wizards/com/sun/star/wizards/web/WebConfigSet.py new file mode 100644 index 000..88b49f2 --- /dev/null +++ b/wizards/com/sun/star/wizards/web/WebConfigSet.py @@ -0,0 +1,209 @@ +# +# 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 . +# +import traceback +from ..common.ConfigGroup import ConfigGroup +from ..common.Configuration import Configuration +from ..common.XMLProvider import XMLProvider + +class WebConfigSet(ConfigGroup): +''' +After reading the configuration set items, +the ConfigSet
[PUSHED] minor update in rtfdocumentimpl.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3083 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3083 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie32166edbc3efb603ccb5e98d8c2cac66ecc2f47 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Ugly Hack: using our own WebConfigSet while the Topic stuff ...
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3028 to look at the new patch set (#3). Change subject: Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. .. Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b --- A wizards/Pyuno_web.mk A wizards/com/sun/star/wizards/web/WebConfigSet.py M wizards/com/sun/star/wizards/web/data/CGContent.py M wizards/com/sun/star/wizards/web/data/CGExporter.py M wizards/com/sun/star/wizards/web/data/CGSession.py M wizards/com/sun/star/wizards/web/data/CGSettings.py 6 files changed, 306 insertions(+), 17 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/3028/3 -- To view, visit https://gerrit.libreoffice.org/3028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Javier Fernandez javier@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Ugly Hack: using our own WebConfigSet while the Topic stuff ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3028 -- To view, visit https://gerrit.libreoffice.org/3028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Javier Fernandez javier@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source
drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx |6
drawinglayer/source/attribute/fillhatchattribute.cxx | 85
++
2 files changed, 27 insertions(+), 64 deletions(-)
New commits:
commit 63da9d632827e7d08450dfd72bdcdfbed9c73cae
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Mar 27 03:41:13 2013 +0100
fdo#62525: use cow_wrapper for FillHatchAttribute
Change-Id: I1581b4bca6f14bd27af12ff40a4f4c0fe08af133
Reviewed-on: https://gerrit.libreoffice.org/3073
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
index dc2665b..7e6244b 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -55,8 +56,11 @@ namespace drawinglayer
{
class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFillHatchAttribute ImplType;
+
private:
-ImpFillHatchAttribute* mpFillHatchAttribute;
+ImplType mpFillHatchAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx
b/drawinglayer/source/attribute/fillhatchattribute.cxx
index d3d86ee..e89628b 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -19,6 +19,7 @@
#include drawinglayer/attribute/fillhatchattribute.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -29,9 +30,6 @@ namespace drawinglayer
class ImpFillHatchAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// data definitions
HatchStyle meStyle;
double mfDistance;
@@ -47,8 +45,7 @@ namespace drawinglayer
double fAngle,
const basegfx::BColor rColor,
bool bFillBackground)
-: mnRefCount(0),
-meStyle(eStyle),
+: meStyle(eStyle),
mfDistance(fDistance),
mfAngle(fAngle),
maColor(rColor),
@@ -56,6 +53,15 @@ namespace drawinglayer
{
}
+ImpFillHatchAttribute()
+: meStyle(HATCHSTYLE_SINGLE),
+mfDistance(0.0),
+mfAngle(0.0),
+maColor(basegfx::BColor()),
+mbFillBackground(false)
+{
+}
+
// data read access
HatchStyle getStyle() const { return meStyle; }
double getDistance() const { return mfDistance; }
@@ -71,100 +77,53 @@ namespace drawinglayer
getColor() == rCandidate.getColor()
isFillBackground() == rCandidate.isFillBackground());
}
-
-static ImpFillHatchAttribute* get_global_default()
-{
-static ImpFillHatchAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFillHatchAttribute(
-HATCHSTYLE_SINGLE,
-0.0, 0.0,
-basegfx::BColor(),
-false);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FillHatchAttribute::ImplType,
theGlobalDefault {};
+}
+
FillHatchAttribute::FillHatchAttribute(
HatchStyle eStyle,
double fDistance,
double fAngle,
const basegfx::BColor rColor,
bool bFillBackground)
-: mpFillHatchAttribute(new ImpFillHatchAttribute(
+: mpFillHatchAttribute(ImpFillHatchAttribute(
eStyle, fDistance, fAngle, rColor, bFillBackground))
{
}
FillHatchAttribute::FillHatchAttribute()
-: mpFillHatchAttribute(ImpFillHatchAttribute::get_global_default())
+: mpFillHatchAttribute(theGlobalDefault::get())
{
-mpFillHatchAttribute-mnRefCount++;
}
[PATCH libreoffice-4-0] Templates Manager: merged the Double Click Handling into Tem...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3087
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3087/1
Templates Manager: merged the Double Click Handling into TemplateAbstractView
(cherry picked from commit 8a2bfe697bf71c8a2ca3c6ba1ef5e6324d4163aa)
Conflicts:
sfx2/inc/sfx2/templateview.hxx
sfx2/source/control/templateabstractview.cxx
sfx2/source/control/templatelocalview.cxx
sfx2/source/control/templateview.cxx
Change-Id: Iafc1650d57d29fbc24921498f18da6c0e510b37a
---
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/templateremoteview.hxx
M sfx2/inc/sfx2/templateview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateremoteview.cxx
M sfx2/source/control/templateview.cxx
M sfx2/source/doc/templatedlg.cxx
9 files changed, 39 insertions(+), 68 deletions(-)
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx
b/sfx2/inc/sfx2/templateabstractview.hxx
index ca51181..a5fef71 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -87,7 +87,7 @@
virtual void filterTemplatesByApp (const FILTER_APPLICATION eApp);
-virtual void showOverlay (bool bVisible) = 0;
+void showOverlay (bool bVisible);
void setItemDimensions (long ItemWidth, long ThumbnailHeight, long
DisplayHeight, int itemPadding);
@@ -109,7 +109,7 @@
void setOverlayItemStateHdl (const Link aLink) { maOverlayItemStateHdl =
aLink; }
-void setOverlayDblClickHdl (const Link rLink);
+void setOpenHdl (const Link rLink);
void setOverlayCloseHdl (const Link rLink);
@@ -127,10 +127,13 @@
DECL_LINK(OverlayItemStateHdl, const ThumbnailViewItem*);
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
protected:
TemplateView *mpItemView;
Link maOverlayItemStateHdl;
+Link maOpenHdl;
bool mbFilteredResults; // Flag keep track if overlay has been
filtered so folders can get filtered too afterwards
FILTER_APPLICATION meFilterOption;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index 78cf547..432b008 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -39,8 +39,6 @@
std::vectorOUString getFolderNames ();
-virtual void showOverlay (bool bVisible);
-
std::vectorTemplateItemProperties
getFilteredItems (const boost::functionbool (const
TemplateItemProperties) rFunc) const;
@@ -72,10 +70,6 @@
bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString
rName) const;
virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
-
-private:
-
-virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
private:
diff --git a/sfx2/inc/sfx2/templateremoteview.hxx
b/sfx2/inc/sfx2/templateremoteview.hxx
index bd1bf5c..b760f00 100644
--- a/sfx2/inc/sfx2/templateremoteview.hxx
+++ b/sfx2/inc/sfx2/templateremoteview.hxx
@@ -25,8 +25,6 @@
virtual ~TemplateRemoteView ();
-virtual void showOverlay (bool bVisible);
-
bool loadRepository (TemplateRepository* pRepository, bool bRefresh);
private:
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index e219905..aaa7334 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -36,26 +36,28 @@
void InsertItems (const std::vectorTemplateItemProperties rTemplates);
-void setDblClickHdl (const Link rLink) { maDblClickHdl = rLink; }
-
void setCloseHdl (const Link rLink) { maAllButton.SetClickHdl(rLink); }
void setMasterView(TemplateAbstractView* pMasterView) { mpMasterView =
pMasterView; }
virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+
+
+// FIXME Kept only during the refactoring
+void setOpenHdl (const Link rLink) { maOpenHdl = rLink; }
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem) {
maOpenHdl.Call(pItem); }
protected:
virtual void Resize ();
-virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
-
private:
TemplateAbstractView* mpMasterView;
+
+Link maOpenHdl;
PushButton maAllButton;
FixedText maFTName;
sal_uInt16 mnId;
OUString maName;
-Link maDblClickHdl;
};
#endif // TEMPLATEVIEW_HXX
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index 14ab811..43efcbb 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -217,9 +217,10 @@
mpItemView-filterItems(ViewFilter_Keyword(rKeyword));
}
-void TemplateAbstractView::setOverlayDblClickHdl(const Link rLink)
+void TemplateAbstractView::setOpenHdl(const Link rLink)
{
-mpItemView-setDblClickHdl(rLink);
+
[PATCH libreoffice-4-0] Deselect thumbnailview items when clearing the view.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3089
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3089/1
Deselect thumbnailview items when clearing the view.
Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34
(cherry picked from commit 1c9f13f921cb5bf955b8568ffb5d14047738eef9)
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 10 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index ca685cc..b3b1251 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -114,6 +114,16 @@
for ( size_t i = 0; i n; ++i )
{
ThumbnailViewItem *const pItem = mItemList[i];
+
+// deselect all current selected items and fire events
+if (pItem-isSelected())
+{
+pItem-setSelection(false);
+maItemStateHdl.Call(pItem);
+
+// fire accessible event???
+}
+
if ( pItem-isVisible() ImplHasAccessibleListeners() )
{
::com::sun::star::uno::Any aOldAny, aNewAny;
--
To view, visit https://gerrit.libreoffice.org/3089
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Fix template manager item selection behaviour with mouse.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3090
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3090/1
Fix template manager item selection behaviour with mouse.
Change-Id: Icf63454973b403eea1cc583fce3a78c5594d
(cherry picked from commit 28d5ced7f9982257d263ffc3e550bd479a9542f8)
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index b3b1251..8b2840d 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -609,15 +609,22 @@
{
if ( rMEvt.GetClicks() == 1 )
{
-if (pItem-isSelected() rMEvt.IsMod1())
-pItem-setSelection(false);
+if (rMEvt.IsMod1())
+{
+//Keep selected item group state and just invert current
desired one state
+pItem-setSelection(!pItem-isSelected());
+}
else
{
-if (!pItem-isSelected() !rMEvt.IsMod1())
-deselectItems( );
-
+//If we got a group of selected items deselect the rest
and only keep the desired one
+//mark items as not selected to not fire unnecessary
change state events.
+pItem-setSelection(false);
+deselectItems();
pItem-setSelection(true);
+}
+if (pItem-isSelected())
+{
bool bClickOnTitle =
pItem-getTextArea().IsInside(rMEvt.GetPosPixel());
pItem-setEditTitle(bClickOnTitle);
}
@@ -626,13 +633,11 @@
DrawItem(pItem);
maItemStateHdl.Call(pItem);
+
+//fire accessible event??
}
else if ( rMEvt.GetClicks() == 2 )
{
-// The mouse button down event 1 click right before is
pointless
-pItem-setSelection(false);
-maItemStateHdl.Call(pItem);
-
Rectangle aRect(pItem-getDrawArea());
if (aRect.IsInside(rMEvt.GetPosPixel()))
--
To view, visit https://gerrit.libreoffice.org/3090
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf63454973b403eea1cc583fce3a78c5594d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Syncronize thumbnails ids with SfxDocumentTemplates when mov...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3091
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3091/1
Syncronize thumbnails ids with SfxDocumentTemplates when moving.
Change-Id: I9ee17e00f769ca16f566b1397d09b76a09273912
(cherry picked from commit dda5fe60ff6dfd61f5f262c61e1d538d20e9c978)
---
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/templatedlg.cxx
3 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index 3bcacc4..68b7dc7 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -56,9 +56,9 @@
bool removeTemplate (const sal_uInt16 nItemId, const sal_uInt16
nSrcItemId);
bool moveTemplate (const ThumbnailViewItem* pItem, const sal_uInt16
nSrcItem,
- const sal_uInt16 nTargetItem, bool bCopy);
+ const sal_uInt16 nTargetItem);
-bool moveTemplates (const std::setconst
ThumbnailViewItem*,selection_cmp_fn rItems, const sal_uInt16 nTargetItem,
bool bCopy);
+bool moveTemplates (const std::setconst
ThumbnailViewItem*,selection_cmp_fn rItems, const sal_uInt16 nTargetItem);
bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx rThumbnail,
const OUString rPath);
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index ab55ca4..429b4dc 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -289,11 +289,8 @@
}
bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const
sal_uInt16 nSrcItem,
- const sal_uInt16 nTargetItem, bool
bCopy)
+ const sal_uInt16 nTargetItem)
{
-bool bRet = true;
-bool bRefresh = false;
-
TemplateContainerItem *pTarget = NULL;
TemplateContainerItem *pSrc = NULL;
@@ -313,16 +310,13 @@
const TemplateViewItem *pViewItem = static_castconst
TemplateViewItem*(pItem);
-bool bOK;
+bool bCopy =
!mpDocTemplates-Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnDocId);
if (bCopy)
-bOK =
mpDocTemplates-Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnId-1);
-else
-bOK =
mpDocTemplates-Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnId-1);
-
-if (!bOK)
-return false;
-
+{
+if
(!mpDocTemplates-Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnDocId))
+return false;
+}
// move template to destination
TemplateItemProperties aTemplateItem;
@@ -340,37 +334,45 @@
// remove template from region cached data
std::vectorTemplateItemProperties::iterator aIter;
-for (aIter = pSrc-maTemplates.begin(); aIter !=
pSrc-maTemplates.end(); ++aIter)
+for (aIter = pSrc-maTemplates.begin(); aIter !=
pSrc-maTemplates.end();)
{
-if (aIter-nId == pViewItem-mnId)
+if (aIter-nDocId == pViewItem-mnDocId)
{
-pSrc-maTemplates.erase(aIter);
-
-RemoveItem(pViewItem-mnId);
-break;
+aIter = pSrc-maTemplates.erase(aIter);
}
+else
+{
+// Keep region document id syncronized with
SfxDocumentTemplates
+if (aIter-nDocId pViewItem-mnDocId)
+--aIter-nDocId;
+
+++aIter;
+}
+}
+
+// Keep view document id syncronized with SfxDocumentTemplates
+std::vectorThumbnailViewItem*::iterator pItemIter =
mItemList.begin();
+for (; pItemIter != mItemList.end(); ++pItemIter)
+{
+if (static_castTemplateViewItem*(*pItemIter)-mnDocId
pViewItem-mnDocId)
+--static_castTemplateViewItem*(*pItemIter)-mnDocId;
}
}
-bRefresh = true;
-}
-else
-bRet = false;
-
-if (bRefresh)
-{
lcl_updateThumbnails(pSrc);
lcl_updateThumbnails(pTarget);
CalculateItemPositions();
Invalidate();
+
+return true;
}
-return bRet;
+return false;
}
bool TemplateLocalView::moveTemplates(const std::setconst ThumbnailViewItem*,
selection_cmp_fn rItems,
- const sal_uInt16 nTargetItem, bool bCopy)
+ const sal_uInt16 nTargetItem)
{
bool ret = true;
bool refresh = false;
@@ -400,17 +402,15 @@
{
const TemplateViewItem *pViewItem = static_castconst
TemplateViewItem*(*aSelIter);
-bool bOK;
+
[PUSHED] fdo#62525: use cow_wrapper for FillHatchAttribute
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3073 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3073 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1581b4bca6f14bd27af12ff40a4f4c0fe08af133 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 44 +++--
1 file changed, 21 insertions(+), 23 deletions(-)
New commits:
commit 0bca4ccd54263bdef3722d96fe98760a5966c2f4
Author: Maxime de Roucy mdero...@linagora.com
Date: Mon Mar 25 19:34:43 2013 +0100
use of aState instead of m_aStates.top in popState
Change-Id: I6814e48a92a1b24823c6884a151aa6a139410ff2
Reviewed-on: https://gerrit.libreoffice.org/3085
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 29d87c9..26110ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -209,10 +209,10 @@ static const char* lcl_RtfToString(RTFKeyword nKeyword)
return NULL;
}
-static util::DateTime lcl_getDateTime(std::stackRTFParserState aStates)
+static util::DateTime lcl_getDateTime(RTFParserState aState)
{
-return util::DateTime(0 /*100sec*/, 0 /*sec*/, aStates.top().nMinute,
aStates.top().nHour,
-aStates.top().nDay, aStates.top().nMonth, aStates.top().nYear);
+return util::DateTime(0 /*100sec*/, 0 /*sec*/, aState.nMinute,
aState.nHour,
+aState.nDay, aState.nMonth, aState.nYear);
}
static void lcl_DestinationToMath(OUStringBuffer rDestinationText,
oox::formulaimport::XmlStreamBuilder rMathBuffer)
@@ -3828,12 +3828,12 @@ int RTFDocumentImpl::popState()
sal_Int32 nReplaces = 1;
for (int i = 0; i aOrig.getLength(); i++)
{
-if (std::find(m_aStates.top().aLevelNumbers.begin(),
m_aStates.top().aLevelNumbers.end(), i+1)
-!= m_aStates.top().aLevelNumbers.end())
+if (std::find(aState.aLevelNumbers.begin(),
aState.aLevelNumbers.end(), i+1)
+!= aState.aLevelNumbers.end())
{
aBuf.append(sal_Unicode('%'));
// '1.1.1' - '%1.%2.%3', but '1.' (with '2.' prefix
omitted) is %2.
-aBuf.append(sal_Int32(nReplaces++ +
m_aStates.top().nListLevelNum + 1 - m_aStates.top().aLevelNumbers.size()));
+aBuf.append(sal_Int32(nReplaces++ +
aState.nListLevelNum + 1 - aState.aLevelNumbers.size()));
}
else
aBuf.append(aOrig.copy(i, 1));
@@ -3843,14 +3843,11 @@ int RTFDocumentImpl::popState()
}
break;
case DESTINATION_SHAPEPROPERTYNAME:
+
aState.aShape.aProperties.push_back(make_pair(m_aStates.top().aDestinationText.makeStringAndClear(),
OUString()));
+break;
case DESTINATION_SHAPEPROPERTYVALUE:
-case DESTINATION_SHAPEPROPERTY:
-{
-if (m_aStates.top().nDestinationState ==
DESTINATION_SHAPEPROPERTYNAME)
-
aState.aShape.aProperties.push_back(make_pair(m_aStates.top().aDestinationText.makeStringAndClear(),
OUString()));
-else if (m_aStates.top().nDestinationState ==
DESTINATION_SHAPEPROPERTYVALUE aState.aShape.aProperties.size())
-aState.aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
-}
+if (aState.aShape.aProperties.size())
+aState.aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
break;
case DESTINATION_PICPROP:
case DESTINATION_SHAPEINSTRUCTION:
@@ -3885,7 +3882,7 @@ int RTFDocumentImpl::popState()
break;
case DESTINATION_DATAFIELD:
{
-OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
m_aStates.top().nCurrentEncoding);
+OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
aState.nCurrentEncoding);
// decode hex dump
OStringBuffer aBuf;
const char *str = aStr.getStr();
@@ -3922,9 +3919,9 @@ int RTFDocumentImpl::popState()
nLength = aStr.toChar();
aStr = aStr.copy(1);
OString aDefaultText = aStr.copy(0, nLength);
-RTFValue::Pointer_t pNValue(new
RTFValue(OStringToOUString(aName, m_aStates.top().nCurrentEncoding)));
+RTFValue::Pointer_t pNValue(new
RTFValue(OStringToOUString(aName, aState.nCurrentEncoding)));
m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFData_name, pNValue);
-RTFValue::Pointer_t pDValue(new
RTFValue(OStringToOUString(aDefaultText, m_aStates.top().nCurrentEncoding)));
+RTFValue::Pointer_t pDValue(new
RTFValue(OStringToOUString(aDefaultText, aState.nCurrentEncoding)));
[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source
drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx |6
drawinglayer/source/attribute/fontattribute.cxx | 89 --
2 files changed, 32 insertions(+), 63 deletions(-)
New commits:
commit 32ec7666596b2a0f27c72f9d856e2ec0f0545f6b
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Mar 27 03:51:53 2013 +0100
fdo#62525: use cow_wrapper for FontAttribute
Change-Id: Ic07da7c7cf225a910e6f0fa4f6d20c4700e7ec7a
diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
index 36686fe..b49ab83 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -44,8 +45,11 @@ namespace drawinglayer
*/
class DRAWINGLAYER_DLLPUBLIC FontAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFontAttribute ImplType;
+
private:
-ImpFontAttribute* mpFontAttribute;
+ImplType mpFontAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fontattribute.cxx
b/drawinglayer/source/attribute/fontattribute.cxx
index 627fb6c..7f4316f 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -18,6 +18,7 @@
*/
#include drawinglayer/attribute/fontattribute.hxx
+#include rtl/instance.hxx
#include tools/string.hxx
//
@@ -29,9 +30,6 @@ namespace drawinglayer
class ImpFontAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
/// core data
String maFamilyName; //
Font Family Name
String maStyleName;//
Font Style Name
@@ -57,8 +55,7 @@ namespace drawinglayer
bool bOutline,
bool bRTL,
bool bBiDiStrong)
-: mnRefCount(0),
-maFamilyName(rFamilyName),
+: maFamilyName(rFamilyName),
maStyleName(rStyleName),
mnWeight(nWeight),
mbSymbol(bSymbol),
@@ -71,6 +68,20 @@ namespace drawinglayer
{
}
+ImpFontAttribute()
+: maFamilyName(),
+maStyleName(),
+mnWeight(0),
+mbSymbol(false),
+mbVertical(false),
+mbItalic(false),
+mbOutline(false),
+mbRTL(false),
+mbBiDiStrong(false),
+mbMonospaced(false)
+{
+}
+
// data read access
const String getFamilyName() const { return maFamilyName; }
const String getStyleName() const { return maStyleName; }
@@ -96,26 +107,14 @@ namespace drawinglayer
getBiDiStrong() == rCompare.getBiDiStrong()
getMonospaced() == rCompare.getMonospaced());
}
-
-static ImpFontAttribute* get_global_default()
-{
-static ImpFontAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFontAttribute(
-String(), String(),
-0,
-false, false, false, false, false, false, false);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FontAttribute::ImplType, theGlobalDefault
{};
+}
+
FontAttribute::FontAttribute(
const String rFamilyName,
const String rStyleName,
@@ -127,73 +126,39 @@ namespace drawinglayer
bool bOutline,
bool bRTL,
bool bBiDiStrong)
-: mpFontAttribute(new ImpFontAttribute(
+: mpFontAttribute(ImpFontAttribute(
rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic,
bMonospaced, bOutline, bRTL, bBiDiStrong))
{
}
FontAttribute::FontAttribute()
-: mpFontAttribute(ImpFontAttribute::get_global_default())
+: mpFontAttribute(theGlobalDefault::get())
{
-mpFontAttribute-mnRefCount++;
}
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/data/fdo62805.rtf | 21 +
sw/qa/extras/rtfimport/rtfimport.cxx | 12 +---
2 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit 54b5973ded864634b70e3ec45200beaf1d13cb53
Author: Maxime de Roucy mdero...@linagora.com
Date: Wed Mar 27 12:09:32 2013 +0100
unit test for fdo#62805
Change-Id: Iebc1a63496aaf54b9e459d0ed53db5cae49929ac
Reviewed-on: https://gerrit.libreoffice.org/3086
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/qa/extras/rtfimport/data/fdo62805.rtf
b/sw/qa/extras/rtfimport/data/fdo62805.rtf
new file mode 100644
index 000..fee2b59
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo62805.rtf
@@ -0,0 +1,21 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset0 Nimbus Roman No9 L{\*\falt Times New
Roman};}{\f4\fswiss\fprq2\fcharset0 Nimbus Sans L{\*\falt
Arial};}{\f5\fnil\fprq2\fcharset0 DejaVu Sans;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1036
Style par d\u233\'e9faut;}
+{\s15\sbasedon0\snext16\sb240\sa120\keepn\dbch\af5\dbch\af5\afs28\loch\f4\fs28
Titre;}
+{\s16\sbasedon0\snext16\sb0\sa120 Corps de texte;}
+{\s17\sbasedon16\snext17\sb0\sa120 Liste;}
+{\s18\sbasedon0\snext18\sb120\sa120\noline\i\afs24\ai\fs24 L\u233\'e9gende;}
+{\s19\sbasedon0\snext19\noline Index;}
+{\s20\sbasedon0\snext20\noline Contenu de tableau;}
+}{\info{\author
test}{\creatim\yr2013\mo3\dy27\hr11\min43}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
LibreOffice}{\vern4000}}\deftab709
+\viewscale110
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse455\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
Style par d\u233\'e9faut;}}
+\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1036{\rtlch
\ltrch\loch
+Test}
+\par
+{\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrhair\brdrw1\brdrcf1\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\clbrdrr\brdrhair\brdrw1\brdrcf1\cellx9638\pard\plain
\s20\noline\intbl{\rtlch \ltrch\loch
+test in cell}\cell\row}
+test\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index a7b1e01..41e829f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -113,7 +113,7 @@ public:
void testFdo52052();
void testInk();
void testFdo52389();
-void testFdo49655();
+void testFdo49655_62805();
void testFdo52475();
void testFdo55493();
void testCopyPastePageStyle();
@@ -232,7 +232,8 @@ void Test::run()
{fdo52052.rtf, Test::testFdo52052},
{ink.rtf, Test::testInk},
{fdo52389.rtf, Test::testFdo52389},
-{fdo49655.rtf, Test::testFdo49655},
+{fdo49655.rtf, Test::testFdo49655_62805},
+{fdo62805.rtf, Test::testFdo49655_62805},
{fdo52475.rtf, Test::testFdo52475},
{fdo55493.rtf, Test::testFdo55493},
{copypaste-pagestyle.rtf, Test::testCopyPastePageStyle},
@@ -861,12 +862,17 @@ void Test::testFdo52389()
CPPUNIT_ASSERT_EQUAL(6, getLength());
}
-void Test::testFdo49655()
+void Test::testFdo49655_62805()
{
/*
+ * 49655 :
* The problem was that the table was not imported due to the ' ' string
in the middle of the table definition.
*
* xray ThisComponent.TextTables.Count 'was 0
+ *
+ * 62805 :
+ * The problem was that the table was not imported due to the absence of
\pard after \row.
+ * The table was instead in a group (the '}' replace the \pard).
*/
uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] reformat of rtfdocumentimpl.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3084 -- To view, visit https://gerrit.libreoffice.org/3084 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If79fc70f5fb8f8e48358048c03a8d39be6b197fb Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#62525: use cow_wrapper for FontAttribute
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3074 -- To view, visit https://gerrit.libreoffice.org/3074 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic07da7c7cf225a910e6f0fa4f6d20c4700e7ec7a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use of aState instead of m_aStates.top in popState
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3085 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3085 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6814e48a92a1b24823c6884a151aa6a139410ff2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] unit test for fdo#62805
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3086 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3086 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iebc1a63496aaf54b9e459d0ed53db5cae49929ac Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: logerrit
logerrit | 105 ---
1 file changed, 8 insertions(+), 97 deletions(-)
New commits:
commit d588e1cf1d751a9937300052c495f4f3ba47695f
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Mar 26 23:26:06 2013 +0100
kill './logerrit review'
- twas more of a proof-of-concept anyway
- its more clumsy than both:
- git-review https://wiki.documentfoundation.org/Development/GitReview
- or simply using the web UI
Change-Id: Id7a11fcdaf95386c451d0e6421d32de7d1d02721
Reviewed-on: https://gerrit.libreoffice.org/3070
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/logerrit b/logerrit
index e09becc..68bf2cc 100755
--- a/logerrit
+++ b/logerrit
@@ -8,29 +8,6 @@ get_SHA_for_change() {
SHA=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep
ref|tail -1|cut -d: -f2`
}
-get_REVISION_for_change() {
-REVISION=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep
revision|tail -1|cut -d: -f2`
-}
-
-ask_tristate() {
-case $1 in
-[yY] | [yY][Ee][Ss] | [+] )
-ANSWER=y
-;;
-[nN] | [n|N][O|o] | [-] )
-ANSWER=n
-;;
-[] )
-ANSWER=
-;;
-* )
-echo Please answer with either +,-,y,n,yes,no or the empty
string.
-exit 1
-;;
-esac
-
-}
-
submit() {
TYPE=$1
BRANCH=$2
@@ -72,7 +49,6 @@ case $1 in
echo pull CHANGEID pull (and merge) the
changes on current branch
echo cherry-pick CHANGEIDcherry-pick the change on
current branch
echo patch CHANGEID show the change as a patch
-echo review [CHANGEID] interactively review a
change (current one if no changeid given)
echo query query for changes for
review on project core
echo any other gerrit command
echo
@@ -163,83 +139,18 @@ case $1 in
fi
git reset --hard remotes/origin/$BRANCH
;;
-review)
-CHANGEID=$2
-if test -z $CHANGEID
-then
-CHANGEID=`git log --format=format:%b -1 HEAD|grep Change-Id|cut
-d: -f2`
-if test -z $CHANGEID
-then
-echo could not find a Change-Id in your last commit, sorry
-exit 1
-fi
-echo no Change-Id given on the command line, reviewing
change$CHANGEID
-fi
-MESSAGEREQ=
-read -p 'was the change verified to build successfully (+) or found
not to build (-) or none of that ()? ' VERIFIED
-ask_tristate $VERIFIED
-case $ANSWER in
-y)
-VERIFIEDFLAG=--verified=+1
-;;
-n)
-VERIFIEDFLAG=--verified=-1
-MESSAGEREQ=$MESSAGEREQ and explain why you could not verify
this
-;;
-*)
-VERIFIEDFLAG=--verified=0
-;;
-
-esac
-read -p 'is the code looking good (+), bad (-) or none of that ()? '
CODEREVIEW
-ask_tristate $CODEREVIEW
-SUBMITFLAG=
-case $ANSWER in
-y)
-read -p 'do you approve the change (+) too, or prefer someone
else to do that ()? ' CODEREVIEW
-ask_tristate $CODEREVIEW
-case $ANSWER in
-y)
-CODEREVIEWFLAG=--code-review=2
-SUBMITFLAG=--submit
-;;
-n)
-CODEREVIEWFLAG=--code-review=1
-;;
-*)
-CODEREVIEWFLAG=--code-review=1
-;;
-esac
-;;
-n)
-read -p 'do you still allow the change to go in () or not (-)?
' CODEREVIEW
-ask_tristate $CODEREVIEW
-case $ANSWER in
-y)
-CODEREVIEWFLAG=--code-review=-1
-MESSAGEREQ=$MESSAGEREQ and explain why you have
reservations about the code
-;;
-n)
-CODEREVIEWFLAG=--code-review=-2
-MESSAGEREQ=$MESSAGEREQ and explain why you want to
block this
-;;
-*)
-CODEREVIEWFLAG=--code-review=-1
-MESSAGEREQ=$MESSAGEREQ and explain why you have
reservations about the code
-;;
-esac
-;;
-*)
-;;
-esac
-read -p please type a friendly comment$MESSAGEREQ: MESSAGE
-get_REVISION_for_change $CHANGEID
-ssh ${GERRITHOST?} gerrit review -m \$MESSAGE\ $VERIFIEDFLAG
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Deliver.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0408f411f2be48717edc92eb71711ea60b4acb28 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Mar 26 01:50:56 2013 -0500 touch --no-dereference is supported on mac but as the short-option -h Change-Id: I63fa0c24317f683b8eb2bc0b7a1b3ab1ea455866 Reviewed-on: https://gerrit.libreoffice.org/3050 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 1e0fef5..febc6aa 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch -hr $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] kill './logerrit review'
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3070 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3070 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7a11fcdaf95386c451d0e6421d32de7d1d02721 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] touch --no-dereference is supported on mac but as the short-...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3050 Approvals: Thorsten Behrens: Verified; Looks good to me, approved Objections: Petr Mladek: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/3050 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63fa0c24317f683b8eb2bc0b7a1b3ab1ea455866 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source svl/inc
sfx2/source/dialog/templdlg.cxx | 54
sfx2/source/inc/templdgi.hxx|2 +
svl/inc/svl/style.hrc |1
3 files changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 5c5b6f1e9e3341726d6870af74912bb9db374b5f
Author: Michael Stahl mst...@redhat.com
Date: Tue Mar 26 11:33:09 2013 +0100
fdo#61429: Stylist: save selection of Hierarchical entry
This is unfortunately rather ugly because that one is very special.
(cherry picked from commit 44dd8b838b8dfa74b895a870a68200cf4f3574e0)
Conflicts:
sfx2/source/dialog/templdlg.cxx
Change-Id: Ie2bc9ce2690fbc742b4510e453ca1ef310614256
Reviewed-on: https://gerrit.libreoffice.org/3056
Reviewed-by: Christoph Brill egore...@gmail.com
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index a81c27d..94e8082 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -753,6 +753,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(
SfxBindings* pB, Sfx
bUpdateByExampleDisabled( sal_False ),
bTreeDrag ( sal_True ),
bHierarchical ( sal_False ),
+m_bWantHierarchical ( sal_False ),
bBindingUpdate ( sal_True )
{
aFmtLb.SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString());
@@ -1278,8 +1279,10 @@ void
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
}
// if the tree view again, select family hierarchy
-if(pTreeBox)
+if (pTreeBox || m_bWantHierarchical)
+{
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
+}
// show maximum 14 entries
aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
@@ -1287,12 +1290,21 @@ void
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
}
else
{
-if( nActFilter aFilterLb.GetEntryCount() - 1)
-aFilterLb.SelectEntryPos(nActFilter + 1);
-else
+if (m_bWantHierarchical)
{
nActFilter = 0;
-aFilterLb.SelectEntryPos(1);
+aFilterLb.SelectEntry(SfxResId(
+STR_STYLE_FILTER_HIERARCHICAL).toString());
+}
+else
+{
+if (nActFilter aFilterLb.GetEntryCount() - 1)
+aFilterLb.SelectEntryPos(nActFilter + 1);
+else
+{
+nActFilter = 0;
+aFilterLb.SelectEntryPos(1);
+}
}
}
@@ -1635,7 +1647,6 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster
/*rBC*/, const SfxHint
//-
-
// Other filters; can be switched by the users or as a result of new or
// editing, if the current document has been assigned a different filter.
void SfxCommonTemplateDialog_Impl::FilterSelect(
@@ -1646,14 +1657,7 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
if( nEntry != nActFilter || bForce )
{
nActFilter = nEntry;
-SfxViewFrame *pViewFrame = pBindings-GetDispatcher_Impl()-GetFrame();
-SfxObjectShell *pDocShell = pViewFrame-GetObjectShell();
-if (pDocShell)
-{
-pDocShell-SetAutoStyleFilterIndex(nActFilter);
-SaveFactoryStyleFilter( pDocShell, nActFilter );
-}
-
+SfxObjectShell *const pDocShell = SaveSelection();
SfxStyleSheetBasePool *pOldStyleSheetPool = pStyleSheetPool;
pStyleSheetPool = pDocShell? pDocShell-GetStyleSheetPool(): 0;
if ( pOldStyleSheetPool != pStyleSheetPool )
@@ -1744,6 +1748,8 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl,
ListBox *, pBox )
{
// Turn on treeView
bHierarchical=sal_True;
+m_bWantHierarchical = sal_True;
+SaveSelection(); // fdo#61429 store hierarchical
const String aSelectEntry( GetSelectedEntry());
aFmtLb.Hide();
@@ -1776,6 +1782,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl,
ListBox *, pBox )
aFmtLb.Show();
// If bHierarchical, then the family can have changed
// minus one since hierarchical is inserted at the start
+m_bWantHierarchical = sal_False; // before FilterSelect
FilterSelect(pBox-GetSelectEntryPos() - 1, bHierarchical );
bHierarchical=sal_False;
}
@@ -1918,6 +1925,10 @@ sal_Int32
SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell*
sal_Int32 nDefault = -1;
nFilter = aFactoryProps.getUnpackedValueOrDefault(
gerrit's mail when adding a reviewer
Just noticed that when I add a reviewer to somebody else's change, gerrit sends a mail taking on my identity (Stephan Bergmann (via Code Review) ger...@gerrit.libreoffice.org) claiming I have submitted a patch for review. But I did not submit anything for review, I merely invited somebody else to also review something. I find that confusing at least. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#61429: Stylist: save selection of Hierarchical entry
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3056 Approvals: Christoph Brill: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3056 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2bc9ce2690fbc742b4510e453ca1ef310614256 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Christoph Brill egore...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/ControlHelper.mm |5 - 1 file changed, 5 deletions(-) New commits: commit 5e55ac273c1093ffb81fbb5d74e4f23eea381d9d Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 13:32:06 2013 +0100 -Werror,-Wunused-macros Change-Id: I8df5248894a91981192e531610dbb8a387483aa1 diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm index ea1a90f..c627d9b 100644 --- a/fpicker/source/aqua/ControlHelper.mm +++ b/fpicker/source/aqua/ControlHelper.mm @@ -750,11 +750,6 @@ case ExtendedFilePickerElementIds::CHECKBOX_##elem: \ pWidget = m_pToggles[elem]; \ break -#define MAP_BUTTON( elem ) \ -case ExtendedFilePickerElementIds::PUSHBUTTON_##elem: \ -pWidget = m_pButtons[elem]; \ -break - #define MAP_LIST( elem ) \ case ExtendedFilePickerElementIds::LISTBOX_##elem: \ pWidget = m_pListControls[elem]; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/tabdlg.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit d0c80826ba22f5adb8e3d88c7ccabe9a3c6267a1
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 27 13:29:10 2013 +0100
sfx2: TabDlg_Impl::pData is deleted twice
(regression from eb69f807c4709a908222cb57b45a8733be663c56)
Change-Id: I1752d60496a572152b571e871db818cf8c9264ed
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 6e13217..41b16d6 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -177,7 +177,8 @@ struct TabDlg_Impl
{}
~TabDlg_Impl()
{
-delete(pData);
+delete pController;
+delete pData;
}
};
@@ -534,8 +535,6 @@ SfxTabDialog::~SfxTabDialog()
delete pDataObject;
}
-delete pImpl-pController;
-delete pImpl-pData;
delete pImpl;
delete pOutSet;
delete pExampleSet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |2 +- android/experimental/LibreOffice4Android/Makefile |2 +- android/experimental/desktop/Makefile |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit de8d12acf122322af8412ef1a90e13fe34fcdbcd Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 14:34:24 2013 +0200 Use proper version numbers Change-Id: Ib0284c3fe63636e42b2e72ab76b02a8197c837e0 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 40fd6dc..9977215 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -77,7 +77,7 @@ copy-stuff: # Set up bootstraprc echo '[Bootstrap]' assets/program/bootstraprc echo 'InstallMode=installmode' assets/program/bootstraprc - echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc + echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' assets/program/bootstraprc echo UserInstallation=file://$(APP_DATA_PATH) assets/program/bootstraprc # # Set up versionrc diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 7984be4..9b1aaa2 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -75,7 +75,7 @@ copy-stuff: # Set up bootstraprc echo '[Bootstrap]' assets/program/bootstraprc echo 'InstallMode=installmode' assets/program/bootstraprc - echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc + echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' assets/program/bootstraprc echo 'UserInstallation=file://$$APP_DATA_DIR' assets/program/bootstraprc # # Set up versionrc diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 273aca6..db35879 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -78,7 +78,7 @@ copy-stuff: # Set up bootstraprc echo '[Bootstrap]' assets/program/bootstraprc echo 'InstallMode=installmode' assets/program/bootstraprc - echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc + echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' assets/program/bootstraprc echo UserInstallation=file://$(APP_DATA_PATH) assets/program/bootstraprc # # Set up versionrc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/SalAquaFilePicker.mm | 28 1 file changed, 28 deletions(-) New commits: commit 3ec3f2fd5f7a4f0e7bd5d43d2cf92a142702a116 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 13:37:37 2013 +0100 -Werror,-Wunused-macros Change-Id: Ia4560cd9726f64d85325c0bb28b7cff9774bc173 diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 8d1d5bc..d1a399f 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -48,12 +48,6 @@ #pragma mark DEFINES -#define LABEL_TOGGLE( elem ) \ -case elem : \ -aLabel = aResProvider.getResString( CHECKBOX_##elem ); \ -setLabel( CHECKBOX_##elem, aLabel ); \ -break - #define CLASS_NAME SalAquaFilePicker // @@ -688,28 +682,6 @@ void SAL_CALL SalAquaFilePicker::dialogSizeChanged() m_xListener-dialogSizeChanged(); } -// - -#define MAP_TOGGLE( elem ) \ -case ExtendedFilePickerElementIds::CHECKBOX_##elem: \ -pWidget = m_pToggles[elem]; \ -break - -#define MAP_BUTTON( elem ) \ -case ExtendedFilePickerElementIds::PUSHBUTTON_##elem: \ -pWidget = m_pButtons[elem]; \ -break -#undef MAP_LIST -#define MAP_LIST( elem ) \ -case ExtendedFilePickerElementIds::LISTBOX_##elem: \ -pWidget = m_pListControls[elem]; if (isAList != NULL) *isAList = sal_True; \ -break - -#define MAP_LIST_LABEL( elem ) \ -case ExtendedFilePickerElementIds::LISTBOX_##elem##_LABEL: \ -pWidget = m_pListControls[elem]; \ -break - //-- // Misc //- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/templatelocalview.cxx |2 +-
sfx2/source/control/templateremoteview.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f5442623090dd535a1a561f1ecfdb09f2dff129b
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 27 13:43:35 2013 +0100
MSC fixes
Change-Id: I5ea1e75a637e8f4fc51ff31321213267669f8bc9
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index ddab413..8c41502 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -397,7 +397,7 @@ bool TemplateLocalView::moveTemplates(const std::setconst
ThumbnailViewItem*, s
sal_uInt16 nTargetIdx = mpDocTemplates-GetCount(nTargetRegion);//
Next Idx
std::vectorsal_uInt16 aItemIds;// List of moved items ids (also
prevents the invalidation of rItems iterators when we remove them as we go)
-std::setconst ThumbnailViewItem*,selection_cmp_fn::iterator aSelIter;
+std::setconst ThumbnailViewItem*,selection_cmp_fn::const_iterator
aSelIter;
for ( aSelIter = rItems.begin(); aSelIter != rItems.end(); ++aSelIter,
++nTargetIdx )
{
const TemplateViewItem *pViewItem = static_castconst
TemplateViewItem*(*aSelIter);
diff --git a/sfx2/source/control/templateremoteview.cxx
b/sfx2/source/control/templateremoteview.cxx
index bf97393..663ae2b 100644
--- a/sfx2/source/control/templateremoteview.cxx
+++ b/sfx2/source/control/templateremoteview.cxx
@@ -62,7 +62,7 @@ void TemplateRemoteView::showRootRegion()
//TODO:
}
-void TemplateRemoteView::showRegion(ThumbnailViewItem */*pItem*/)
+void TemplateRemoteView::showRegion(ThumbnailViewItem * /*pItem*/)
{
//TODO:
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Fix related to fdo#62224.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3092
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3092/1
Fix related to fdo#62224.
On clicking Cancel Button in Format cells Widget in Impress,
Their is change in Spacing of contents values.
Values should not be changed.
Change-Id: If9395eda7f82f8e25148f906094588480a6a1029
---
M svx/source/table/tablecontroller.cxx
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 1cb3035..4b01ba8 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -73,6 +73,8 @@
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::style;
+#define RTL_OK 1
+
namespace sdr { namespace table {
//
@@ -731,7 +733,8 @@
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
std::auto_ptr SfxAbstractTabDialog pDlg( pFact ?
pFact-CreateSvxFormatCellsDialog( NULL, aNewAttr, pTableObj-GetModel(),
pTableObj) : 0 );
-if( pDlg.get() pDlg-Execute() )
+// On Clicking Cancel button in Format Cells should not change Values.
+if( pDlg.get() ( pDlg-Execute() == RTL_OK ) )
{
SfxItemSet aNewSet( *(pDlg-GetOutputItemSet ()) );
--
To view, visit https://gerrit.libreoffice.org/3092
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9395eda7f82f8e25148f906094588480a6a1029
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/inc sw/source
sfx2/inc/sfx2/htmlmode.hxx |1 -
sw/source/filter/html/css1atr.cxx |9 -
sw/source/filter/html/css1kywd.cxx |1 +
sw/source/filter/html/css1kywd.hxx |1 +
sw/source/filter/html/wrthtml.cxx | 14 ++
sw/source/filter/html/wrthtml.hxx |2 +-
sw/source/ui/config/viewopt.cxx|4 ++--
7 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit da45a0e255f77d002c35438e9c2a17fecdde6d81
Author: Harri Pitkänen hatap...@iki.fi
Date: Sat Mar 23 12:10:15 2013 +0200
Remove HTMLMODE_FRM_COLUMNS and export column-count CSS attribute
For multi-column sections in Writer, HTMLMODE_FRM_COLUMNS controlled
whether column settings for the section were exported to html or not.
This was disabled for Internet Explorer and enabled for other browsers.
The export was implemented using non-standard MULTICOL html element
and did not actually work in any modern browser (apparently only
some versions of Netscape have ever supported this). This patch
- exports the column count also using column-count CSS attribute
which is supported by latest versions of Opera and IE. Firefox and
Webkit based browsers would currently require -moz-column-count and
-webkit-column-count but I have not added these since the browsers
will likely stop requiring the prefix in the future anyway.
- removes HTMLMODE_FRM_COLUMNS conditional so that this export will
happen with all html compatibility options, including IE.
Remaining issue: Using the MULTICOL element (as opposed to DIV element)
confuses at least Opera so that it ignores all style attributes applied
on the element. But corresponding html import code in LibreOffice still
relies on MULTICOL. I will work on a separate patch to add support for
column-count CSS attribute to the import code and switch export to use
DIV instead.
Change-Id: I82a065fdda0e074fbfcd0007e6ff6e46185be3f5
Reviewed-on: https://gerrit.libreoffice.org/2950
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index 90af4b2..0ce8e43 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -21,7 +21,6 @@
#define HTMLMODE_ON 0x0001
#define HTMLMODE_PARA_DISTANCE 0x0004
-#define HTMLMODE_FRM_COLUMNS0x0010
#define HTMLMODE_SOME_STYLES0x0020 /* mind. MS IE */
#define HTMLMODE_FULL_STYLES0x0040 /* == SW */
#define HTMLMODE_PARA_BLOCK 0x0100
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 500b66c..1625050 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -57,6 +57,7 @@
#include unotools/charclass.hxx
#include i18npool/languagetag.hxx
#include charfmt.hxx
+#include fmtclds.hxx
#include fmtcol.hxx
#include fmtfsize.hxx
#include fmtornt.hxx
@@ -2271,7 +2272,7 @@ void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrmFmt
const rFrmFmt)
}
}
-void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt rFrmFmt )
+void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt rFrmFmt, const
SwFmtCol *pCol )
{
SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON |
CSS1_OUTMODE_ENCODE|
@@ -2282,6 +2283,12 @@ void SwHTMLWriter::OutCSS1_SectionFmtOptions( const
SwFrmFmt rFrmFmt )
if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, sal_False, pItem
) )
OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_SECTION, 0 );
+if (pCol)
+{
+OString
sColumnCount(OString::number(static_castsal_Int32(pCol-GetNumCols(;
+OutCSS1_PropertyAscii(sCSS1_P_column_count, sColumnCount);
+}
+
if( !bFirstCSS1Property )
Strm() '\';
}
diff --git a/sw/source/filter/html/css1kywd.cxx
b/sw/source/filter/html/css1kywd.cxx
index 4117052..ef3a0eb 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -219,6 +219,7 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_height, height );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_float, float );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_column_count, column-count );
// Strings fuer Positioning
diff --git a/sw/source/filter/html/css1kywd.hxx
b/sw/source/filter/html/css1kywd.hxx
index 0b4bd5d..35a0481 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -229,6 +229,7 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_height,
height );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_float, float );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_column_count, column-count );
// Strings fuer Positioning
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index fc9181d..78f7e7a 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++
Re: Module build broken on master.
On 03/27/2013 08:07 AM, Bjoern Michaelsen wrote: On Tue, Mar 26, 2013 at 05:07:15PM -0400, Kohei Yoshida wrote: So, reverting this commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=207e370a167b7856346c1bff0c735cd2688e2e6e fixes this. Since keeping the module build working is quite important, I'll have to revert this for now. Peter, could you take a second look at this, and hopefully come up with a change that doesn't break module build? seems like lastword - firstword causes the trouble. Any reason for that? I'd fixed that last night, being hit by this in parallel with Kohei but not being aware of this thread, http://cgit.freedesktop.org/libreoffice/core/commit/?id=a13c905f8d9f2e062a1bb3d3882347b47c3359ce Revert 'Revert 'make partial_build work in separate builddir,'' but while that was apparently enough to make the non--separate-builddir case work again, I've no idea whether it is an adequate fix also for the separate-builddir case. So feel free to re^3-vert again... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove HTMLMODE_FRM_COLUMNS and export column-count CSS attr...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2950 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2950 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82a065fdda0e074fbfcd0007e6ff6e46185be3f5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Harri Pitkänen hatap...@iki.fi Gerrit-Reviewer: Harri Pitkänen hatap...@iki.fi Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Dictionaries and extensions not delivering on master
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi... On 2 machines with Ubuntu (latest), my master make make dev-install build does not deliver dictionaries, helpcontent or any other extension except presentation minimizer. Any clue on where to look at? Thanks PS: Autogen.lastrun - --with-parallelism=4 - --enable-debug - --enable-dbgutil - --with-vendor=Olivier Hallot - --with-lang=en-US pt-BR - --without-system-mysql-cppconn - --without-system-clucene - --without-system-libcdr - --without-system-libmspub - --without-system-libvisio - --without-system-lcms2 - --disable-odk - --with-system-cairo - --enable-kde4 - --disable-postgresql-sdbc - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJRUuzNAAoJEJp3R7nH3vLxHOYH/25Xa8AmONh2ONPM0yKGw9+w ttxQs3NK2uDQA7aulxET2xi5m66cDdz0ZscTqTP5m+L7ttMXox+4VVzuPHCyBl/c SCqCeOVUB0HPI37SZye5KsWWDCnUpJDwOOl9j1lEcf0ZencF5exVxO7GBDEEJ1Qw cqMHmRhGXa1dXmEuNkFDlKXKtXlB37H02zWvM0qNlcQzzIqwX4HVczoSwbdAHDg+ PWiWu7t1CfLeqLp9glvs0QONp6bZyulhtagr/WiUg8NYlbBAv6mMi9He3YplWWSc Ogzumv1doX35wiXWy1e0mEADY4NCfSrIQh1SJZ/MmV4l8rPgtR3upMgzhSdWYgk= =5cTi -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/signal.c |4 1 file changed, 4 insertions(+) New commits: commit 6310424aff68ad0cb354b15b5c92324e933ffae2 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 14:00:23 2013 +0100 -Werror=unused-macros Change-Id: Ia02ff34be9eff80fd8f9d76f034d76c3791342f2 diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index 4ce8fd5..9c55014 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -37,14 +37,17 @@ #include execinfo.h #include link.h #define INCLUDE_BACKTRACE +#if defined SAL_ENABLE_CRASH_REPORT #define STACKTYPE Linux #endif +#endif #ifdef SOLARIS #include backtrace.h #define INCLUDE_BACKTRACE +#if defined SAL_ENABLE_CRASH_REPORT #if defined( SPARC ) #define STACKTYPE Solaris_Sparc #elif defined( INTEL ) @@ -52,6 +55,7 @@ #else #define STACKTYPE Solaris_Unknown #endif +#endif #endif /* defined SOLARIS */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |4 1 file changed, 4 insertions(+) New commits: commit ce1cce54ec94a9d3e63830ebc7452c7418e6a34e Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 14:07:15 2013 +0100 At least Mac OS X SDK 10.7 does not need that (causes -Werror,-Wunused-macros, rather) Change-Id: Ic8449c7794739033ddf1f6227f025ce4a0c899d0 diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index 06b44c7..1a55e41 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -26,7 +26,11 @@ * / +#include sal/config.h + +#if MACOSX_SDK_VERSION 1070 #define GLX_GLXEXT_PROTOTYPES 1 +#endif #include OGLTrans_TransitionImpl.hxx #include com/sun/star/beans/XFastPropertySet.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/string/tustring.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit e36a3f91ce6d31502d2adf5899d601b161172d00 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 27 14:07:53 2013 +0100 -Werror=unused-macros Change-Id: Ic44d85b0180612d499beec35e944402becd181a7 diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index b07cd3c..ac4bb4a 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -37,12 +37,15 @@ DBG_NAME( UniString ) #define STRCODEUsal_Unicode #define STRING UniString #define STRINGDATA UniStringData -#define DBGCHECKSTRING DbgCheckUniString #define STRING_TYPE rtl_uString #define STRING_ACQUIRE rtl_uString_acquire #define STRING_RELEASE rtl_uString_release #define STRING_NEW rtl_uString_new +#if defined DBG_UTIL +#define DBGCHECKSTRING DbgCheckUniString +#endif + #include strimp.cxx #include strucvt.cxx #include strascii.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
