[Libreoffice-commits] libcdr.git: 2 commits - src/lib
src/lib/CDRDocument.cpp | 167 ---
src/lib/libcdr_utils.cpp |1
2 files changed, 88 insertions(+), 80 deletions(-)
New commits:
commit 923e2667b275441ee1861e27c882493c8ebbef4e
Author: David Tardon dtar...@redhat.com
Date: Fri May 3 17:51:16 2013 +0200
coverity: try harder at not throwing execptions
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index 497e27c..952bf5b 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -133,108 +133,115 @@ bool libcdr::CDRDocument::parse(::WPXInputStream
*input, libwpg::WPGPaintInterfa
try
{
version = getCDRVersion(input);
- }
- catch (libcdr::EndOfStreamException const )
- {
-// This can only happen if isSupported() has not been called before
-return false;
- }
-
- if (version)
- {
-input-seek(0, WPX_SEEK_SET);
-CDRParserState ps;
-CDRStylesCollector stylesCollector(ps);
-CDRParser stylesParser(std::vectorWPXInputStream *(), stylesCollector);
-if (version = 300)
- retVal = stylesParser.parseRecords(input);
-else
- retVal = stylesParser.parseWaldo(input);
-if (ps.m_pages.empty())
- retVal = false;
-if (retVal)
+if (version)
{
input-seek(0, WPX_SEEK_SET);
- CDRContentCollector contentCollector(ps, painter);
- CDRParser contentParser(std::vectorWPXInputStream *(),
contentCollector);
+ CDRParserState ps;
+ CDRStylesCollector stylesCollector(ps);
+ CDRParser stylesParser(std::vectorWPXInputStream *(),
stylesCollector);
if (version = 300)
-retVal = contentParser.parseRecords(input);
+retVal = stylesParser.parseRecords(input);
else
-retVal = contentParser.parseWaldo(input);
+retVal = stylesParser.parseWaldo(input);
+ if (ps.m_pages.empty())
+retVal = false;
+ if (retVal)
+ {
+input-seek(0, WPX_SEEK_SET);
+CDRContentCollector contentCollector(ps, painter);
+CDRParser contentParser(std::vectorWPXInputStream *(),
contentCollector);
+if (version = 300)
+ retVal = contentParser.parseRecords(input);
+else
+ retVal = contentParser.parseWaldo(input);
+ }
+ return retVal;
}
-return retVal;
+ }
+ catch (libcdr::EndOfStreamException const )
+ {
+// This can only happen if isSupported() has not been called before
+return false;
}
WPXInputStream *tmpInput = input;
- CDRZipStream zinput(input);
- bool isZipDocument = zinput.isOLEStream();
- std::vectorstd::string dataFiles;
- if (isZipDocument)
+ std::vectorWPXInputStream * dataStreams;
+ try
{
-input = zinput.getDocumentOLEStream(content/riffData.cdr);
-if (!input)
+CDRZipStream zinput(input);
+bool isZipDocument = zinput.isOLEStream();
+std::vectorstd::string dataFiles;
+if (isZipDocument)
{
- input = zinput.getDocumentOLEStream(content/root.dat);
- if (input)
+ input = zinput.getDocumentOLEStream(content/riffData.cdr);
+ if (!input)
{
-WPXInputStream *tmpStream =
zinput.getDocumentOLEStream(content/dataFileList.dat);
-if (tmpStream)
+input = zinput.getDocumentOLEStream(content/root.dat);
+if (input)
{
- std::string dataFileName;
- while (!tmpStream-atEOS())
+ WPXInputStream *tmpStream =
zinput.getDocumentOLEStream(content/dataFileList.dat);
+ if (tmpStream)
{
-unsigned char character = readU8(tmpStream);
-if (character == 0x0a)
+std::string dataFileName;
+while (!tmpStream-atEOS())
{
- dataFiles.push_back(dataFileName);
- dataFileName.clear();
+ unsigned char character = readU8(tmpStream);
+ if (character == 0x0a)
+ {
+dataFiles.push_back(dataFileName);
+dataFileName.clear();
+ }
+ else
+dataFileName += (char)character;
}
-else
- dataFileName += (char)character;
+if (!dataFileName.empty())
+ dataFiles.push_back(dataFileName);
}
- if (!dataFileName.empty())
-dataFiles.push_back(dataFileName);
}
}
}
+dataStreams.reserve(dataFiles.size());
+for (unsigned i=0; idataFiles.size(); i++)
+{
+ std::string streamName(content/data/);
+ streamName += dataFiles[i];
+ CDR_DEBUG_MSG((Extracting stream: %s\n, streamName.c_str()));
+ dataStreams.push_back(zinput.getDocumentOLEStream(streamName.c_str()));
+}
+if (!input)
+ input = tmpInput;
+input-seek(0, WPX_SEEK_SET);
+CDRParserState ps;
+// libcdr extension to the getDocumentOLEStream. Will extract the first
stream in the
+// given directory
+WPXInputStream *cmykProfile =
Re: Killing the gerrit to dev-list spam ...
On Thu, 2 May 2013 18:49:30 +0200, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: so collecting the feedback so far, here is a proposal: - move the gerrit mails to a separate list - since we now have an opt-in channel, we also mail about comments to changes on that list, not only if there is a new proposal - in addition, aim for a daily digest to the dev-list Can we take into account that some people read the dev mailing list via the digest? I'm not sure why discussing patches would be precluded from the dev ML, surely someone just says In relation to gerrit change xxx, I would like to mention etc. etc. Those who watch the gerrit changes will subscribe to the ML for that, and then bring forward discussion to the dev list for patches, etc. Incidentally, I don't really mind either way myself, but I'm really a newbie to the list and to LO code anyway. Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Chris Sherlock chris.sherloc...@gmail.com changed: What|Removed |Added Depends on||60651 --- Comment #149 from Chris Sherlock chris.sherloc...@gmail.com --- I'm adding 60651 as we are still having EMFPlus issues with Visio images. Many of the issues are being looked into/fixed by bug 59045 and bug 60638, but still some issues. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to remake a modified source codes, not the first time, based on source codes core which has been made successfully?
It works now, Thank you for your kind suggestions! -- View this message in context: http://nabble.documentfoundation.org/How-to-remake-a-modified-source-codes-not-the-first-time-based-on-source-codes-core-which-has-been-m-tp4053499p4053690.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: problem in fixing a bug in calc
Hey Ram, Have you tried one of the later released branches currently there is 4.0.3 out and it would probably be best to work of that branch. On Fri, May 3, 2013 at 11:17 PM, RD Vaishnav vaishnav...@gmail.com wrote: Hi.. I am Ram Dayal Vaishnav, a student from NIT Trichy, India. I am a newbie, and needs a help in creating a patch. I want to fix a very simple bug in the libre office Version 4.0.0.0.alpha1. I want to enable Horizontal AutoFill in calc. I am made changes in libo/sc/source/ui/view/viewfun2.cxx (in funciton replace ScViewFunc::FillCrossDblClick()) Now when I run /libo/install/program/.scalc it doesn't show any change. I think I am missing something (may be I need to compile/build this code so that it can reflect changes to ./soffice or ./calc file) kindly help me out, thanks in advance -- : Ram Dayal Vaishnav Gurumukhi NIT Trichy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: problem in fixing a bug in calc
After modifying the code did u make again ??? you can just make only that particular module also. By executing command make module-name eg. ( make sc ) or else just ( make ) . And if still changes doesn't persist , then It is possible that the part of code you changed doesn't affect the things as you are expecting . Well, you can add a fprintf(stderr,Foo\n); in the part of code and check while executing does Foo prints on the terminal or not . This can confirm you whether you are modifying the right part of the code for the changes u expecting . On Sat, May 4, 2013 at 2:47 AM, RD Vaishnav vaishnav...@gmail.com wrote: Hi.. I am Ram Dayal Vaishnav, a student from NIT Trichy, India. I am a newbie, and needs a help in creating a patch. I want to fix a very simple bug in the libre office Version 4.0.0.0.alpha1. I want to enable Horizontal AutoFill in calc. I am made changes in libo/sc/source/ui/view/viewfun2.cxx (in funciton replace ScViewFunc::FillCrossDblClick()) Now when I run /libo/install/program/.scalc it doesn't show any change. I think I am missing something (may be I need to compile/build this code so that it can reflect changes to ./soffice or ./calc file) kindly help me out, thanks in advance -- : Ram Dayal Vaishnav Gurumukhi NIT Trichy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: problem in fixing a bug in calc
Please add libreoffice mailing list to CC always . Here is link which will guide you through how to push the patch to gerrit . https://wiki.documentfoundation.org/Development/gerrit Cheers On Sat, May 4, 2013 at 11:50 AM, RD Vaishnav vaishnav...@gmail.com wrote: thanks Anurag, now i am able to see that my patch is working. Now i am trying to put it on the gerrit. since its my first time on gerrit can you give me some idea, or u cn suggest me some other person or useful links. On Sat, May 4, 2013 at 11:42 AM, Anurag Kanungo anuragkanu...@gmail.comwrote: After modifying the code did u make again ??? you can just make only that particular module also. By executing command make module-name eg. ( make sc ) or else just ( make ) . And if still changes doesn't persist , then It is possible that the part of code you changed doesn't affect the things as you are expecting . Well, you can add a fprintf(stderr,Foo\n); in the part of code and check while executing does Foo prints on the terminal or not . This can confirm you whether you are modifying the right part of the code for the changes u expecting . On Sat, May 4, 2013 at 2:47 AM, RD Vaishnav vaishnav...@gmail.comwrote: Hi.. I am Ram Dayal Vaishnav, a student from NIT Trichy, India. I am a newbie, and needs a help in creating a patch. I want to fix a very simple bug in the libre office Version 4.0.0.0.alpha1. I want to enable Horizontal AutoFill in calc. I am made changes in libo/sc/source/ui/view/viewfun2.cxx (in funciton replace ScViewFunc::FillCrossDblClick()) Now when I run /libo/install/program/.scalc it doesn't show any change. I think I am missing something (may be I need to compile/build this code so that it can reflect changes to ./soffice or ./calc file) kindly help me out, thanks in advance -- : Ram Dayal Vaishnav Gurumukhi NIT Trichy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- : Ram Dayal Vaishnav Gurumukhi NIT Trichy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/README
sd/README | 21 + 1 file changed, 21 insertions(+) New commits: commit bde563d87f2b2b7b133ddb7a8c71bbd66b2a78e5 Author: Radek Doulik r...@novell.com Date: Sat May 4 11:26:38 2013 +0200 add more description about sd module and important presentation filters Change-Id: I0a3684c21554a87109e653a5aae9cb53c98c098b diff --git a/sd/README b/sd/README index 963e7bd..a64dbd4 100644 --- a/sd/README +++ b/sd/README @@ -1,3 +1,24 @@ The core directory for the impress/draw applications. Think of impress as a hack on top of draw. + + +sd module contains impress/draw specific code, non-shared UI and part +of ppt and pptx filter, few other filters too. + +the slideshow UI lives here as well, the slideshow engine is in +slideshow module though (including the 3D transitions engine +slideshow/source/engine/OGLTrans). + +the most used filters are ODF's odp, binary ppt and OOXML's +pptx. their locations are listed bellow: + + * odp import and export filters are in xmloff module (mostly xmloff/source/draw) + + * ppt import is in sd/source/filter/ppt (big shared chunks are also in svx) + * ppt export is in sd/source/filter/eppt (big shared chunks are also in svx) + + * pptx import is in oox/source/ppt (and uses a lot of + oox/source/drawingml and oox/source/*) + * pptx export is in sd/source/filter/eppt (mostly in pptx-* source + files) and shared part is in oox/source/export ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx | 15 +--
sfx2/source/sidebar/SidebarController.hxx |3 ++-
2 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 02e826258f757e954f40f6a928a0351724a7280a
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:04:57 2013 +
Related: #i121420# Provide sidebar panels with XCanvas objects.
(cherry picked from commit d179a612f5f9c01776ea52bfdcf27f1cb864f249)
Conflicts:
sfx2/source/sidebar/SidebarController.cxx
Change-Id: I755d55ac0f5a97fdd11476ce11631afb362e83d8
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 08e1e6d..55a384e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -35,6 +35,7 @@
#include splitwin.hxx
#include svl/smplhint.hxx
#include tools/link.hxx
+#include toolkit/helper/vclunohelper.hxx
#include comphelper/processfactory.hxx
#include comphelper/componentcontext.hxx
#include comphelper/namedvaluecollection.hxx
@@ -46,6 +47,7 @@
#include com/sun/star/ui/XUIElementFactory.hpp
#include com/sun/star/util/XURLTransformer.hpp
#include com/sun/star/util/URL.hpp
+#include com/sun/star/rendering/XSpriteCanvas.hpp
#include boost/bind.hpp
#include boost/function.hpp
@@ -491,6 +493,7 @@ bool SidebarController::ArePanelSetsEqual (
const SharedPanelContainer rCurrentPanels,
const ResourceManager::PanelContextDescriptorContainer rRequestedPanels)
{
+#ifdef DEBUG
OSL_TRACE(current panel list:);
for (SharedPanelContainer::const_iterator
iPanel(rCurrentPanels.begin()),
@@ -510,6 +513,7 @@ bool SidebarController::ArePanelSetsEqual (
{
OSL_TRACE(panel %s, S2A(iId-msId));
}
+#endif
if (rCurrentPanels.size() != rRequestedPanels.size())
return false;
@@ -553,7 +557,8 @@ SharedPanel SidebarController::CreatePanel (
// Create the XUIElement.
Referenceui::XUIElement xUIElement (CreateUIElement(
pPanel-GetComponentInterface(),
-pPanelDescriptor-msImplementationURL));
+pPanelDescriptor-msImplementationURL,
+pPanelDescriptor-mbWantsCanvas));
if (xUIElement.is())
{
// Initialize the panel and add it to the active deck.
@@ -572,7 +577,8 @@ SharedPanel SidebarController::CreatePanel (
Referenceui::XUIElement SidebarController::CreateUIElement (
const Referenceawt::XWindowPeer rxWindow,
-const ::rtl::OUString rsImplementationURL)
+const ::rtl::OUString rsImplementationURL,
+const bool bWantsCanvas)
{
try
{
@@ -590,6 +596,11 @@ Referenceui::XUIElement
SidebarController::CreateUIElement (
aCreationArguments.put(SfxBindings,
makeAny(sal_uInt64(pSfxDockingWindow-GetBindings(;
aCreationArguments.put(Theme, Theme::GetPropertySet());
aCreationArguments.put(Sidebar,
makeAny(Referenceui::XSidebar(static_castui::XSidebar*(this;
+if (bWantsCanvas)
+{
+Referencerendering::XSpriteCanvas xCanvas
(VCLUnoHelper::GetWindow(rxWindow)-GetSpriteCanvas());
+aCreationArguments.put(Canvas, makeAny(xCanvas));
+}
Referenceui::XUIElement xUIElement(
xUIElementFactory-createUIElement(
diff --git a/sfx2/source/sidebar/SidebarController.hxx
b/sfx2/source/sidebar/SidebarController.hxx
index 8902a73..38ce50b 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -124,7 +124,8 @@ private:
const ResourceManager::PanelContextDescriptorContainer
rRequestedPanels);
cssu::Referencecss::ui::XUIElement CreateUIElement (
const cssu::Referencecss::awt::XWindowPeer rxWindow,
-const ::rtl::OUString rsImplementationURL);
+const ::rtl::OUString rsImplementationURL,
+const bool bWantsCanvas);
SharedPanel CreatePanel (
const ::rtl::OUString rsPanelId,
::Window* pParentWindow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
include/svx/compressgraphicdialog.hxx |1
svx/source/dialog/compressgraphicdialog.cxx | 35
svx/uiconfig/ui/compressgraphicdialog.ui| 49 ++--
3 files changed, 76 insertions(+), 9 deletions(-)
New commits:
commit 06da9114c91bdd90e196a5086e99c13ee905fb01
Author: Tomaž Vajngerl qui...@gmail.com
Date: Thu Apr 25 22:53:58 2013 +0200
Show type of graphic in CompressGraphicDialog.
Change-Id: I4066a26fb93e9a97707a249f08c4c67459c8abb2
diff --git a/include/svx/compressgraphicdialog.hxx
b/include/svx/compressgraphicdialog.hxx
index e0b2309..e53f46b 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -33,6 +33,7 @@ class SdrGrafObj;
class SVX_DLLPUBLIC CompressGraphicsDialog : public ModalDialog
{
private:
+FixedText* m_pLabelGraphicType;
FixedText* m_pFixedText2;
FixedText* m_pFixedText3;
FixedText* m_pFixedText5;
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 92749aa..c691b15 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -66,6 +66,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( Window*
pParent, Graphic rGraph
void CompressGraphicsDialog::Initialize()
{
+get(m_pLabelGraphicType,label-graphic-type);
get(m_pFixedText2, label-original-size);
get(m_pFixedText3, label-view-size);
get(m_pFixedText5, label-image-capacity);
@@ -109,6 +110,40 @@ CompressGraphicsDialog::~CompressGraphicsDialog()
void CompressGraphicsDialog::Update()
{
+GfxLinkType aLinkType = m_aGraphic.GetLink().GetType();
+OUString aGraphicTypeString;
+switch(aLinkType)
+{
+case GFX_LINK_TYPE_NATIVE_GIF:
+aGraphicTypeString = Gif image;
+break;
+case GFX_LINK_TYPE_NATIVE_JPG:
+aGraphicTypeString = Jpeg image;
+break;
+case GFX_LINK_TYPE_NATIVE_PNG:
+aGraphicTypeString = PNG image;
+break;
+case GFX_LINK_TYPE_NATIVE_TIF:
+aGraphicTypeString = TIFF image;
+break;
+case GFX_LINK_TYPE_NATIVE_WMF:
+aGraphicTypeString = WMF image;
+break;
+case GFX_LINK_TYPE_NATIVE_MET:
+aGraphicTypeString = MET image;
+break;
+case GFX_LINK_TYPE_NATIVE_PCT:
+aGraphicTypeString = PCT image;
+break;
+case GFX_LINK_TYPE_NATIVE_SVG:
+aGraphicTypeString = SVG image;
+break;
+default:
+aGraphicTypeString = Unknown;
+break;
+}
+m_pLabelGraphicType-SetText(aGraphicTypeString);
+
const FieldUnit eFieldUnit =
m_rBindings.GetDispatcher()-GetModule()-GetFieldUnit();
const LocaleDataWrapper rLocaleWrapper(
Application::GetSettings().GetLocaleDataWrapper() );
sal_Unicode cSeparator = rLocaleWrapper.getNumDecimalSep()[0];
diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui
b/svx/uiconfig/ui/compressgraphicdialog.ui
index 8695798..0b14381 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -121,7 +121,7 @@
/object
packing
property name=left_attach0/property
-property name=top_attach0/property
+property name=top_attach1/property
property name=width1/property
property name=height1/property
/packing
@@ -136,7 +136,7 @@
/object
packing
property name=left_attach1/property
-property name=top_attach0/property
+property name=top_attach1/property
property name=width1/property
property name=height1/property
/packing
@@ -151,7 +151,7 @@
/object
packing
property name=left_attach0/property
-property name=top_attach1/property
+property name=top_attach2/property
property name=width1/property
property name=height1/property
/packing
@@ -166,7 +166,7 @@
/object
packing
property name=left_attach0/property
-property name=top_attach2/property
+property name=top_attach3/property
property name=width1/property
property
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d1/79a612f5f9c01776ea52bfdcf27f1cb864f249
d1/79a612f5f9c01776ea52bfdcf27f1cb864f249 |1 + 1 file changed, 1 insertion(+) New commits: commit b27d0be7fa012edc002ac7fb0376fdb07fe086ea Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 10:44:56 2013 +0100 Notes added by 'git notes add' diff --git a/d1/79a612f5f9c01776ea52bfdcf27f1cb864f249 b/d1/79a612f5f9c01776ea52bfdcf27f1cb864f249 new file mode 100644 index 000..d4ced62 --- /dev/null +++ b/d1/79a612f5f9c01776ea52bfdcf27f1cb864f249 @@ -0,0 +1 @@ +merged as: 02e826258f757e954f40f6a928a0351724a7280a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - offapi/com
offapi/com/sun/star/ui/LayoutSize.idl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4497c8dd71735cb896198f613e13979930132700
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:10:36 2013 +
Resolves: #i122030# Fixed bug in documentation that breaks autodoc
processing
Found and patched by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 2784b2266ba8ce1dcd899a06626669dfd4dadde5)
Change-Id: I5fafe38f007a9a98b34e3fc99950bdb8e4c79278
diff --git a/offapi/com/sun/star/ui/LayoutSize.idl
b/offapi/com/sun/star/ui/LayoutSize.idl
index 42d76ab..c3aa383 100644
--- a/offapi/com/sun/star/ui/LayoutSize.idl
+++ b/offapi/com/sun/star/ui/LayoutSize.idl
@@ -22,7 +22,7 @@ module com { module sun { module star { module ui {
/** Size used for layouting windows.
It specifies a range of valid values and a preferred value.
-The values must not violate the relation 0 = Minimum = Preferred =
Maximum.
+The values must not violate the relation 0 lt;#61; Minimum lt;#61;
Preferred lt;#61; Maximum.
@param Minimum
Zero or positive. The value itself is included in the valid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 27/84b2266ba8ce1dcd899a06626669dfd4dadde5
27/84b2266ba8ce1dcd899a06626669dfd4dadde5 |1 + 1 file changed, 1 insertion(+) New commits: commit 6530d99cff3682369a005e84168bbca00370387c Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 10:47:17 2013 +0100 Notes added by 'git notes add' diff --git a/27/84b2266ba8ce1dcd899a06626669dfd4dadde5 b/27/84b2266ba8ce1dcd899a06626669dfd4dadde5 new file mode 100644 index 000..834f840 --- /dev/null +++ b/27/84b2266ba8ce1dcd899a06626669dfd4dadde5 @@ -0,0 +1 @@ +merged as: 4497c8dd71735cb896198f613e13979930132700 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sw/source
sw/source/ui/uiview/viewtab.cxx | 1123
1 file changed, 565 insertions(+), 558 deletions(-)
New commits:
commit dcf9e218ca028864ac9af76bf04ab69939918f3b
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:20:30 2013 +
Resolves: #i122028# Fixed crash when processing .uno:SwPageColumn
Reported by: Ariel Constenla-Haile
Patch by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 717671a6ec6eab7d87fe7236bb792569151e6b08)
Conflicts:
sw/source/ui/uiview/viewtab.cxx
Change-Id: I127db2160c16789f672b5520a77e27d1f6dac719
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index b1ffc8f..cd66267 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -253,6 +253,7 @@ void SwView::ExecTabWin( SfxRequest rReq )
const sal_Bool bBrowse = rSh.GetViewOptions()-getBrowseMode();
const sal_uInt16 nSlot = rReq.GetSlot();
+const SfxItemSet* pReqArgs = rReq.GetArgs();
const sal_uInt16 nDescId= rSh.GetCurPageDesc();
const SwPageDesc rDesc = rSh.GetPageDesc( nDescId );
@@ -273,692 +274,698 @@ void SwView::ExecTabWin( SfxRequest rReq )
rSh.StartAllAction();
bool bSect = 0 != (nFrmType FRMTYPE_COLSECT);
-switch ( nSlot )
+switch (nSlot)
{
case SID_ATTR_LONG_LRSPACE:
-{
-SvxLongLRSpaceItem aLongLR( (const SvxLongLRSpaceItem)rReq.GetArgs()-
-Get( SID_ATTR_LONG_LRSPACE
) );
-SvxLRSpaceItem aLR(RES_LR_SPACE);
-if ( !bSect (bFrmSelection || nFrmType FRMTYPE_FLY_ANY) )
+if ( pReqArgs )
{
-SwFrmFmt* pFmt = ((SwFrmFmt*)rSh.GetFlyFrmFmt());
-const SwRect rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
-
-bool bVerticalFrame(false);
+SvxLongLRSpaceItem aLongLR( (const SvxLongLRSpaceItem)pReqArgs-
+Get(
SID_ATTR_LONG_LRSPACE ) );
+SvxLRSpaceItem aLR(RES_LR_SPACE);
+if ( !bSect (bFrmSelection || nFrmType FRMTYPE_FLY_ANY) )
{
-sal_Bool bRTL;
-sal_Bool bVertL2R;
-bVerticalFrame = ( bFrmSelection
- rSh.IsFrmVertical(sal_True, bRTL, bVertL2R)
) ||
- ( !bFrmSelection bVerticalWriting);
-}
-long nDeltaX = bVerticalFrame ?
-rRect.Right() - rPageRect.Right() + aLongLR.GetRight() :
-rPageRect.Left() + aLongLR.GetLeft() - rRect.Left();
+SwFrmFmt* pFmt = ((SwFrmFmt*)rSh.GetFlyFrmFmt());
+const SwRect rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
-SfxItemSet aSet( GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
-RES_VERT_ORIENT, RES_HORI_ORIENT,
-RES_COL, RES_COL, 0 );
+bool bVerticalFrame(false);
+{
+sal_Bool bRTL;
+sal_Bool bVertL2R;
+bVerticalFrame = ( bFrmSelection
+ rSh.IsFrmVertical(sal_True, bRTL,
bVertL2R) ) ||
+ ( !bFrmSelection bVerticalWriting);
+}
+long nDeltaX = bVerticalFrame ?
+rRect.Right() - rPageRect.Right() + aLongLR.GetRight() :
+rPageRect.Left() + aLongLR.GetLeft() - rRect.Left();
-if(bVerticalFrame)
-{
-SwFmtVertOrient aVertOrient(pFmt-GetVertOrient());
-aVertOrient.SetVertOrient(text::VertOrientation::NONE);
-aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaX );
-aSet.Put( aVertOrient );
-}
-else
-{
-SwFmtHoriOrient aHoriOrient( pFmt-GetHoriOrient() );
-aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
-aHoriOrient.SetPos( aHoriOrient.GetPos() + nDeltaX );
-aSet.Put( aHoriOrient );
-}
+SfxItemSet aSet( GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
+RES_VERT_ORIENT, RES_HORI_ORIENT,
+RES_COL, RES_COL, 0 );
-SwFmtFrmSize aSize( pFmt-GetFrmSize() );
-long nOldWidth = (long) aSize.GetWidth();
+if(bVerticalFrame)
+{
+SwFmtVertOrient aVertOrient(pFmt-GetVertOrient());
+aVertOrient.SetVertOrient(text::VertOrientation::NONE);
+aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaX );
+aSet.Put( aVertOrient );
+}
+else
+{
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 71/7671a6ec6eab7d87fe7236bb792569151e6b08
71/7671a6ec6eab7d87fe7236bb792569151e6b08 |1 + 1 file changed, 1 insertion(+) New commits: commit c0b16ecf70f1adf26e909679b787e058f55c7687 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 11:01:16 2013 +0100 Notes added by 'git notes add' diff --git a/71/7671a6ec6eab7d87fe7236bb792569151e6b08 b/71/7671a6ec6eab7d87fe7236bb792569151e6b08 new file mode 100644 index 000..4f2517d --- /dev/null +++ b/71/7671a6ec6eab7d87fe7236bb792569151e6b08 @@ -0,0 +1 @@ +merged as: dcf9e218ca028864ac9af76bf04ab69939918f3b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sc/source
sc/source/ui/view/formatsh.cxx | 76 +
1 file changed, 40 insertions(+), 36 deletions(-)
New commits:
commit 61b4764c96fa4425ab0c3239a232fa5ebd13fbf8
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:29:52 2013 +
Resolves: #i122027# Fixed crash when processing .uno:NumberType command
Reported by: Ariel Constenla-Haile
Patch by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 6a56f5db1d478297aedd3395a882fc2dcce80e82)
Change-Id: Idbcb46b617fc2d2e2d587cdd74226380a2019303
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3980751..2916810 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1131,45 +1131,49 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest rReq )
break;
case SID_NUMBER_TYPE_FORMAT:
+if ( pReqArgs )
{
-SfxInt16Item aFormatItem((const
SfxInt16Item)rReq.GetArgs()-Get(nSlot));
-sal_uInt16 nFormat = aFormatItem.GetValue();
-switch(nFormat)
+const SfxPoolItem* pItem;
+if ( pReqArgs-GetItemState( nSlot, sal_True, pItem ) ==
SFX_ITEM_SET )
{
-case 0:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER);
//Modify
-break;
-case 1:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER, 2 );
//Modify
-break;
-case 2:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_PERCENT );
-break;
-case 3:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_CURRENCY );
-break;
-case 4:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_DATE );
-break;
-case 5:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_TIME );
-break;
-case 6:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_SCIENTIFIC );
-break;
-case 7:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_FRACTION );
-break;
-case 8:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_LOGICAL );
-break;
-case 9:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_TEXT );
-break;
-default:
-;
+sal_uInt16 nFormat = ((SfxInt16Item *)pItem)-GetValue();
+switch(nFormat)
+{
+case 0:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER);
//Modify
+break;
+case 1:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER, 2
); //Modify
+break;
+case 2:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_PERCENT );
+break;
+case 3:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_CURRENCY
);
+break;
+case 4:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_DATE );
+break;
+case 5:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_TIME );
+break;
+case 6:
+pTabViewShell-SetNumberFormat(
NUMBERFORMAT_SCIENTIFIC );
+break;
+case 7:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_FRACTION
);
+break;
+case 8:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_LOGICAL );
+break;
+case 9:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_TEXT );
+break;
+default:
+;
+}
+rReq.Done();
}
-rReq.Done();
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/56f5db1d478297aedd3395a882fc2dcce80e82
6a/56f5db1d478297aedd3395a882fc2dcce80e82 |1 + 1 file changed, 1 insertion(+) New commits: commit 504edc955d0695a66afc60826d11197c2269fee0 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 11:03:05 2013 +0100 Notes added by 'git notes add' diff --git a/6a/56f5db1d478297aedd3395a882fc2dcce80e82 b/6a/56f5db1d478297aedd3395a882fc2dcce80e82 new file mode 100644 index 000..b88667d --- /dev/null +++ b/6a/56f5db1d478297aedd3395a882fc2dcce80e82 @@ -0,0 +1 @@ +merged as: 61b4764c96fa4425ab0c3239a232fa5ebd13fbf8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy icon-themes/hicontrast
dev/null |binary 1 file changed New commits: commit 36da87b881e33e925cc526220efe845dc31b110b Author: Armin Le Grand a...@apache.org Date: Thu Apr 11 13:08:10 2013 + Related: #i121791# Corrected names for LineDashes, cleaned up resources (cherry picked from commit ef75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2) Conflicts: icon-themes/galaxy/svx/res/symphony/style_line1.png icon-themes/galaxy/svx/res/symphony/style_line10.png icon-themes/galaxy/svx/res/symphony/style_line11.png icon-themes/galaxy/svx/res/symphony/style_line2.png icon-themes/galaxy/svx/res/symphony/style_line3.png icon-themes/galaxy/svx/res/symphony/style_line4.png icon-themes/galaxy/svx/res/symphony/style_line5.png icon-themes/galaxy/svx/res/symphony/style_line6.png icon-themes/galaxy/svx/res/symphony/style_line7.png icon-themes/galaxy/svx/res/symphony/style_line8.png icon-themes/galaxy/svx/res/symphony/style_line9.png icon-themes/hicontrast/svx/res/symphony/style_line1.png icon-themes/hicontrast/svx/res/symphony/style_line10.png icon-themes/hicontrast/svx/res/symphony/style_line11.png icon-themes/hicontrast/svx/res/symphony/style_line2.png icon-themes/hicontrast/svx/res/symphony/style_line3.png icon-themes/hicontrast/svx/res/symphony/style_line4.png icon-themes/hicontrast/svx/res/symphony/style_line5.png icon-themes/hicontrast/svx/res/symphony/style_line6.png icon-themes/hicontrast/svx/res/symphony/style_line7.png icon-themes/hicontrast/svx/res/symphony/style_line8.png icon-themes/hicontrast/svx/res/symphony/style_line9.png Change-Id: Iccb0c2b6b1870806d05ee02569b7fdf1f96405c2 diff --git a/icon-themes/galaxy/svx/res/symphony/style_line1.png b/icon-themes/galaxy/svx/res/symphony/style_line1.png deleted file mode 100755 index 6403c06..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line1.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line10.png b/icon-themes/galaxy/svx/res/symphony/style_line10.png deleted file mode 100755 index f7d1e34..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line10.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line11.png b/icon-themes/galaxy/svx/res/symphony/style_line11.png deleted file mode 100755 index 4400dd3..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line11.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line2.png b/icon-themes/galaxy/svx/res/symphony/style_line2.png deleted file mode 100755 index 4269c7d..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line2.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line3.png b/icon-themes/galaxy/svx/res/symphony/style_line3.png deleted file mode 100755 index 3e03ad0..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line3.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line4.png b/icon-themes/galaxy/svx/res/symphony/style_line4.png deleted file mode 100755 index 21c1115..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line4.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line5.png b/icon-themes/galaxy/svx/res/symphony/style_line5.png deleted file mode 100755 index 8648065..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line5.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line6.png b/icon-themes/galaxy/svx/res/symphony/style_line6.png deleted file mode 100755 index b0b8d7c..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line6.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line7.png b/icon-themes/galaxy/svx/res/symphony/style_line7.png deleted file mode 100755 index e30fc03..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line7.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line8.png b/icon-themes/galaxy/svx/res/symphony/style_line8.png deleted file mode 100755 index 5c3ed31..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line8.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/style_line9.png b/icon-themes/galaxy/svx/res/symphony/style_line9.png deleted file mode 100755 index 10035ba..000 Binary files a/icon-themes/galaxy/svx/res/symphony/style_line9.png and /dev/null differ diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line1.png b/icon-themes/hicontrast/svx/res/symphony/style_line1.png deleted file mode 100644 index eadd40e..000 Binary files a/icon-themes/hicontrast/svx/res/symphony/style_line1.png and /dev/null differ diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line10.png
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2
ef/75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2 |1 + 1 file changed, 1 insertion(+) New commits: commit 4d1521b526bdba61ae3cc472e7cc8bd902ba2f58 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 11:09:07 2013 +0100 Notes added by 'git notes add' diff --git a/ef/75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2 b/ef/75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2 new file mode 100644 index 000..a6c5547 --- /dev/null +++ b/ef/75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2 @@ -0,0 +1 @@ +merged as: 36da87b881e33e925cc526220efe845dc31b110b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sd/source
sd/source/ui/view/drviews9.cxx | 42 -
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 7849b4593dd635f950b2d6faa9ee7c9980a2a657
Author: Armin Le Grand a...@apache.org
Date: Thu Apr 11 13:08:22 2013 +
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit f45335265ec5597510bf7a17cf521906c0288b9d)
Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 243b201..b69db95 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -352,13 +352,13 @@ void DrawViewShell::AttrExec (SfxRequest rReq)
if (pEntry-GetName () == pName-GetValue ())
{
-XGradient rGradient = pEntry-GetGradient ();
+XGradient aGradient(pEntry-GetGradient());
-if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR)
rGradient.SetStartColor (aColor);
-else rGradient.SetEndColor (aColor);
+if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR)
aGradient.SetStartColor (aColor);
+else aGradient.SetEndColor (aColor);
pAttr-Put (XFillStyleItem (XFILL_GRADIENT),
XATTR_FILLSTYLE);
-pAttr-Put (XFillGradientItem (pName-GetValue (),
rGradient), XATTR_FILLGRADIENT);
+pAttr-Put (XFillGradientItem (pName-GetValue (),
aGradient), XATTR_FILLGRADIENT);
break;
}
}
@@ -413,12 +413,12 @@ void DrawViewShell::AttrExec (SfxRequest rReq)
if (pEntry-GetName () == pName-GetValue ())
{
-XHatch rHatch = pEntry-GetHatch ();
+XHatch aHatch(pEntry-GetHatch());
-rHatch.SetColor (aColor);
+aHatch.SetColor (aColor);
pAttr-Put (XFillStyleItem (XFILL_HATCH),
XATTR_FILLSTYLE);
-pAttr-Put (XFillHatchItem (pName-GetValue (),
rHatch), XATTR_FILLHATCH);
+pAttr-Put (XFillHatchItem (pName-GetValue (),
aHatch), XATTR_FILLHATCH);
break;
}
}
@@ -527,18 +527,18 @@ void DrawViewShell::AttrExec (SfxRequest rReq)
if (pEntry-GetName () == pName-GetValue ())
{
-XGradient rGradient = pEntry-GetGradient ();
+XGradient aGradient(pEntry-GetGradient());
-rGradient.SetGradientStyle ((XGradientStyle)
pStyle-GetValue ());
-rGradient.SetAngle (pAngle-GetValue () * 10);
-rGradient.SetBorder ((short) pBorder-GetValue
());
-rGradient.SetXOffset ((short)
pCenterX-GetValue ());
-rGradient.SetYOffset ((short)
pCenterY-GetValue ());
-rGradient.SetStartIntens ((short)
pStart-GetValue ());
-rGradient.SetEndIntens ((short) pEnd-GetValue
());
+aGradient.SetGradientStyle ((XGradientStyle)
pStyle-GetValue ());
+aGradient.SetAngle (pAngle-GetValue () * 10);
+aGradient.SetBorder ((short) pBorder-GetValue
());
+aGradient.SetXOffset ((short)
pCenterX-GetValue ());
+aGradient.SetYOffset ((short)
pCenterY-GetValue ());
+aGradient.SetStartIntens ((short)
pStart-GetValue ());
+aGradient.SetEndIntens ((short) pEnd-GetValue
());
pAttr-Put (XFillStyleItem (XFILL_GRADIENT),
XATTR_FILLSTYLE);
-pAttr-Put (XFillGradientItem (pName-GetValue
(), rGradient), XATTR_FILLGRADIENT);
+pAttr-Put (XFillGradientItem (pName-GetValue
(), aGradient), XATTR_FILLGRADIENT);
break;
}
}
@@ -595,14 +595,14 @@ void DrawViewShell::AttrExec (SfxRequest rReq)
if (pEntry-GetName () == pName-GetValue ())
{
-XHatch rHatch = pEntry-GetHatch ();
+XHatch aHatch(pEntry-GetHatch());
-rHatch.SetHatchStyle ((XHatchStyle)
pStyle-GetValue ());
-rHatch.SetDistance (pDistance-GetValue ());
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f4/5335265ec5597510bf7a17cf521906c0288b9d
f4/5335265ec5597510bf7a17cf521906c0288b9d |1 + 1 file changed, 1 insertion(+) New commits: commit 29103f0542c72cd56add6474c8b84e7dfff2747c Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 11:11:01 2013 +0100 Notes added by 'git notes add' diff --git a/f4/5335265ec5597510bf7a17cf521906c0288b9d b/f4/5335265ec5597510bf7a17cf521906c0288b9d new file mode 100644 index 000..a7d8e05 --- /dev/null +++ b/f4/5335265ec5597510bf7a17cf521906c0288b9d @@ -0,0 +1 @@ +merged as: 7849b4593dd635f950b2d6faa9ee7c9980a2a657 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New language localization
N'ko is a right to left language with its own digits. For more information see : http://en.wikipedia.org/wiki/N%27Ko_alphabet Unicode range : U+07C0–U+07FF I want to start the localization of libre office in N'ko language. Unfortunately, this language is not yet supported. Some information about te language : ISO 639-2 : nqo English Name : N'ko ISO 3166-1 : not available (standard language) Microsoft ID :not available Unicode range :U+07C0–U+07FF right to left : yes own digits :yes Wiki page : http://en.wikipedia.org/wiki/N%27Ko_alphabet ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
making the win32 build easier ?
Hi there, I was reading through and following the steps in: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Install_Windows_Build_Requirements And it struck me that at least the Ant and JUnit pieces look as if we could mirror them trivially at a known location, and auto-download them if they are not found (as we do for many other pieces). Both seem to be packaged reasonably sensibly as either a tar.gz or a single .jar file. Is that something we could do for Windows at least ? Otherwise - I was rather impressed by the quality of the instructions, and ease of setup / build on Windows (compared with how it used to be) - it took only a day (of which most of the time was spent doing other things) to get a working build. Nice work there all ! ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#47305: set digit language, before OutputDevice draw text...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3773
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3773/1
fdo#47305: set digit language, before OutputDevice draw text.
Set ctl language as digit language when wrt direction is RTL and
numeral language is set to choose based on context.
Change-Id: Ie54193d938e0b6ab6bccb6decb9f245037aebb4b
---
M sc/source/ui/view/output2.cxx
1 file changed, 38 insertions(+), 3 deletions(-)
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 76d3a5e..dcd6c92 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -38,6 +38,7 @@
#include editeng/unolingu.hxx
#include editeng/fontitem.hxx
#include svl/zforlist.hxx
+#include svl/ctloptions.hxx
#include svl/zformat.hxx
#include vcl/svapp.hxx
#include vcl/metric.hxx
@@ -1650,6 +1651,8 @@
bNeedEdit = aVars.HasEditCharacters() || (bFormulaCell
aCell.mpFormula-IsMultilineResult());
}
long nTotalMargin = 0;
+const SfxPoolItem* pItem = mpDoc-GetAttr( nCellX, nCellY,
nTab, ATTR_WRITINGDIR );
+const SvxFrameDirectionItem* pCurrentWritingMode = (const
SvxFrameDirectionItem*) pItem;
if (bDoCell !bNeedEdit)
{
CellType eCellType = aCell.meType;
@@ -1674,8 +1677,6 @@
if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust
== SVX_HOR_JUSTIFY_REPEAT )
{
-const SfxPoolItem* pItem = mpDoc-GetAttr( nCellX,
nCellY, nTab, ATTR_WRITINGDIR );
-const SvxFrameDirectionItem* pCurrentWritingMode =
(const SvxFrameDirectionItem*) pItem;
if (pCurrentWritingMode-GetValue() ==
FRMDIR_HORI_LEFT_TOP)
eOutHorJust = SVX_HOR_JUSTIFY_LEFT;
else
@@ -1987,7 +1988,41 @@
if (bRightAdjusted)
aDrawTextPos.X() -= aVars.GetOriginalWidth();
}
-
+SvtCTLOptions *pCTLOptions = new SvtCTLOptions;
+if (pCurrentWritingMode-GetValue() ==
FRMDIR_HORI_RIGHT_TOP pCTLOptions-GetCTLTextNumerals() ==
SvtCTLOptions::NUMERALS_CONTEXT)
+{
+LanguageType ctl,cjk,latin;
+mpDoc-GetLanguage(latin,cjk,ctl);
+switch(ctl)
+{
+case LANGUAGE_ARABIC_SAUDI_ARABIA:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_FARSI:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_URDU_INDIA:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_URDU_PAKISTAN:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_URDU:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+}
+}
+delete pCTLOptions;
// in Metafiles immer DrawTextArray, damit die
Positionen mit
// aufgezeichnet werden (fuer nicht-proportionales
Resize):
--
To view, visit https://gerrit.libreoffice.org/3773
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie54193d938e0b6ab6bccb6decb9f245037aebb4b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
fd#44621 : OSX DND opens drawer Query
Hi, I just started working on the bug With MacOSX 10.7 and later, dragging an image from the desktop to LO Writer is not possible https://bugs.freedesktop.org/show_bug.cgi?id=44621 The image when dropped into the Libre Office application opens Draw no matter what the source (desktop or any other app) is what the target (writer,impress etc.) is. I'm not really sure which module is taking care of this, I found these two files: http://opengrok.libreoffice.org/xref/core/vcl/aqua/source/dtrans/DropTarget.cxx http://opengrok.libreoffice.org/xref/core/vcl/aqua/source/dtrans/DragSource.cxx But I'm not sure if they actually do anything. Any head start will be highly appreciated! -- Manik Malhotra ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 4.0.3 RC3 available
Dear Community, The Document Foundation is pleased to announce the third release candidate of our upcoming LibreOffice 4.0.3. This will be the third in a series of frequent updates to our feature-packed 4.0 branch. Please be aware that LibreOffice 4.0.3 RC3 is not ready for production use, you should continue to use LibreOffice 4.0.2 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test - or checkout our manual test database for starting right away - http://manual-test.libreoffice.org/runtests/ For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ Release candidate 2 was built and is available via http://downloadarchive.documentfoundation.org/libreoffice/old/ - but is superseded by RC3 due to a showstopper found. The list of issues and fixed bugs for 4.0.3 RC2 is in our wiki: http://wiki.documentfoundation.org/Releases/4.0.3/RC2 Whereas the list of known issues and fixed bugs with 4.0.3 RC3 is available from here: http://wiki.documentfoundation.org/Releases/4.0.3/RC3 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60351: FILEOPEN particular .docx shows pictures with wrong contour instead of appropriate simple wrap
This is the patch to fix this easy hack. One of many I send! hugs Anderson Cordeiro Charles Rio de Janeiro - Brazil Cotplan - IPRJ/Uerj GNU/Linux registered user #558000 www.iprj.uerj.br www.clima.iprj.uerj.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#60351: FILEOPEN particular .docx shows pictures with wrong contour instead of appropriate simple wrap
Hi Anderson, Anderson Cordeiro schreef op 4/05/13 14:56: This is the patch to fix this easy hack. One of many I send! Is it possible you send this email without attaching your patch? tip: for developers (I'm not a developer) is it also a bit easier to review your patch via gerrit (https://gerrit.libreoffice.org/). Guide how to set up: https://wiki.documentfoundation.org/Development/gerrit . Kind regards, Joren hugs Anderson Cordeiro Charles Rio de Janeiro - Brazil Cotplan - IPRJ/Uerj GNU/Linux registered user #558000 www.iprj.uerj.br http://www.iprj.uerj.br www.clima.iprj.uerj.br http://www.clima.iprj.uerj.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] $(WORKDIR)/CustomTarget/odk/odkcommon is no more
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3777
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3777/1
$(WORKDIR)/CustomTarget/odk/odkcommon is no more
Change-Id: I49204b3518c47614e591de47a916901861331673
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 74415a2..fb5b2d5 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -50,7 +50,6 @@
$(call gb_Helper_print_on_error,\
$(PERL) $ \
$(INSTDIR)/$(gb_Package_SDKDIRNAME) \
- $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
$(odk_PLATFORM) $(gb_Executable_EXT) \
,$@.log \
)
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 542361e..5a2df16 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -23,26 +23,25 @@
$return = 0;
-$PrimaryDir = $ARGV[0];
-$SecondaryDir = $ARGV[1];
-$OperatingSystem = $ARGV[2];
-$ExePrefix = $ARGV[3];
+$SdkDir = $ARGV[0];
+$OperatingSystem = $ARGV[1];
+$ExePrefix = $ARGV[2];
sub check_file
{
my ($file) = @_;
-return -e $PrimaryDir/$file || -e $SecondaryDir/$file;
+return -e $SdkDir/$file;
}
sub check_dir
{
my ($dir) = @_;
-return -d $PrimaryDir/$dir || -d $SecondaryDir/$dir;
+return -d $SdkDir/$dir;
}
print Check for $OperatingSystem\n;
-if (-d $PrimaryDir || -d $SecondaryDir) {
+if (-d $SdkDir) {
# check binaries
print check binaries: ;
if (check_dir(bin)) {
--
To view, visit https://gerrit.libreoffice.org/3777
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49204b3518c47614e591de47a916901861331673
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] drop unneeded odkcommon/
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3776 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3776/1 drop unneeded odkcommon/ Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e --- M odk/CustomTarget_settings.mk M odk/Package_settings_generated.mk 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 581d522..242dd68 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -7,11 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/settings)) -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk)) +$(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk)) -$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk +$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) tr -d \015 $ | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk index 3813d98..1b3f637 100644 --- a/odk/Package_settings_generated.mk +++ b/odk/Package_settings_generated.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings))) +$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/settings))) $(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR))) -- To view, visit https://gerrit.libreoffice.org/3776 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] the MacOS X cleanup is logically a part of build
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3778
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3778/1
the MacOS X cleanup is logically a part of build
... so move it to python/ExternalProject_python3.mk, where it belongs.
Change-Id: Ib99a6a40182341257f79dd289eac51806be46fcf
---
D python3/CustomTarget_PythonFramework.mk
M python3/ExternalProject_python3.mk
M python3/Module_python3.mk
3 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/python3/CustomTarget_PythonFramework.mk
b/python3/CustomTarget_PythonFramework.mk
deleted file mode 100644
index e54b5fe..000
--- a/python3/CustomTarget_PythonFramework.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,python3/fixscripts))
-$(eval $(call gb_CustomTarget_CustomTarget,python3/fixinstallnames))
-$(eval $(call gb_CustomTarget_CustomTarget,python3/executables))
-
-python3_fw_prefix=$(call
gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO/LibreOfficePython.framework
-
-# rule to allow relocating the whole framework, removing reference to
buildinstallation directory
-$(call gb_CustomTarget_get_target,python3/fixscripts): $(call
gb_ExternalProject_get_target,python3)
- $(call gb_Output_announce,python3 - remove reference to installroot
from scripts,build,CUS,5)
- $(COMMAND_ECHO)for file in \
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/2to3
\
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/2to3-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
\
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/idle$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
\
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pydoc$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
\
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-config
\
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m-config
\
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pyvenv-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
; do \
- { rm $$file awk '\
- BEGIN {print #!/bin/bash\n\
-origpath=$$(pwd)\n\
-bindir=$$(cd $$(dirname \$$0\) ; pwd)\n\
-cd \$$origpath\\n\
-\$$bindir/../Resources/Python.app/Contents/MacOS/LibreOfficePython\ - $$@
EOF} \
- FNR==1{next} \
- {print} \
- END {print EOF}' $$file ; } $$file ; chmod +x
$$file ; done
- touch $@
-
-$(call gb_CustomTarget_get_target,python3/fixinstallnames): $(call
gb_ExternalProject_get_target,python3)
- $(call gb_Output_announce,python3 - fix installname,build,CUS,5)
- install_name_tool -change \
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython
\
- @executable_path/../../../../LibreOfficePython \
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
- touch $@
-
-# also delete binaries that are symlinked in scp2
-$(call gb_CustomTarget_get_target,python3/executables): $(call
gb_ExternalProject_get_target,python3)
- $(call gb_Output_announce,python3 - fix installnames in
executables,build,CUS,5)
- cd
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin
; \
- for file in python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \
- python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \
- pythonw$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do
\
- install_name_tool -change \
-
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython
\
- @executable_path/../LibreOfficePython $$file ; done
- touch $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/python3/ExternalProject_python3.mk
b/python3/ExternalProject_python3.mk
index a01e115..c61e506 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -18,6 +18,11 @@
$(eval $(call gb_ExternalProject_register_targets,python3,\
[PATCH] bin no longer necessary hack
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3780 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3780/1 bin no longer necessary hack Change-Id: I54ca40343f4abe61aaea5520d27b4c82a2eeaf7a --- M scp2/source/python/file_python.scp 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index f6b4e83..6684204 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -102,8 +102,7 @@ #endif File gid_File_Py_Python_Core -//FIXME the binaries and libs in the package need x bit but USE_INTERNAL_RIGHTS does not work so set BIN_FILE_BODY here as a temporary hack which makes everything executable -BIN_FILE_BODY; +TXT_FILE_BODY; Dir = FILELIST_DIR; Name = python3.filelist; Styles = (FILELIST,USE_INTERNAL_RIGHTS); -- To view, visit https://gerrit.libreoffice.org/3780 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54ca40343f4abe61aaea5520d27b4c82a2eeaf7a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] install cpp docs using filelist
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3775 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/3775/1 install cpp docs using filelist Change-Id: I93176653935b6ccfd4181e6086444fbe7475f2b0 --- M odk/CustomTarget_check.mk M odk/CustomTarget_doxygen.mk A odk/GeneratedPackage_cpp_docs.mk M odk/Module_odk.mk D odk/Zip_cppdocs.mk M scp2/source/sdkoo/sdkoo.scp 6 files changed, 28 insertions(+), 32 deletions(-) diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 6660525..74415a2 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ - $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \ + $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_cpp_docs)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index bddb0f3..6558193 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/cpp)) CPPDOCREFNAME := $(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference @@ -29,17 +29,17 @@ $(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) $(odk_INCFILELIST)) DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT)) DOXY_WORKDIR := $(if $(filter WNT,$(OS)),\ - $(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\ - $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref) + $(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref),\ + $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref) DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc) -$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\ +$(eval $(call gb_CustomTarget_register_targets,odk/docs/cpp,\ Doxyfile \ doxygen.log \ )) -$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile +$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DOXY_WORKDIR)!' \ @@ -49,8 +49,8 @@ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \ $ $@ -$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \ - $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \ +$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/doxygen.log : \ + $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile \ $(SRCDIR)/include/sal/log-areas.dox \ $(SRCDIR)/odk/pack/gendocu/main.dox \ $(call gb_PackageSet_get_target,odk_headers) diff --git a/odk/GeneratedPackage_cpp_docs.mk b/odk/GeneratedPackage_cpp_docs.mk new file mode 100644 index 000..313980f --- /dev/null +++ b/odk/GeneratedPackage_cpp_docs.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_cpp_docs,$(call gb_CustomTarget_get_workdir,odk/docs/cpp))) + +$(eval $(call gb_GeneratedPackage_use_customtarget,odk_cpp_docs,odk/docs/cpp)) + +$(eval $(call gb_GeneratedPackage_add_dir,odk_cpp_docs,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,ref)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index aab0539..f7cc777 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -13,7 +13,7 @@ $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),\ CustomTarget_doxygen \ - Zip_cppdocs \ + GeneratedPackage_cpp_docs \ ) \ CustomTarget_html \ CustomTarget_settings \ diff --git a/odk/Zip_cppdocs.mk b/odk/Zip_cppdocs.mk deleted file mode 100644 index 1f86757..000 --- a/odk/Zip_cppdocs.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file
[PATCH] install moz. runtime files using filelist
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3781 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3781/1 install moz. runtime files using filelist Change-Id: Iddc1a86d34a6d05f2a2939fb72f057fb387bbe1f --- D moz/CustomTarget_runtime.mk A moz/ExternalPackage_runtime.mk M moz/Module_moz.mk R moz/UnpackedTarball_mozruntime.mk M scp2/source/ooo/file_ooo.scp 5 files changed, 63 insertions(+), 33 deletions(-) diff --git a/moz/CustomTarget_runtime.mk b/moz/CustomTarget_runtime.mk deleted file mode 100644 index 1296f2a..000 --- a/moz/CustomTarget_runtime.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -MOZ_DEL_LIST := freebl3.dll \ - nspr4.dll \ - nss3.dll \ - plc4.dll \ - plds4.dll \ - smime3.dll \ - softokn3.dll \ - ssl3.dll - -$(eval $(call gb_CustomTarget_CustomTarget,moz/runtime)) - -$(eval $(call gb_CustomTarget_register_target,moz/runtime,mozruntime.zip)) - -$(call gb_CustomTarget_get_workdir,moz/runtime)/mozruntime.zip: $(TARFILE_LOCATION)/$(MOZ_ZIP_RUNTIME) - cp $ $@ - zip -qd $@ $(MOZ_DEL_LIST) - -# vim: set noet sw=4 ts=4: diff --git a/moz/ExternalPackage_runtime.mk b/moz/ExternalPackage_runtime.mk new file mode 100644 index 000..e43519e --- /dev/null +++ b/moz/ExternalPackage_runtime.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime)) + +$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTDIR))) + +$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,program,\ + components/addrbook.dll \ + components/addrbook.xpt \ + components/i18n.dll \ + components/mork.dll \ + components/mozldap.dll \ + components/mozldap.xpt \ + components/necko.dll \ + components/necko_dns.xpt \ + components/pipnss.dll \ + components/pref.xpt \ + components/profile.dll \ + components/rdf.dll \ + components/uconv.dll \ + components/vcard.dll \ + components/xpc3250.dll \ + components/xpcom_base.xpt \ + components/xpcom_compat_c.dll \ + components/xpcom_components.xpt \ + components/xpcom_ds.xpt \ + components/xpcom_io.xpt \ + components/xpcom_obsolete.xpt \ + components/xpcom_thread.xpt \ + components/xpcom_xpti.xpt \ + components/xppref32.dll \ + defaults/autoconfig/platform.js \ + defaults/autoconfig/prefcalls.js \ + defaults/pref/browser-prefs.js \ + defaults/pref/mailnews.js \ + defaults/pref/mdn.js \ + defaults/pref/smime.js \ + greprefs/all.js \ + greprefs/security-prefs.js \ + js3250.dll \ + mozz.dll \ + msgbsutl.dll \ + nsldap32v50.dll \ + nsldappr32v50.dll \ + xpcom.dll \ + xpcom_compat.dll \ + xpcom_core.dll \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/moz/Module_moz.mk b/moz/Module_moz.mk index f447668..3be2c18 100644 --- a/moz/Module_moz.mk +++ b/moz/Module_moz.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,moz,\ ExternalPackage_moz_lib \ - CustomTarget_runtime \ + ExternalPackage_runtime \ Package_runtime \ UnpackedTarball_moz_inc \ UnpackedTarball_moz_lib \ diff --git a/moz/Package_runtime.mk b/moz/UnpackedTarball_mozruntime.mk similarity index 66% rename from moz/Package_runtime.mk rename to moz/UnpackedTarball_mozruntime.mk index 59fb894..228890c 100644 --- a/moz/Package_runtime.mk +++ b/moz/UnpackedTarball_mozruntime.mk @@ -7,8 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,moz/runtime,$(call gb_CustomTarget_get_workdir,moz/runtime))) +$(eval $(call gb_UnpackedTarball_UnpackedTarball,mozruntime)) -$(eval $(call gb_Package_add_file,moz/runtime,bin/mozruntime.zip,mozruntime.zip)) +$(eval $(call gb_UnpackedTarball_set_tarball,mozruntime,$(MOZ_ZIP_RUNTIME))) # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index fb2b35e..6bca90f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -595,9 +595,9 @@ File gid_File_Mozilla_Runtime TXT_FILE_BODY; -Styles = (ARCHIVE); -Dir = SCP2_OOO_BIN_DIR; -Name = mozruntime.zip; +
[PATCH] install python framework using filelist
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3779 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3779/1 install python framework using filelist Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1 --- A python3/GeneratedPackage_python3.mk M python3/Module_python3.mk M scp2/source/python/file_python.scp M solenv/gbuild/GeneratedPackage.mk 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk new file mode 100644 index 000..91e62bd --- /dev/null +++ b/python3/GeneratedPackage_python3.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO)) + +$(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) + +$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) + +$(eval $(call gb_GeneratedPackage_add_dir,python3,program/LibreOfficePython.framework,LibreOfficePython.framework)) + +# vim: set noet sw=4 ts=4: diff --git a/python3/Module_python3.mk b/python3/Module_python3.mk index 831f79e..eb2ec39 100644 --- a/python3/Module_python3.mk +++ b/python3/Module_python3.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Module_add_targets,python3,\ UnpackedTarball_python3 \ ExternalProject_python3 \ - $(if $(filter MACOSX,$(OS)),Zip_PythonFramework,ExternalPackage_python3) \ + $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ )) endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index c065ea4..f6b4e83 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -104,15 +104,9 @@ File gid_File_Py_Python_Core //FIXME the binaries and libs in the package need x bit but USE_INTERNAL_RIGHTS does not work so set BIN_FILE_BODY here as a temporary hack which makes everything executable BIN_FILE_BODY; - #ifdef MACOSX -Dir = gid_Brand_Dir_Program; -Name = LibreOfficePython.framework.zip; -Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); - #else Dir = FILELIST_DIR; Name = python3.filelist; Styles = (FILELIST,USE_INTERNAL_RIGHTS); - #endif End #ifdef WNT diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index 91714e9..893f929 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -97,6 +97,14 @@ endef +# Depend on an external project. +# +# gb_GeneratedPackage_use_external_project package project +define gb_GeneratedPackage_use_external_project +$(call gb_GeneratedPackage_get_target,$(1)) : $(call gb_ExternalProject_get_target,$(2)) + +endef + # Add a dir to the package. # # The srcdir will be copied to $(INSTDIR) as destdir. -- To view, visit https://gerrit.libreoffice.org/3779 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gbuild: add Package equiv. for copying whole dirs
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3774
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3774/1
gbuild: add Package equiv. for copying whole dirs
This is in preparation for using doxygen to generate IDL docs. Because
the file names generated by doxygen are essentially random, it is not
possible to use a Package to deliver them. And we really do not want to
go back to using Zip, as unpacking slows the installation down.
Change-Id: I5f4aa6bf10c6aab30a5b1870e04dca723c123317
---
M Makefile.in
M instsetoo_native/util/openoffice.lst.in
A solenv/gbuild/GeneratedPackage.mk
M solenv/gbuild/TargetLocations.mk
M solenv/gbuild/gbuild.mk
5 files changed, 119 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 892a369..74b53aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,6 +108,7 @@
Extension \
ExternalPackage \
ExternalProject \
+ GeneratedPackage \
InstallModule \
InstallScript \
InternalUnoApi \
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index ffef5c7..52e9c2a 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@
downloadnameLibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package
+include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
}
}
@@ -138,7 +138,7 @@
downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package
+include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
}
}
@@ -177,7 +177,7 @@
active 1
compression 5
script sdkoo
-include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package
+include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
}
}
@@ -223,7 +223,7 @@
active 1
compression 5
script sdkoo
-include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package
+include
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/svx svx/source
include/svx/xtable.hxx| 18 ++--
svx/source/dialog/dlgctrl.cxx |4 -
svx/source/dialog/sdstring.src| 22 +++---
svx/source/sidebar/line/LinePropertyPanel.cxx |6 +
svx/source/sidebar/line/LinePropertyPanel.hrc | 26 ---
svx/source/sidebar/line/LinePropertyPanel.src | 94 --
6 files changed, 27 insertions(+), 143 deletions(-)
New commits:
commit d1ba720020706b1fa1cbcdd171aab96054e8253a
Author: Armin Le Grand a...@apache.org
Date: Thu Apr 11 13:11:46 2013 +
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit f8f9cb1148f70f61f486517a1f353c4a3de8211f)
Conflicts:
svx/inc/svx/xtable.hxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.hrc
svx/source/sidebar/line/LinePropertyPanel.src
Change-Id: Ie49b28503e092c6685fb02c00820d4a3eaa3abb6
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 32c4619..4ceca46 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -66,8 +66,8 @@ public:
, aColor(rColor)
{}
-voidSetColor(const Color rColor) { aColor = rColor; }
-Color GetColor() { return aColor; }
+void SetColor(const Color rColor) { aColor = rColor; }
+const Color GetColor() const { return aColor; }
};
//
@@ -89,7 +89,7 @@ public:
aB2DPolyPolygon = rB2DPolyPolygon;
}
-basegfx::B2DPolyPolygon GetLineEnd()
+const basegfx::B2DPolyPolygon GetLineEnd() const
{
return aB2DPolyPolygon;
}
@@ -107,8 +107,8 @@ public:
XDashEntry(const XDash rDash, const String rName) :
XPropertyEntry(rName), aDash(rDash) {}
-voidSetDash(const XDash rDash){ aDash = rDash; }
-XDash GetDash() { return aDash; }
+void SetDash(const XDash rDash) { aDash = rDash; }
+const XDash GetDash() const { return aDash; }
};
// --
@@ -123,8 +123,8 @@ public:
XHatchEntry(const XHatch rHatch, const String rName) :
XPropertyEntry(rName), aHatch(rHatch) {}
-voidSetHatch(const XHatch rHatch) { aHatch = rHatch; }
-XHatch GetHatch() { return aHatch; }
+void SetHatch(const XHatch rHatch) { aHatch = rHatch; }
+const XHatch GetHatch() const { return aHatch; }
};
// -
@@ -139,8 +139,8 @@ public:
XGradientEntry(const XGradient rGradient, const String
rName):
XPropertyEntry(rName), aGradient(rGradient) {}
-voidSetGradient(const XGradient rGrad) { aGradient = rGrad; }
-XGradient GetGradient() { return aGradient; }
+void SetGradient(const XGradient rGrad) { aGradient = rGrad; }
+const XGradient GetGradient() const { return aGradient; }
};
// -
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 72f98cc..c12dc7f 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1019,7 +1019,7 @@ void HatchingLB::UserDraw( const UserDrawEvent rUDEvt )
sal_uIntPtr nOldDrawMode = pDevice-GetDrawMode();
pDevice-SetDrawMode(
GetSettings().GetStyleSettings().GetHighContrastMode() ?
OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
-XHatch rXHatch = mpList-GetHatch( rUDEvt.GetItemId()
)-GetHatch();
+const XHatch rXHatch = mpList-GetHatch( rUDEvt.GetItemId()
)-GetHatch();
MapMode aMode( MAP_100TH_MM );
Hatch aHatch( (HatchStyle) rXHatch.GetHatchStyle(),
rXHatch.GetColor(),
@@ -1157,7 +1157,7 @@ void GradientLB::UserDraw( const UserDrawEvent rUDEvt )
{
OutputDevice* pDevice = rUDEvt.GetDevice();
-XGradient rXGrad = mpList-GetGradient( rUDEvt.GetItemId()
)-GetGradient();
+const XGradient rXGrad = mpList-GetGradient( rUDEvt.GetItemId()
)-GetGradient();
Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(),
rXGrad.GetStartColor(), rXGrad.GetEndColor() );
aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() );
aGradient.SetBorder( rXGrad.GetBorder() );
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 08cf550..401d6f3 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1532,47 +1532,47 @@ String RID_SVXSTR_DASH12_DEF
String RID_SVXSTR_DASH0
{
-Text [ en-US ] = Ultrafine dashed;
+Text [ en-US ] = Ultrafine Dashed;
};
String RID_SVXSTR_DASH1
{
-Text [ en-US ] = Fine dashed;
+Text [ en-US ] = Fine Dashed;
};
String RID_SVXSTR_DASH2
{
-Text [ en-US ] = Ultrafine 2 dots 3 dashes;
+Text [ en-US ] = Ultrafine 2 Dots 3
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f8/f9cb1148f70f61f486517a1f353c4a3de8211f
f8/f9cb1148f70f61f486517a1f353c4a3de8211f |1 + 1 file changed, 1 insertion(+) New commits: commit eeeb68662ac5da26664b2faf9e0e4b46db4801f2 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:38:50 2013 +0100 Notes added by 'git notes add' diff --git a/f8/f9cb1148f70f61f486517a1f353c4a3de8211f b/f8/f9cb1148f70f61f486517a1f353c4a3de8211f new file mode 100644 index 000..92a060e --- /dev/null +++ b/f8/f9cb1148f70f61f486517a1f353c4a3de8211f @@ -0,0 +1 @@ +merged as: d1ba720020706b1fa1cbcdd171aab96054e8253a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fostering project internal communication
Hello, sorry for spamming all the lists, but in the light of recent events and discussions, I'd like to make all of you aware of an important mailing list, that so far has not been used as extensively as it should be, which led to some frustration and communication issues. As part of our mission to foster the project internal communication, I'd like to tell you about our so called projects mailing list, which Sophie initiated quite a while ago, and which should be used for communication amongst the various projects - e.g. design and marketing, development and marketing, UX and development, and the like. The list's intention is not to be a gossip list where everything should be thrown at, but to make all affected projects aware of important changes. Philosophy: Low traffic, but important topics. Some examples are: Change of version numbers, a new slogan, design changes, new products. In other words: Everything that has an impact on other areas of working than the one where the change originally comes from. If one team decides LibreOffice will now be called different, and has a shiny new colour, surely marketing should know in time. Well, a bit of a made up example, but you get the point... ;-) We have seen some unpleasant events in the past, that based on my experience, are mostly due to the lack of communication, or due to miscommunication. To avoid that in the future, I'd like to call out to everyone of you, if you are active in one of the subprojects, to also join this mailing list by sending an empty e-mail to projects+subscr...@global.libreoffice.org and following the instructions mailed back. At least one or two representatives from *each* project should join this list, to act as a gateway. I will soon follow up further with some details and topics that have reached me the past weeks, and how we could solve them. Again, sorry for spamming, and have a great weekend! Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 51/c58ff8442f922ebd1e5365b286d0a255f54265 74/2ce8b35e67a6b6bdfd2e784ea5abcdfd054085
51/c58ff8442f922ebd1e5365b286d0a255f54265 |1 + 74/2ce8b35e67a6b6bdfd2e784ea5abcdfd054085 |1 + 2 files changed, 2 insertions(+) New commits: commit 2f1938ac6a75245cb662a2c25860f6622f097b5a Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:43:24 2013 +0100 Notes added by 'git notes add' diff --git a/51/c58ff8442f922ebd1e5365b286d0a255f54265 b/51/c58ff8442f922ebd1e5365b286d0a255f54265 new file mode 100644 index 000..a563010 --- /dev/null +++ b/51/c58ff8442f922ebd1e5365b286d0a255f54265 @@ -0,0 +1 @@ +prefer: d50ce284c9674c45acd40d017cc44c260da722a2 commit 5aa628e1bcbeb72ec98b314d09d67d9f3b0d70cc Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:43:11 2013 +0100 Notes added by 'git notes add' diff --git a/74/2ce8b35e67a6b6bdfd2e784ea5abcdfd054085 b/74/2ce8b35e67a6b6bdfd2e784ea5abcdfd054085 new file mode 100644 index 000..a563010 --- /dev/null +++ b/74/2ce8b35e67a6b6bdfd2e784ea5abcdfd054085 @@ -0,0 +1 @@ +prefer: d50ce284c9674c45acd40d017cc44c260da722a2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 20/75b0da2291174da5dc08f8246857bcc924f777 48/b65c174fb6483b0aa69b18891a5c78936e6432
20/75b0da2291174da5dc08f8246857bcc924f777 |1 + 48/b65c174fb6483b0aa69b18891a5c78936e6432 |1 + 2 files changed, 2 insertions(+) New commits: commit 1867f4d924deabddf7132351b0b55ab53fe4f2b8 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:43:51 2013 +0100 Notes added by 'git notes add' diff --git a/48/b65c174fb6483b0aa69b18891a5c78936e6432 b/48/b65c174fb6483b0aa69b18891a5c78936e6432 new file mode 100644 index 000..a563010 --- /dev/null +++ b/48/b65c174fb6483b0aa69b18891a5c78936e6432 @@ -0,0 +1 @@ +prefer: d50ce284c9674c45acd40d017cc44c260da722a2 commit 4a8fef005a6c03d4a82ed8d686940530aa77235e Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:43:39 2013 +0100 Notes added by 'git notes add' diff --git a/20/75b0da2291174da5dc08f8246857bcc924f777 b/20/75b0da2291174da5dc08f8246857bcc924f777 new file mode 100644 index 000..a563010 --- /dev/null +++ b/20/75b0da2291174da5dc08f8246857bcc924f777 @@ -0,0 +1 @@ +prefer: d50ce284c9674c45acd40d017cc44c260da722a2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 00/93a8cf7a4961ee9ee0fdd3ccadf1cd4900d66c ac/cfa2d9d175b955c939a14f60ffd02bfef70b2e
00/93a8cf7a4961ee9ee0fdd3ccadf1cd4900d66c |1 + ac/cfa2d9d175b955c939a14f60ffd02bfef70b2e |1 + 2 files changed, 2 insertions(+) New commits: commit be18bfd96c813cfa5ec5e8753c95e4a4f6de3a95 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:44:02 2013 +0100 Notes added by 'git notes add' diff --git a/00/93a8cf7a4961ee9ee0fdd3ccadf1cd4900d66c b/00/93a8cf7a4961ee9ee0fdd3ccadf1cd4900d66c new file mode 100644 index 000..a563010 --- /dev/null +++ b/00/93a8cf7a4961ee9ee0fdd3ccadf1cd4900d66c @@ -0,0 +1 @@ +prefer: d50ce284c9674c45acd40d017cc44c260da722a2 commit 3245de9bb1a73345c97e96d17fc166c8aeb8251e Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:43:57 2013 +0100 Notes added by 'git notes add' diff --git a/ac/cfa2d9d175b955c939a14f60ffd02bfef70b2e b/ac/cfa2d9d175b955c939a14f60ffd02bfef70b2e new file mode 100644 index 000..a563010 --- /dev/null +++ b/ac/cfa2d9d175b955c939a14f60ffd02bfef70b2e @@ -0,0 +1 @@ +prefer: d50ce284c9674c45acd40d017cc44c260da722a2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/bf70b5c6040ad9b98b2340b7bcdba9c9699f8c
aa/bf70b5c6040ad9b98b2340b7bcdba9c9699f8c |1 + 1 file changed, 1 insertion(+) New commits: commit d5b347498ff857c8291422c72b4fcaaaf3c611f4 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 14:45:17 2013 +0100 Notes added by 'git notes add' diff --git a/aa/bf70b5c6040ad9b98b2340b7bcdba9c9699f8c b/aa/bf70b5c6040ad9b98b2340b7bcdba9c9699f8c new file mode 100644 index 000..694af1f --- /dev/null +++ b/aa/bf70b5c6040ad9b98b2340b7bcdba9c9699f8c @@ -0,0 +1 @@ +prefer: 4b1d6163d77c956384ce8521ce0406272755c879 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBParser.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c42e8be24e90dc7e3e326a9a53a445f716e414b Author: David Tardon dtar...@redhat.com Date: Sat May 4 15:58:40 2013 +0200 coverity: avoid possible sign extension diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp index 9b150a7..c23fe71 100644 --- a/src/lib/MSPUBParser.cpp +++ b/src/lib/MSPUBParser.cpp @@ -2200,7 +2200,7 @@ libmspub::FOPTValues libmspub::MSPUBParser::extractFOPTValues(WPXInputStream *in entryLength = 4; } input-seek(-6, WPX_SEEK_CUR); -readNBytes(input, entryLength * numEntries + 6, ret.m_complexValues[id]); +readNBytes(input, static_castunsigned long(entryLength) * numEntries + 6, ret.m_complexValues[id]); } return ret; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - src/docrecord.py src/docstream.py test/doc
src/docrecord.py |7 +++
src/docstream.py | 26 ++
test/doc/header.doc |binary
test/doc/header.rtf |4
test/doc/headerlo.doc |binary
test/doc/test.py | 12
6 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit 0ccbaa56a706ec398e4cea1a656ced09829f1f8f
Author: Miklos Vajna vmik...@suse.cz
Date: Sat May 4 16:02:55 2013 +0200
PlcfSed: use retrieveCPs
diff --git a/src/docrecord.py b/src/docrecord.py
index bcd156b..20c63b4 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -300,7 +300,6 @@ class PlcfSed(DOCDirStream, PLC):
def dump(self):
print 'plcfSed type=PlcfSed offset=%d size=%d bytes' %
(self.pos, self.size)
-offset = self.mainStream.fcMin
pos = self.pos
for i in range(self.getElements()):
# aCp
@@ -313,7 +312,7 @@ class PlcfSed(DOCDirStream, PLC):
aSed = Sed(self, self.getOffset(self.pos, i))
aSed.dump()
-print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end,
logicalLength = True))
+print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveCPs(start, end))
print '/aCP'
print '/plcfSed'
commit d8165133205a3c3533211b8e4f0da14de450bdaa
Author: Miklos Vajna vmik...@suse.cz
Date: Sat May 4 15:57:43 2013 +0200
doc: test header dumping of both MSO and LO-generated doc
diff --git a/test/doc/header.doc b/test/doc/header.doc
new file mode 100755
index 000..a351d72
Binary files /dev/null and b/test/doc/header.doc differ
diff --git a/test/doc/header.rtf b/test/doc/header.rtf
new file mode 100644
index 000..b3fd8b4
--- /dev/null
+++ b/test/doc/header.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+{\header This is a header.}
+Hello world!\par
+}
diff --git a/test/doc/headerlo.doc b/test/doc/headerlo.doc
new file mode 100644
index 000..73ec689
Binary files /dev/null and b/test/doc/headerlo.doc differ
diff --git a/test/doc/test.py b/test/doc/test.py
index d02f680..e50e447 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -170,6 +170,18 @@ class Test(unittest.TestCase):
levels =
self.root.findall('stream[@name=WordDocument]/fib/fibRgFcLcbBlob/lcbPlfLst/plfLst/lvl')
self.assertEqual(â¢,
levels[0].findall('xst/rgtchar')[0].attrib['value'])
+def test_header(self):
+self.dump('header')
+
+firstHeader =
self.root.findall('stream[@name=WordDocument]/fib/fibRgFcLcbBlob/lcbPlcfHdd/plcfHdd/aCP[@index=7]')
+self.assertEqual(This is a header.\\x0D\\x0D,
firstHeader[0].findall('transformed')[0].attrib['value'])
+
+def test_headerlo(self):
+self.dump('headerlo')
+
+firstHeader =
self.root.findall('stream[@name=WordDocument]/fib/fibRgFcLcbBlob/lcbPlcfHdd/plcfHdd/aCP[@index=7]')
+self.assertEqual(This is a header.\\x0D\\x0D,
firstHeader[0].findall('transformed')[0].attrib['value'])
+
if __name__ == '__main__':
unittest.main()
commit 89cb847a68c1db6a1177d9a0673a68702de48da2
Author: Miklos Vajna vmik...@suse.cz
Date: Sat May 4 15:50:25 2013 +0200
doc: fix dumping header/footer text in LO-produced files
diff --git a/src/docrecord.py b/src/docrecord.py
index 62ca85f..bcd156b 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -816,7 +816,7 @@ class PlcfHdd(DOCDirStream, PLC):
def dump(self):
print 'plcfHdd type=PlcfHdd offset=%d size=%d bytes' %
(self.pos, self.size)
-offset = self.mainStream.fcMin + self.mainStream.ccpText
+offset = self.mainStream.ccpText + self.mainStream.ccpFtn
pos = self.pos
for i in range(self.getElements() - 1):
start = self.getuInt32(pos = pos)
@@ -837,7 +837,7 @@ class PlcfHdd(DOCDirStream, PLC):
11: First page footer,
}
print 'aCP index=%d contents=%s start=%d end=%d' % (i,
contentsMap[i], start, end)
-print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end))
+print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveCPs(offset + start, offset + end))
pos += 4
print '/aCP'
print '/plcfHdd'
diff --git a/src/docstream.py b/src/docstream.py
index 7f3cc51..dc36baf 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -9,6 +9,7 @@ import ole
import struct
from docdirstream import DOCDirStream
import docrecord
+import globals
class DOCFile:
Represents the whole word file - feed will all bytes.
@@ -674,8 +675,33 @@ class WordDocumentStream(DOCDirStream):
return index
def retrieveText(self, start, end, logicalLength = False):
+Deprecated, use retrieveCPs instead.
plcPcd = self.clx.pcdt.plcPcd
idx = self.__findText(plcPcd, start)
return plcPcd.aPcd[idx].fc.getTransformedValue(start, end,
logicalPositions =
[Libreoffice-commits] .: 6 commits - src/docrecord.py src/docstream.py
src/docrecord.py | 22 +- src/docstream.py |4 ++-- 2 files changed, 11 insertions(+), 15 deletions(-) New commits: commit 0830a4734532a87a1d9a495ba158c8c48c1e534e Author: Miklos Vajna vmik...@suse.cz Date: Sat May 4 16:25:13 2013 +0200 unused parameter diff --git a/src/docstream.py b/src/docstream.py index dc36baf..dec8cb6 100644 --- a/src/docstream.py +++ b/src/docstream.py @@ -674,11 +674,11 @@ class WordDocumentStream(DOCDirStream): index = i return index -def retrieveText(self, start, end, logicalLength = False): +def retrieveText(self, start, end): Deprecated, use retrieveCPs instead. plcPcd = self.clx.pcdt.plcPcd idx = self.__findText(plcPcd, start) -return plcPcd.aPcd[idx].fc.getTransformedValue(start, end, logicalPositions = False, logicalLength = logicalLength) +return plcPcd.aPcd[idx].fc.getTransformedValue(start, end, logicalPositions = False, logicalLength = False) def retrieveCP(self, cp): Implements 2.4.1 Retrieving Text. commit b71e43c41a1551eb5a3df0c1433d0bcc502d8bbe Author: Miklos Vajna vmik...@suse.cz Date: Sat May 4 16:21:36 2013 +0200 PlcFld: use retrieveCPs() diff --git a/src/docrecord.py b/src/docrecord.py index 6248265..b46d0b1 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -177,7 +177,6 @@ class PlcFld(DOCDirStream, PLC): def dump(self): print 'plcFld type=PlcFld offset=%d size=%d bytes' % (self.pos, self.size) -offset = self.mainStream.fcMin # 2.8.25: CPs relative to the start of that document part. pos = self.pos aFlds = [] for i in range(self.getElements()): @@ -192,10 +191,10 @@ class PlcFld(DOCDirStream, PLC): # This is a separator and the previous was a start: display the field instructions. if aFld.fldch.ch == 0x14 and aFlds[-1][1].fldch.ch == 0x13: -print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveText(offset + aFlds[-1][0] + 1, offset + value)) +print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveCPs(aFlds[-1][0] + 1, value)) # This is an end and the previous was a separator: display the field result. elif aFld.fldch.ch == 0x15 and aFlds[-1][1].fldch.ch == 0x14: -print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveText(offset + aFlds[-1][0] + 1, offset + value)) +print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveCPs(aFlds[-1][0] + 1, value)) aFlds.append((value, aFld)) print '/aCP' print '/plcFld' commit d99496077a43fc1be8af940e3505f355f307bc86 Author: Miklos Vajna vmik...@suse.cz Date: Sat May 4 16:18:31 2013 +0200 PlcfGram: use retrieveCPs() diff --git a/src/docrecord.py b/src/docrecord.py index 330dad2..6248265 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -2419,7 +2419,6 @@ class PlcfGram(DOCDirStream, PLC): def dump(self): print 'plcfGram type=PlcfGram offset=%d size=%d bytes' % (self.pos, self.size) -offset = self.mainStream.fcMin pos = self.pos for i in range(self.getElements()): # aCp @@ -2432,7 +2431,7 @@ class PlcfGram(DOCDirStream, PLC): aGrammarSpls = SPLS(GrammarSpls, self, self.getOffset(self.pos, i)) aGrammarSpls.dump() -print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end, logicalLength = True)) +print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveCPs(start, end)) print '/aCP' print '/plcfGram' commit a527473729ccba433fa3adc0b38401dc30647b84 Author: Miklos Vajna vmik...@suse.cz Date: Sat May 4 16:17:23 2013 +0200 PlcfSpl: use retrieveCPs() diff --git a/src/docrecord.py b/src/docrecord.py index a9ba0b0..330dad2 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -2393,7 +2393,6 @@ class PlcfSpl(DOCDirStream, PLC): def dump(self): print 'plcfSpl type=PlcfSpl offset=%d size=%d bytes' % (self.pos, self.size) -offset = self.mainStream.fcMin pos = self.pos for i in range(self.getElements()): # aCp @@ -2406,7 +2405,7 @@ class PlcfSpl(DOCDirStream, PLC): aSpellingSpls = SPLS(SpellingSpls, self, self.getOffset(self.pos, i)) aSpellingSpls.dump() -print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end, logicalLength = True)) +print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveCPs(start, end)) print '/aCP' print '/plcfSpl' commit d0a8cc3c9e74af252efa59831ae0d2bf1087603b Author: Miklos Vajna vmik...@suse.cz Date: Sat May 4 16:14:14 2013 +0200 PlcfandRef: use retrieveCP() diff --git
[Libreoffice-commits] libvisio.git: 2 commits - src/lib
src/lib/VDXParser.cpp |9 +
src/lib/VSDParser.cpp |2 +-
src/lib/VSDXParser.cpp |4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 46a3a1b132333a19855b088129a79c29fc869f73
Author: David Tardon dtar...@redhat.com
Date: Sat May 4 16:33:52 2013 +0200
coverity: make the loop end correctly
The original condition, for a simple NURBS block, would try to read
knots as long as there were anything to read. Because in that case flag
equals 0, which is different from 0x8a, so the loop would be taken again
and again, regardless of the value of repetitions.
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 0f0a7d2..e9c9009 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -1228,7 +1228,7 @@ void libvisio::VSDParser::readNURBSTo(WPXInputStream
*input)
unsigned long bytesRead = input-tell() - inputPos;
unsigned char flag = 0;
if (paramType != 0x8a) flag = readU8(input);
-while ((flag != 0x81 || (paramType == 0x8a repetitions 0))
bytesRead length)
+while ((paramType == 0x8a ? repetitions 0 : flag != 0x81) bytesRead
length)
{
inputPos = input-tell();
double knot_ = 0;
commit a68b8b3557527941cf6d239295834a99bca7afa5
Author: David Tardon dtar...@redhat.com
Date: Sat May 4 16:18:01 2013 +0200
coverity: check return value of xmlTextReaderRead
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index e85f9a9..649cd81 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -212,9 +212,10 @@ void libvisio::VDXParser::processXmlNode(xmlTextReaderPtr
reader)
case XML_SOLUTIONXML:
if (XML_READER_TYPE_ELEMENT == tokenType)
{
+ int ret = 0;
do
{
-xmlTextReaderRead(reader);
+ret = xmlTextReaderRead(reader);
#if 0
// SolutionXML inside VDX file can have invalid namespace URIs
xmlResetLastError();
@@ -222,7 +223,7 @@ void libvisio::VDXParser::processXmlNode(xmlTextReaderPtr
reader)
tokenId = getElementToken(reader);
tokenType = xmlTextReaderNodeType(reader);
}
- while (XML_SOLUTIONXML != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType);
+ while ((XML_SOLUTIONXML != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) 1 == ret);
}
break;
case XML_STYLESHEET:
@@ -847,8 +848,8 @@ int libvisio::VDXParser::getElementDepth(xmlTextReaderPtr
reader)
void libvisio::VDXParser::getBinaryData(xmlTextReaderPtr reader)
{
- xmlTextReaderRead(reader);
- if (XML_READER_TYPE_TEXT == xmlTextReaderNodeType(reader))
+ const int ret = xmlTextReaderRead(reader);
+ if (1 == ret XML_READER_TYPE_TEXT == xmlTextReaderNodeType(reader))
{
const xmlChar *data = xmlTextReaderConstValue(reader);
if (data)
diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index d067d21..ad93585 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -1242,12 +1242,12 @@ void
libvisio::VSDXParser::readCharacter(xmlTextReaderPtr reader)
void libvisio::VSDXParser::getBinaryData(xmlTextReaderPtr reader)
{
- xmlTextReaderRead(reader);
+ const int ret = xmlTextReaderRead(reader);
int tokenId = VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader));
int tokenType = xmlTextReaderNodeType(reader);
m_currentBinaryData.clear();
- if (XML_REL == tokenId XML_READER_TYPE_ELEMENT == tokenType)
+ if (1 == ret XML_REL == tokenId XML_READER_TYPE_ELEMENT == tokenType)
{
xmlChar *id = xmlTextReaderGetAttribute(reader, BAD_CAST(r:id));
if (id)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - instsetoo_native/util Makefile.in odk/CustomTarget_check.mk odk/CustomTarget_doxygen.mk odk/GeneratedPackage_cpp_docs.mk odk/Module_odk.mk odk/Zip_cppdocs.m
Makefile.in |1 instsetoo_native/util/openoffice.lst.in |8 +- odk/CustomTarget_check.mk |2 odk/CustomTarget_doxygen.mk | 14 ++-- odk/GeneratedPackage_cpp_docs.mk| 16 odk/Module_odk.mk |2 odk/Zip_cppdocs.mk | 20 - scp2/source/sdkoo/sdkoo.scp |6 - solenv/gbuild/GeneratedPackage.mk | 111 solenv/gbuild/TargetLocations.mk|2 solenv/gbuild/gbuild.mk |1 11 files changed, 147 insertions(+), 36 deletions(-) New commits: commit ffa50f643c9bed8a6c5970ba72712a1d68d186a6 Author: David Tardon dtar...@redhat.com Date: Sat May 4 13:57:06 2013 +0200 install cpp docs using filelist Change-Id: I93176653935b6ccfd4181e6086444fbe7475f2b0 Reviewed-on: https://gerrit.libreoffice.org/3775 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 6660525..74415a2 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ - $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \ + $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_cpp_docs)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index bddb0f3..6558193 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/cpp)) CPPDOCREFNAME := $(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference @@ -29,17 +29,17 @@ DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-area $(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) $(odk_INCFILELIST)) DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT)) DOXY_WORKDIR := $(if $(filter WNT,$(OS)),\ - $(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\ - $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref) + $(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref),\ + $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref) DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc) -$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\ +$(eval $(call gb_CustomTarget_register_targets,odk/docs/cpp,\ Doxyfile \ doxygen.log \ )) -$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile +$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DOXY_WORKDIR)!' \ @@ -49,8 +49,8 @@ $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \ $ $@ -$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \ - $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \ +$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/doxygen.log : \ + $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile \ $(SRCDIR)/include/sal/log-areas.dox \ $(SRCDIR)/odk/pack/gendocu/main.dox \ $(call gb_PackageSet_get_target,odk_headers) diff --git a/odk/Zip_cppdocs.mk b/odk/GeneratedPackage_cpp_docs.mk similarity index 54% rename from odk/Zip_cppdocs.mk rename to odk/GeneratedPackage_cpp_docs.mk index 1f86757..313980f 100644 --- a/odk/Zip_cppdocs.mk +++ b/odk/GeneratedPackage_cpp_docs.mk @@ -7,14 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,cppdocs,$(call gb_CustomTarget_get_workdir,odk/odkcommon))) +$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_cpp_docs,$(call gb_CustomTarget_get_workdir,odk/docs/cpp))) -$(eval $(call gb_Zip_add_files,cppdocs,\ - docs/cpp/ref \ -)) +$(eval $(call gb_GeneratedPackage_use_customtarget,odk_cpp_docs,odk/docs/cpp)) -$(eval $(call gb_Zip_add_commandoptions,cppdocs,-r)) -
[Libreoffice-commits] core.git: 2 commits - odk/CustomTarget_check.mk odk/CustomTarget_settings.mk odk/Package_settings_generated.mk odk/util
odk/CustomTarget_check.mk |1 -
odk/CustomTarget_settings.mk |6 +++---
odk/Package_settings_generated.mk |2 +-
odk/util/check.pl | 13 ++---
4 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 45b95190860d714f7dba9dcca452931c199581a5
Author: David Tardon dtar...@redhat.com
Date: Sat May 4 14:10:11 2013 +0200
$(WORKDIR)/CustomTarget/odk/odkcommon is no more
Change-Id: I49204b3518c47614e591de47a916901861331673
Reviewed-on: https://gerrit.libreoffice.org/3777
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 74415a2..fb5b2d5 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -50,7 +50,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Helper_print_on_error,\
$(PERL) $ \
$(INSTDIR)/$(gb_Package_SDKDIRNAME) \
- $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
$(odk_PLATFORM) $(gb_Executable_EXT) \
,$@.log \
)
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 542361e..5a2df16 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -23,26 +23,25 @@
$return = 0;
-$PrimaryDir = $ARGV[0];
-$SecondaryDir = $ARGV[1];
-$OperatingSystem = $ARGV[2];
-$ExePrefix = $ARGV[3];
+$SdkDir = $ARGV[0];
+$OperatingSystem = $ARGV[1];
+$ExePrefix = $ARGV[2];
sub check_file
{
my ($file) = @_;
-return -e $PrimaryDir/$file || -e $SecondaryDir/$file;
+return -e $SdkDir/$file;
}
sub check_dir
{
my ($dir) = @_;
-return -d $PrimaryDir/$dir || -d $SecondaryDir/$dir;
+return -d $SdkDir/$dir;
}
print Check for $OperatingSystem\n;
-if (-d $PrimaryDir || -d $SecondaryDir) {
+if (-d $SdkDir) {
# check binaries
print check binaries: ;
if (check_dir(bin)) {
commit da7e3fca9f9b9529a4fa81204b2b22c862bffbb3
Author: David Tardon dtar...@redhat.com
Date: Sat May 4 14:08:33 2013 +0200
drop unneeded odkcommon/
Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e
Reviewed-on: https://gerrit.libreoffice.org/3776
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 581d522..242dd68 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/settings))
-$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk))
+$(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
-$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk :
$(SRCDIR)/odk/pack/copying/dk.mk
+$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk :
$(SRCDIR)/odk/pack/copying/dk.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
tr -d \015 $ | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
-e
's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/'
\
diff --git a/odk/Package_settings_generated.mk
b/odk/Package_settings_generated.mk
index 3813d98..1b3f637 100644
--- a/odk/Package_settings_generated.mk
+++ b/odk/Package_settings_generated.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,odk_settings_generated,$(call
gb_CustomTarget_get_workdir,odk/odkcommon/settings)))
+$(eval $(call gb_Package_Package,odk_settings_generated,$(call
gb_CustomTarget_get_workdir,odk/settings)))
$(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - python3/CustomTarget_PythonFramework.mk python3/ExternalProject_python3.mk python3/GeneratedPackage_python3.mk python3/Module_python3.mk scp2/source solenv/
python3/CustomTarget_PythonFramework.mk | 58 python3/ExternalProject_python3.mk | 51 python3/GeneratedPackage_python3.mk | 18 + python3/Module_python3.mk |2 - scp2/source/python/file_python.scp |6 --- solenv/gbuild/GeneratedPackage.mk |8 6 files changed, 78 insertions(+), 65 deletions(-) New commits: commit 6cac17078c46df312ef145d1c5a136848204c107 Author: David Tardon dtar...@redhat.com Date: Sat May 4 14:59:45 2013 +0200 install python framework using filelist Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1 Reviewed-on: https://gerrit.libreoffice.org/3779 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk new file mode 100644 index 000..91e62bd --- /dev/null +++ b/python3/GeneratedPackage_python3.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO)) + +$(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) + +$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) + +$(eval $(call gb_GeneratedPackage_add_dir,python3,program/LibreOfficePython.framework,LibreOfficePython.framework)) + +# vim: set noet sw=4 ts=4: diff --git a/python3/Module_python3.mk b/python3/Module_python3.mk index 831f79e..eb2ec39 100644 --- a/python3/Module_python3.mk +++ b/python3/Module_python3.mk @@ -15,7 +15,7 @@ ifeq ($(SYSTEM_PYTHON),NO) $(eval $(call gb_Module_add_targets,python3,\ UnpackedTarball_python3 \ ExternalProject_python3 \ - $(if $(filter MACOSX,$(OS)),Zip_PythonFramework,ExternalPackage_python3) \ + $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ )) endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index c065ea4..f6b4e83 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -104,15 +104,9 @@ End File gid_File_Py_Python_Core //FIXME the binaries and libs in the package need x bit but USE_INTERNAL_RIGHTS does not work so set BIN_FILE_BODY here as a temporary hack which makes everything executable BIN_FILE_BODY; - #ifdef MACOSX -Dir = gid_Brand_Dir_Program; -Name = LibreOfficePython.framework.zip; -Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); - #else Dir = FILELIST_DIR; Name = python3.filelist; Styles = (FILELIST,USE_INTERNAL_RIGHTS); - #endif End #ifdef WNT diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index 91714e9..893f929 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -97,6 +97,14 @@ $(call gb_GeneratedPackage_get_target,$(1)) : $(call gb_UnpackedTarball_get_targ endef +# Depend on an external project. +# +# gb_GeneratedPackage_use_external_project package project +define gb_GeneratedPackage_use_external_project +$(call gb_GeneratedPackage_get_target,$(1)) : $(call gb_ExternalProject_get_target,$(2)) + +endef + # Add a dir to the package. # # The srcdir will be copied to $(INSTDIR) as destdir. commit eb5056dc2eb1bed5dffeca889810b0a5d5246b11 Author: David Tardon dtar...@redhat.com Date: Sat May 4 14:50:51 2013 +0200 the MacOS X cleanup is logically a part of build ... so move it to python/ExternalProject_python3.mk, where it belongs. Change-Id: Ib99a6a40182341257f79dd289eac51806be46fcf Reviewed-on: https://gerrit.libreoffice.org/3778 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/python3/CustomTarget_PythonFramework.mk b/python3/CustomTarget_PythonFramework.mk deleted file mode 100644 index e54b5fe..000 --- a/python3/CustomTarget_PythonFramework.mk +++ /dev/null @@ -1,58 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,python3/fixscripts)) -$(eval $(call gb_CustomTarget_CustomTarget,python3/fixinstallnames)) -$(eval $(call gb_CustomTarget_CustomTarget,python3/executables)) - -python3_fw_prefix=$(call
[Libreoffice-commits] core.git: scp2/source
scp2/source/python/file_python.scp |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 054852042554893165f6ee09a6879007b9cf3718 Author: David Tardon dtar...@redhat.com Date: Sat May 4 15:01:36 2013 +0200 bin no longer necessary hack Change-Id: I54ca40343f4abe61aaea5520d27b4c82a2eeaf7a Reviewed-on: https://gerrit.libreoffice.org/3780 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index f6b4e83..6684204 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -102,8 +102,7 @@ End #endif File gid_File_Py_Python_Core -//FIXME the binaries and libs in the package need x bit but USE_INTERNAL_RIGHTS does not work so set BIN_FILE_BODY here as a temporary hack which makes everything executable -BIN_FILE_BODY; +TXT_FILE_BODY; Dir = FILELIST_DIR; Name = python3.filelist; Styles = (FILELIST,USE_INTERNAL_RIGHTS); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: moz/CustomTarget_runtime.mk moz/ExternalPackage_runtime.mk moz/Module_moz.mk moz/Package_runtime.mk moz/UnpackedTarball_mozruntime.mk scp2/source
moz/CustomTarget_runtime.mk | 27 -- moz/ExternalPackage_runtime.mk| 57 ++ moz/Module_moz.mk |2 - moz/Package_runtime.mk| 14 - moz/UnpackedTarball_mozruntime.mk | 14 + scp2/source/ooo/file_ooo.scp |6 ++-- 6 files changed, 75 insertions(+), 45 deletions(-) New commits: commit ea9ba874c3a0d85eb9430dc7913928086fff34c3 Author: David Tardon dtar...@redhat.com Date: Sat May 4 15:14:22 2013 +0200 install moz. runtime files using filelist Change-Id: Iddc1a86d34a6d05f2a2939fb72f057fb387bbe1f Reviewed-on: https://gerrit.libreoffice.org/3781 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/moz/CustomTarget_runtime.mk b/moz/CustomTarget_runtime.mk deleted file mode 100644 index 1296f2a..000 --- a/moz/CustomTarget_runtime.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -MOZ_DEL_LIST := freebl3.dll \ - nspr4.dll \ - nss3.dll \ - plc4.dll \ - plds4.dll \ - smime3.dll \ - softokn3.dll \ - ssl3.dll - -$(eval $(call gb_CustomTarget_CustomTarget,moz/runtime)) - -$(eval $(call gb_CustomTarget_register_target,moz/runtime,mozruntime.zip)) - -$(call gb_CustomTarget_get_workdir,moz/runtime)/mozruntime.zip: $(TARFILE_LOCATION)/$(MOZ_ZIP_RUNTIME) - cp $ $@ - zip -qd $@ $(MOZ_DEL_LIST) - -# vim: set noet sw=4 ts=4: diff --git a/moz/ExternalPackage_runtime.mk b/moz/ExternalPackage_runtime.mk new file mode 100644 index 000..e43519e --- /dev/null +++ b/moz/ExternalPackage_runtime.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime)) + +$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTDIR))) + +$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,program,\ + components/addrbook.dll \ + components/addrbook.xpt \ + components/i18n.dll \ + components/mork.dll \ + components/mozldap.dll \ + components/mozldap.xpt \ + components/necko.dll \ + components/necko_dns.xpt \ + components/pipnss.dll \ + components/pref.xpt \ + components/profile.dll \ + components/rdf.dll \ + components/uconv.dll \ + components/vcard.dll \ + components/xpc3250.dll \ + components/xpcom_base.xpt \ + components/xpcom_compat_c.dll \ + components/xpcom_components.xpt \ + components/xpcom_ds.xpt \ + components/xpcom_io.xpt \ + components/xpcom_obsolete.xpt \ + components/xpcom_thread.xpt \ + components/xpcom_xpti.xpt \ + components/xppref32.dll \ + defaults/autoconfig/platform.js \ + defaults/autoconfig/prefcalls.js \ + defaults/pref/browser-prefs.js \ + defaults/pref/mailnews.js \ + defaults/pref/mdn.js \ + defaults/pref/smime.js \ + greprefs/all.js \ + greprefs/security-prefs.js \ + js3250.dll \ + mozz.dll \ + msgbsutl.dll \ + nsldap32v50.dll \ + nsldappr32v50.dll \ + xpcom.dll \ + xpcom_compat.dll \ + xpcom_core.dll \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/moz/Module_moz.mk b/moz/Module_moz.mk index f447668..3be2c18 100644 --- a/moz/Module_moz.mk +++ b/moz/Module_moz.mk @@ -13,7 +13,7 @@ ifeq ($(WITH_MOZAB4WIN),YES) $(eval $(call gb_Module_add_targets,moz,\ ExternalPackage_moz_lib \ - CustomTarget_runtime \ + ExternalPackage_runtime \ Package_runtime \ UnpackedTarball_moz_inc \ UnpackedTarball_moz_lib \ diff --git a/moz/Package_runtime.mk b/moz/UnpackedTarball_mozruntime.mk similarity index 66% rename from moz/Package_runtime.mk rename to moz/UnpackedTarball_mozruntime.mk index 59fb894..228890c 100644 --- a/moz/Package_runtime.mk +++ b/moz/UnpackedTarball_mozruntime.mk @@ -7,8 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,moz/runtime,$(call gb_CustomTarget_get_workdir,moz/runtime))) +$(eval $(call gb_UnpackedTarball_UnpackedTarball,mozruntime)) -$(eval $(call gb_Package_add_file,moz/runtime,bin/mozruntime.zip,mozruntime.zip)) +$(eval $(call
[PUSHED] gbuild: add Package equiv. for copying whole dirs
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3774 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3774 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f4aa6bf10c6aab30a5b1870e04dca723c123317 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] install cpp docs using filelist
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3775 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3775 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93176653935b6ccfd4181e6086444fbe7475f2b0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] drop unneeded odkcommon/
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3776 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3776 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] $(WORKDIR)/CustomTarget/odk/odkcommon is no more
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3777 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3777 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49204b3518c47614e591de47a916901861331673 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] install python framework using filelist
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3779 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3779 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] bin no longer necessary hack
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3780 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3780 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54ca40343f4abe61aaea5520d27b4c82a2eeaf7a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] the MacOS X cleanup is logically a part of build
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3778 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3778 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib99a6a40182341257f79dd289eac51806be46fcf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] install moz. runtime files using filelist
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3781 Approvals: LibreOffice gerrit bot: Verified David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3781 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddc1a86d34a6d05f2a2939fb72f057fb387bbe1f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/7b24084863c7da7341e2dcd992af517f0c3847
e0/7b24084863c7da7341e2dcd992af517f0c3847 |1 + 1 file changed, 1 insertion(+) New commits: commit 93530b41b198e7bdaf0802eb2b8a1c48d8faae7e Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:28:56 2013 +0100 Notes added by 'git notes add' diff --git a/e0/7b24084863c7da7341e2dcd992af517f0c3847 b/e0/7b24084863c7da7341e2dcd992af517f0c3847 new file mode 100644 index 000..46e73a6 --- /dev/null +++ b/e0/7b24084863c7da7341e2dcd992af517f0c3847 @@ -0,0 +1 @@ +prefer: 82129a0d351cb26203fb8574fbc72c8e91fa9e42 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/AutoInstallLibs_kde.mk scp2/InstallModule_kde.mk scp2/Module_scp2.mk scp2/source solenv/gbuild
Repository.mk |7 +-- scp2/AutoInstallLibs_kde.mk| 12 scp2/InstallModule_kde.mk |9 + scp2/Module_scp2.mk|1 + scp2/source/kde/file_kde.scp | 35 --- scp2/source/kde/module_kde.scp | 16 +++- solenv/gbuild/Helper.mk|2 +- 7 files changed, 23 insertions(+), 59 deletions(-) New commits: commit 4004342ef9cc7b7015b1dfd92c3b1def4df87a5c Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 4 17:34:10 2013 +0200 fdo#60924: autoinstall kde libraries Change-Id: I4c67301b99c2eb066695fc1e85c1e16ea5902d9f diff --git a/Repository.mk b/Repository.mk index f46ac63..9b5180b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -218,6 +218,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ +$(if $(ENABLE_KDE),kdebe1) \ +$(if $(ENABLE_KDE4),kde4be1) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ @@ -601,8 +603,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ gdipluscanvas \ hatchwindowfactory \ i18nsearch \ -kdebe1 \ -kde4be1 \ ldapbe2 \ losessioninstall \ macbe1 \ diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk index 11d5f96..9130b62 100644 --- a/scp2/InstallModule_kde.mk +++ b/scp2/InstallModule_kde.mk @@ -11,15 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/kde)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde)) -$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\ - ENABLE_KDE \ - ENABLE_KDE4 \ -)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/kde,\ -scp2/source/kde/file_kde \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\ scp2/source/kde/module_kde \ )) diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp deleted file mode 100644 index 2f0320a..000 --- a/scp2/source/kde/file_kde.scp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / -#include macros.inc - -#ifdef ENABLE_KDE -STD_LIB_FILE( gid_File_Lib_Kdebe, kdebe1 ) -#endif - -#ifdef ENABLE_KDE4 -STD_LIB_FILE( gid_File_Lib_Kde4be, kde4be1 ) -#endif diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 9d37195..f066710 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -29,7 +29,6 @@ #include AutoInstallLibs/kde -#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 ) Module gid_Module_Optional_Kde ParentID = gid_Module_Optional; Default = YES; @@ -37,16 +36,5 @@ Module gid_Module_Optional_Kde MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); Files = (auto_Kde_Lib_ALL -#ifdef ENABLE_KDE -gid_File_Lib_Kdebe -#ifdef ENABLE_KDE4 -, -#endif // ENABLE_KDE4 -#endif // ENABLE_KDE -#ifdef ENABLE_KDE4 -gid_File_Lib_Kde4be -#endif // ENABLE_KDE4 ); End -#endif - commit d0e099fb5fce0954a36767b62026477448600f68 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 4 16:45:32 2013 +0200 fdo#60924 autoinstall - gbuild/scp2: add kde module Change-Id: Id1a836da9b97ba2b542b68cfa650fede523b0a0e diff --git a/Repository.mk b/Repository.mk index d771646..f46ac63 100644 --- a/Repository.mk +++ b/Repository.mk @@ -217,6 +217,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ diff --git a/scp2/AutoInstallLibs_kde.mk b/scp2/AutoInstallLibs_kde.mk new file mode 100644 index 000..11f65ee --- /dev/null +++ b/scp2/AutoInstallLibs_kde.mk @@
help with --disable-extensions
Hello, i'm trying to do some work finishing --disable-extensions, see attached patch, unfortunately it does not work. At compile time i get these, i assume because extensions module is not providing anything at all: cat: workdir/unxlngx6.pro/InstallModuleTarget/scp2/extensions.filelist: File or directory does not exist cat: workdir/unxlngx6.pro/InstallModuleTarget/scp2/extensions.filelist: File or directory does not exist While at make install i get these: : ERROR: Removing file libbiblo.so from file list. : ERROR: Removing file libpcrlo.so from file list. : ERROR: Removing file libscnlo.so from file list. : ERROR: Removing file libabplo.so from file list. : ERROR: Removing file libdbplo.so from file list. : ERROR: Removing file libldapbe2lo.so from file list. : ERROR: Removing file libloglo.so from file list. : ERROR: Removing file libreslo.so from file list. : ERROR: Removing file libupdatefeedlo.so from file list. : ERROR: Removing file abpen-US.res from file list. : ERROR: Removing file biben-US.res from file list. : ERROR: Removing file dbpen-US.res from file list. : ERROR: Removing file pcren-US.res from file list. : ERROR: Removing file scnen-US.res from file list. : ERROR: Removing file upden-US.res from file list. But i have these files both in workdir and solver, e.g: ./workdir/unxlngx6/Headers/Library/libbiblo.so ./workdir/unxlngx6/LinkTarget/Library/libbiblo.so ./workdir/unxlngx6/ExternalHeaders/Library/libbiblo.so ./solver/unxlngx6/lib/libbiblo.so Any hint? thanks, riccardo diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index d17a73b..7256c9a 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,EPM,epm) \ eventattacher \ $(call gb_Helper_optional,EXPAT,expat) \ - extensions \ + $(call gb_Helper_optional,EXTENSIONS,extensions) \ external \ extras \ fileaccess \ diff --git a/configure.ac b/configure.ac index 41dd1cd..c975e5c 100644 --- a/configure.ac +++ b/configure.ac @@ -2201,6 +2201,8 @@ fi if test $enable_extensions = yes; then BUILD_TYPE=$BUILD_TYPE EXTENSIONS AC_DEFINE(HAVE_FEATURE_EXTENSIONS) +else +SCPDEFS=$SCPDEFS -DDISABLE_EXTENSIONS fi if test -z $enable_scripting; then @@ -8503,7 +8505,8 @@ dnl === AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents]) # Obviously no such thing on iOS or Android. Also not possible when building # 64-bit OS X code as the plugin code uses QuickTime and Carbon. -if test $_os != Android -a $_os != iOS -a \( $_os != Darwin -o $BITNESS_OVERRIDE = \) +if test $_os != Android -a $_os != iOS -a \( $_os != Darwin -o $BITNESS_OVERRIDE = \) -a \ +$enable_headless != yes then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=YES diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index be86ff7..3fadbe6 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -149,11 +149,13 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(filter-out WNT,$(OS)), \ embeddedobj/source/msole/emboleobj \ ) \ - $(if $(DISABLE_ATL),, \ - $(if $(filter WNT,$(OS)), \ - embeddedobj/source/msole/emboleobj.windows \ - embedserv/util/emser \ - extensions/source/ole/oleautobridge \ + $(if $(filter EXTENSIONS,$(BUILD_TYPE)),\ + $(if $(DISABLE_ATL),, \ + $(if $(filter WNT,$(OS)), \ +embeddedobj/source/msole/emboleobj.windows \ +embedserv/util/emser \ +extensions/source/ole/oleautobridge \ + ) \ ) \ ) \ $(if $(DISABLE_NEON),, \ @@ -215,9 +217,11 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_KDE4), \ shell/source/backends/kde4be/kde4be1 \ ) \ - $(if $(ENABLE_ONLINE_UPDATE), \ - extensions/source/update/check/updchk.uno \ - extensions/source/update/ui/updchk \ +$(if $(filter EXTENSIONS,$(BUILD_TYPE)),\ + $(if $(ENABLE_ONLINE_UPDATE), \ + extensions/source/update/check/updchk.uno \ + extensions/source/update/ui/updchk \ + ) \ ) \ $(if $(ENABLE_OPENGL), \ slideshow/source/engine/OGLTrans/ogltrans \ @@ -277,15 +281,17 @@ $(eval $(call gb_Rdb_add_components,services,\ desktop/source/migration/services/migrationoo3 \ desktop/source/offacc/offacc \ $(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \ - extensions/source/abpilot/abp \ - extensions/source/bibliography/bib \ - extensions/source/config/ldap/ldapbe2 \ - extensions/source/dbpilots/dbp \ - extensions/source/logging/log \ - extensions/source/propctrlr/pcr \ - extensions/source/resource/res \ - extensions/source/scanner/scn \ - extensions/source/update/feed/updatefeed \ +$(if $(filter EXTENSIONS,$(BUILD_TYPE)),\ + extensions/source/abpilot/abp \ + extensions/source/bibliography/bib \ + extensions/source/config/ldap/ldapbe2 \ + extensions/source/dbpilots/dbp \ + extensions/source/logging/log \ +
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c1/9292d7740d0787408675d17f2a487df6f040b8
c1/9292d7740d0787408675d17f2a487df6f040b8 |1 + 1 file changed, 1 insertion(+) New commits: commit 618847444adb8a10ae51953fefbe84d5f902c1d2 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:43:06 2013 +0100 Notes added by 'git notes add' diff --git a/c1/9292d7740d0787408675d17f2a487df6f040b8 b/c1/9292d7740d0787408675d17f2a487df6f040b8 new file mode 100644 index 000..79a4009 --- /dev/null +++ b/c1/9292d7740d0787408675d17f2a487df6f040b8 @@ -0,0 +1 @@ +prefer: 1893585d243c7daf5c8782ec6c90c26142d428e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: help with --enable-headless build failing in solver
Hi Matus, Il 04/05/2013 02:41, Matúš Kukan ha scritto: Hi, On 3 May 2013 22:14, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: /home/rm/src/libo/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/rm/src/libo/solver/unxlngx6.pro/xml/component/desktop/source/splash/spl.component. Stop. git suggests that spl related stuff was last touched in 90750f0cbc775505e284d085998d326b2abc1471 . But my untrained eyes don't see anything wrong there. Do you have any hint? Yes, sorry, component files are needed mostly for postprocess/Rdb_services.mk 04353c273142fba62ea9b5fe62d66ee8e13814a2 fixes that. Thanks a lot! While digging i find another occurence of spl. Then i found an occurrence of Library_spl_unx which AFAIU given this scp2/source/ooo/file_library_ooo.scp hunk: #if defined UNX !defined MACOSX !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #endif does not make sense to build right? So does the patch below looks correct? Yes, it looks correct, except you need to also adapt postprocess/Rdb_services.mk and please also adapt Repository.mk [snip] Will do, thanks for the review! riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fa/dba0701348ed1749cb7411fce487a6d9124b5c
fa/dba0701348ed1749cb7411fce487a6d9124b5c |1 + 1 file changed, 1 insertion(+) New commits: commit 0bc2b19f4891d8419ded4554551202926a9088ff Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:44:12 2013 +0100 Notes added by 'git notes add' diff --git a/fa/dba0701348ed1749cb7411fce487a6d9124b5c b/fa/dba0701348ed1749cb7411fce487a6d9124b5c new file mode 100644 index 000..438d172 --- /dev/null +++ b/fa/dba0701348ed1749cb7411fce487a6d9124b5c @@ -0,0 +1 @@ +prefer: 157be160fd8c47f86e798a5ad117a8efbaad196a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/35d17889b1eafe670262a82b95ee04e165d9df
2f/35d17889b1eafe670262a82b95ee04e165d9df |1 + 1 file changed, 1 insertion(+) New commits: commit 0bb8176c3986fad1107ca22249f1865b17747345 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:46:05 2013 +0100 Notes added by 'git notes add' diff --git a/2f/35d17889b1eafe670262a82b95ee04e165d9df b/2f/35d17889b1eafe670262a82b95ee04e165d9df new file mode 100644 index 000..92227f4 --- /dev/null +++ b/2f/35d17889b1eafe670262a82b95ee04e165d9df @@ -0,0 +1 @@ +prefer: e8edaed36e50ee33d1d241ce7ebfbeb0911ccf02 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] SW : Fix crash by checking find result
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3783
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3783/1
SW : Fix crash by checking find result
Change-Id: I6caf18b110dd0a40f09e185c00cb238261457db3
---
M sw/source/core/txtnode/ndtxt.cxx
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 437cf44..07f36ef 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3211,7 +3211,10 @@
if (aHiddenMulti.IsSelected(nDummyCharPos))
continue;
std::vectorblock::iterator aFind =
std::find_if(aBlocks.begin(), aBlocks.end(), containsPos(nDummyCharPos));
-aFind-m_aAttrs.push_back(pAttr);
+if (aFind != aBlocks.end())
+{
+aFind-m_aAttrs.push_back(pAttr);
+}
}
}
}
--
To view, visit https://gerrit.libreoffice.org/3783
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6caf18b110dd0a40f09e185c00cb238261457db3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4e/620795e1decaad8e8a25c3028ad0c270925eb4
4e/620795e1decaad8e8a25c3028ad0c270925eb4 |1 + 1 file changed, 1 insertion(+) New commits: commit 4933d30170d32f1175213531c0045282a58694bd Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:50:49 2013 +0100 Notes added by 'git notes add' diff --git a/4e/620795e1decaad8e8a25c3028ad0c270925eb4 b/4e/620795e1decaad8e8a25c3028ad0c270925eb4 new file mode 100644 index 000..4b07f2d --- /dev/null +++ b/4e/620795e1decaad8e8a25c3028ad0c270925eb4 @@ -0,0 +1 @@ +prefer: 0cbc03f46828296b06bb58ae7e7face7bc1a6364 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 88/e51a69cf60f201526f32536a10c4163a29ec03
88/e51a69cf60f201526f32536a10c4163a29ec03 |1 + 1 file changed, 1 insertion(+) New commits: commit 1de8213fddba9efa7f1c208e7a925fa6a9ebba2b Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:52:18 2013 +0100 Notes added by 'git notes add' diff --git a/88/e51a69cf60f201526f32536a10c4163a29ec03 b/88/e51a69cf60f201526f32536a10c4163a29ec03 new file mode 100644 index 000..8bd6094 --- /dev/null +++ b/88/e51a69cf60f201526f32536a10c4163a29ec03 @@ -0,0 +1 @@ +prefer: c31d7b012f953f4a677fd5a576c0aa8379897879 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1a/169fa0ca55cd10b76205d09ecebc5717afdc77
1a/169fa0ca55cd10b76205d09ecebc5717afdc77 |1 + 1 file changed, 1 insertion(+) New commits: commit 807d3b6e1c1ac8163c7fe768b3746cf276eee792 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 16:54:23 2013 +0100 Notes added by 'git notes add' diff --git a/1a/169fa0ca55cd10b76205d09ecebc5717afdc77 b/1a/169fa0ca55cd10b76205d09ecebc5717afdc77 new file mode 100644 index 000..b37c88f --- /dev/null +++ b/1a/169fa0ca55cd10b76205d09ecebc5717afdc77 @@ -0,0 +1 @@ +prefer: ef9620df989cd1e3ab9cf2e289b035231cca4d39 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bd/f16fe56289011d857533671bb66b5d522f6095
bd/f16fe56289011d857533671bb66b5d522f6095 |1 + 1 file changed, 1 insertion(+) New commits: commit 82e25195b59cd4cd2a427e303ff756bdcf79966b Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:00:18 2013 +0100 Notes added by 'git notes add' diff --git a/bd/f16fe56289011d857533671bb66b5d522f6095 b/bd/f16fe56289011d857533671bb66b5d522f6095 new file mode 100644 index 000..8bd6094 --- /dev/null +++ b/bd/f16fe56289011d857533671bb66b5d522f6095 @@ -0,0 +1 @@ +prefer: c31d7b012f953f4a677fd5a576c0aa8379897879 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/pre_MergedLibsList.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit ba09793d3b566d30ecb49422ce02fe4b2e2c7600 Author: Peter Foley pefol...@verizon.net Date: Sat May 4 09:24:21 2013 -0400 do not merge pyuno/pyloader Change-Id: I2803eaa9dcd516059fc879e1ca98dc3a5f088284 diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 6cc023f..496a402 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -77,8 +77,6 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ pdffilter \ placeware \ - $(call gb_Helper_optional,PYUNO,pythonloader) \ - $(call gb_Helper_optional,PYUNO,pyuno) \ res \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cf/579279ea58e704afaac1d0f29cfe75d6f0d02c
cf/579279ea58e704afaac1d0f29cfe75d6f0d02c |1 + 1 file changed, 1 insertion(+) New commits: commit 18b5852a033f51c11c433dcca31e630e933bf6ad Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:01:38 2013 +0100 Notes added by 'git notes add' diff --git a/cf/579279ea58e704afaac1d0f29cfe75d6f0d02c b/cf/579279ea58e704afaac1d0f29cfe75d6f0d02c new file mode 100644 index 000..2d5953f --- /dev/null +++ b/cf/579279ea58e704afaac1d0f29cfe75d6f0d02c @@ -0,0 +1 @@ +prefer: 3297ce2aa13efc6029983b716cec20ed7befda56 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fd/9ba2f5e22ea8e7a09698731db026ee8d792011
fd/9ba2f5e22ea8e7a09698731db026ee8d792011 |1 + 1 file changed, 1 insertion(+) New commits: commit 22c7ebfc55211d82bd3d06c3e431f099bceb0aa3 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:03:52 2013 +0100 Notes added by 'git notes add' diff --git a/fd/9ba2f5e22ea8e7a09698731db026ee8d792011 b/fd/9ba2f5e22ea8e7a09698731db026ee8d792011 new file mode 100644 index 000..df8facc --- /dev/null +++ b/fd/9ba2f5e22ea8e7a09698731db026ee8d792011 @@ -0,0 +1 @@ +prefer: 6241230a115dce2969d355706e8e5ff6925f43ef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - da/efa1113e6ff540c8832c1fbb1da00d0a7b389a
da/efa1113e6ff540c8832c1fbb1da00d0a7b389a |1 + 1 file changed, 1 insertion(+) New commits: commit 2de087415a5b4259463707dc380886d4d391a464 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:04:49 2013 +0100 Notes added by 'git notes add' diff --git a/da/efa1113e6ff540c8832c1fbb1da00d0a7b389a b/da/efa1113e6ff540c8832c1fbb1da00d0a7b389a new file mode 100644 index 000..88c1b4a --- /dev/null +++ b/da/efa1113e6ff540c8832c1fbb1da00d0a7b389a @@ -0,0 +1 @@ +prefer: 8da131e21d44ca21c8bf494cf06a87ab2ea27292 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/750036bb5f3aad2921e3a8d4c8db5593fee1e7
c0/750036bb5f3aad2921e3a8d4c8db5593fee1e7 |1 + 1 file changed, 1 insertion(+) New commits: commit 851a9a97b0e5ca33b4c3998534a0030c6cf6d070 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:07:06 2013 +0100 Notes added by 'git notes add' diff --git a/c0/750036bb5f3aad2921e3a8d4c8db5593fee1e7 b/c0/750036bb5f3aad2921e3a8d4c8db5593fee1e7 new file mode 100644 index 000..cc6d026 --- /dev/null +++ b/c0/750036bb5f3aad2921e3a8d4c8db5593fee1e7 @@ -0,0 +1 @@ +prefer: a3d4063f8842cba7c3ecec036dabb62918838b34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: help with --disable-extensions
On 4 May 2013 17:41, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: i'm trying to do some work finishing --disable-extensions, see attached patch, unfortunately it does not work. Hmm, is it a good idea. At least I find the name a bit confusing - if you are trying by this to not build extensions/ module where no extension (in the sense of .oxt file) is built - only some libraries (and no idea what else) I doubt it makes sense - to not build extensions (the change in RepositoryModule_host.mk - was it intentional ? ) - but possibly I am wrong. At compile time i get these, i assume because extensions module is not providing anything at all: cat: workdir/unxlngx6.pro/InstallModuleTarget/scp2/extensions.filelist: File or directory does not exist cat: workdir/unxlngx6.pro/InstallModuleTarget/scp2/extensions.filelist: File or directory does not exist That's from scp2/InstallScript_setup_osl.mk I think. : ERROR: Removing file libbiblo.so from file list. But i have these files both in workdir and solver, e.g: ./workdir/unxlngx6/Headers/Library/libbiblo.so ./workdir/unxlngx6/LinkTarget/Library/libbiblo.so ./workdir/unxlngx6/ExternalHeaders/Library/libbiblo.so ./solver/unxlngx6/lib/libbiblo.so Any hint? It should be ./solver/unxlngx6**.pro**/lib/libbiblo.so I guess from your previous error ? you need to adapt scp2 if you really don't want this stuff. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f9/b703eabdca69bcd542424908c4121c7b4823a4
f9/b703eabdca69bcd542424908c4121c7b4823a4 |1 + 1 file changed, 1 insertion(+) New commits: commit 6b3b22f2fca2c590ce0ace71e83982623e68b93a Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:08:12 2013 +0100 Notes added by 'git notes add' diff --git a/f9/b703eabdca69bcd542424908c4121c7b4823a4 b/f9/b703eabdca69bcd542424908c4121c7b4823a4 new file mode 100644 index 000..8bd6094 --- /dev/null +++ b/f9/b703eabdca69bcd542424908c4121c7b4823a4 @@ -0,0 +1 @@ +prefer: c31d7b012f953f4a677fd5a576c0aa8379897879 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7c/2720aa57ce168f189362579fc7e9145ac491da
7c/2720aa57ce168f189362579fc7e9145ac491da |1 + 1 file changed, 1 insertion(+) New commits: commit a7659e251739f206d38feaeb3c064b60bcc87b97 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:10:36 2013 +0100 Notes added by 'git notes add' diff --git a/7c/2720aa57ce168f189362579fc7e9145ac491da b/7c/2720aa57ce168f189362579fc7e9145ac491da new file mode 100644 index 000..1ce2292 --- /dev/null +++ b/7c/2720aa57ce168f189362579fc7e9145ac491da @@ -0,0 +1 @@ +prefer: 1f4edb5dedd265b5ba155d34df5a802f36d158b4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 93/1f9852290ebb4671f66ef468b7db267ccd370d
93/1f9852290ebb4671f66ef468b7db267ccd370d |1 + 1 file changed, 1 insertion(+) New commits: commit 204b0546fe9ccfb6e086be243dfb50a4c2ece2b6 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:11:20 2013 +0100 Notes added by 'git notes add' diff --git a/93/1f9852290ebb4671f66ef468b7db267ccd370d b/93/1f9852290ebb4671f66ef468b7db267ccd370d new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/93/1f9852290ebb4671f66ef468b7db267ccd370d @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c1/91f2cb50688167d33566c509dc5101fa8bf05d
c1/91f2cb50688167d33566c509dc5101fa8bf05d |1 + 1 file changed, 1 insertion(+) New commits: commit 7a8faeaa5d8c10edafdc3da6f341358a4dc0c234 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:13:03 2013 +0100 Notes added by 'git notes add' diff --git a/c1/91f2cb50688167d33566c509dc5101fa8bf05d b/c1/91f2cb50688167d33566c509dc5101fa8bf05d new file mode 100644 index 000..2e58274 --- /dev/null +++ b/c1/91f2cb50688167d33566c509dc5101fa8bf05d @@ -0,0 +1 @@ +prefer: 252e599b22f08a8138b78e4215c33a86f5889fef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3f/d02d53d31c34f525919c5fbdf15c5aef1bd0f2
3f/d02d53d31c34f525919c5fbdf15c5aef1bd0f2 |1 + 1 file changed, 1 insertion(+) New commits: commit d11ff9e728b27fd7c8a4077eee793c31d7be5ba1 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:14:47 2013 +0100 Notes added by 'git notes add' diff --git a/3f/d02d53d31c34f525919c5fbdf15c5aef1bd0f2 b/3f/d02d53d31c34f525919c5fbdf15c5aef1bd0f2 new file mode 100644 index 000..cceff6b --- /dev/null +++ b/3f/d02d53d31c34f525919c5fbdf15c5aef1bd0f2 @@ -0,0 +1 @@ +prefer: 772558d87f4b32aecc530664ffd26aeeb4593067 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2e/6a5683057944c8494145ab8dffdc2d5a26ac3b
2e/6a5683057944c8494145ab8dffdc2d5a26ac3b |1 + 1 file changed, 1 insertion(+) New commits: commit ac7bed2e7c07a441655548384496cf629fff9479 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:18:19 2013 +0100 Notes added by 'git notes add' diff --git a/2e/6a5683057944c8494145ab8dffdc2d5a26ac3b b/2e/6a5683057944c8494145ab8dffdc2d5a26ac3b new file mode 100644 index 000..99b2eb0 --- /dev/null +++ b/2e/6a5683057944c8494145ab8dffdc2d5a26ac3b @@ -0,0 +1 @@ +prefer: aa8b7fdd6165cc54eab485d3f24c894a3bdb0f06 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7c/c799bc7638fe15ca2fa68d2c15fb3c99c29585
7c/c799bc7638fe15ca2fa68d2c15fb3c99c29585 |1 + 1 file changed, 1 insertion(+) New commits: commit dd05bd201d9dd028a24ec0aa4287dd266e2f5832 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 17:19:12 2013 +0100 Notes added by 'git notes add' diff --git a/7c/c799bc7638fe15ca2fa68d2c15fb3c99c29585 b/7c/c799bc7638fe15ca2fa68d2c15fb3c99c29585 new file mode 100644 index 000..df8facc --- /dev/null +++ b/7c/c799bc7638fe15ca2fa68d2c15fb3c99c29585 @@ -0,0 +1 @@ +prefer: 6241230a115dce2969d355706e8e5ff6925f43ef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/winpluginlib.cxx | 31 +--
1 file changed, 5 insertions(+), 26 deletions(-)
New commits:
commit e61ea2d79f96a96314f0135ad6cf820b6ae57b5d
Author: Andras Timar ati...@suse.com
Date: Sat May 4 09:48:27 2013 -0700
fdo#54087 refactor/fix browser plugin detection on Windows
Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.
Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
diff --git a/cui/source/dialogs/winpluginlib.cxx
b/cui/source/dialogs/winpluginlib.cxx
index ce4ab24..5391375 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -33,37 +33,18 @@
extern C {
int lc_isInstalled(const char* realFilePath)
{
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
char sSoPath[SO_PATH_SIZE];
char sPluginPath[SO_PATH_SIZE];
LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
return -1;
}
}
-ret = RegOpenKeyEx(hKeySoftware, MozillaPlugins, 0, KEY_READ,
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins, @sun.com/npsopluginmi;version=1.0,
0, KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
if((realFilePath == NULL) || (strlen(realFilePath) == 0) ||
(strlen(realFilePath) = SO_PATH_SIZE))
ret = -1;
@@ -76,7 +57,7 @@ int lc_isInstalled(const char* realFilePath)
if(ret == 0){
DWORD dType = REG_SZ;
DWORD dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
if(ret == ERROR_SUCCESS){
if(strcmp(sPluginPath, sSoPath) == 0)
ret = 0;
@@ -88,9 +69,7 @@ int lc_isInstalled(const char* realFilePath)
}
else
ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
return ret;
}
___
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-4.0' - cui/source
cui/source/dialogs/winpluginlib.cxx | 31 +--
1 file changed, 5 insertions(+), 26 deletions(-)
New commits:
commit 9ec6a9d7b50b2cb8b026cb2e8efe74806adbafcd
Author: Andras Timar ati...@suse.com
Date: Sat May 4 09:48:27 2013 -0700
fdo#54087 refactor/fix browser plugin detection on Windows
Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.
Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
diff --git a/cui/source/dialogs/winpluginlib.cxx
b/cui/source/dialogs/winpluginlib.cxx
index ce4ab24..5391375 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -33,37 +33,18 @@
extern C {
int lc_isInstalled(const char* realFilePath)
{
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
char sSoPath[SO_PATH_SIZE];
char sPluginPath[SO_PATH_SIZE];
LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
return -1;
}
}
-ret = RegOpenKeyEx(hKeySoftware, MozillaPlugins, 0, KEY_READ,
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins, @sun.com/npsopluginmi;version=1.0,
0, KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
if((realFilePath == NULL) || (strlen(realFilePath) == 0) ||
(strlen(realFilePath) = SO_PATH_SIZE))
ret = -1;
@@ -76,7 +57,7 @@ int lc_isInstalled(const char* realFilePath)
if(ret == 0){
DWORD dType = REG_SZ;
DWORD dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
if(ret == ERROR_SUCCESS){
if(strcmp(sPluginPath, sSoPath) == 0)
ret = 0;
@@ -88,9 +69,7 @@ int lc_isInstalled(const char* realFilePath)
}
else
ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
return ret;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#54087 refactor/fix browser plugin detection on Windows
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3784
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3784/1
fdo#54087 refactor/fix browser plugin detection on Windows
Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.
Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
---
M cui/source/dialogs/winpluginlib.cxx
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/cui/source/dialogs/winpluginlib.cxx
b/cui/source/dialogs/winpluginlib.cxx
index ce4ab24..5391375 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -33,36 +33,17 @@
extern C {
int lc_isInstalled(const char* realFilePath)
{
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
char sSoPath[SO_PATH_SIZE];
char sPluginPath[SO_PATH_SIZE];
LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
return -1;
}
-}
-ret = RegOpenKeyEx(hKeySoftware, MozillaPlugins, 0, KEY_READ,
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins, @sun.com/npsopluginmi;version=1.0,
0, KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
}
if((realFilePath == NULL) || (strlen(realFilePath) == 0) ||
(strlen(realFilePath) = SO_PATH_SIZE))
@@ -76,7 +57,7 @@
if(ret == 0){
DWORD dType = REG_SZ;
DWORD dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
if(ret == ERROR_SUCCESS){
if(strcmp(sPluginPath, sSoPath) == 0)
ret = 0;
@@ -88,9 +69,7 @@
}
else
ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
return ret;
}
--
To view, visit https://gerrit.libreoffice.org/3784
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
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
[PATCH libreoffice-3-6] fdo#54087 refactor/fix browser plugin detection on Windows
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3785
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3785/1
fdo#54087 refactor/fix browser plugin detection on Windows
Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.
Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
---
M cui/source/dialogs/winpluginlib.cxx
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/cui/source/dialogs/winpluginlib.cxx
b/cui/source/dialogs/winpluginlib.cxx
index 237e33b..b34d3be 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -42,36 +42,17 @@
extern C {
int lc_isInstalled(const char* realFilePath)
{
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
char sSoPath[SO_PATH_SIZE];
char sPluginPath[SO_PATH_SIZE];
LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE, 0, KEY_READ,
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ,
hLibreOffice);
if(ret != ERROR_SUCCESS){
return -1;
}
-}
-ret = RegOpenKeyEx(hKeySoftware, MozillaPlugins, 0, KEY_READ,
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins, @sun.com/npsopluginmi;version=1.0,
0, KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
}
if((realFilePath == NULL) || (strlen(realFilePath) == 0) ||
(strlen(realFilePath) = SO_PATH_SIZE))
@@ -85,7 +66,7 @@
if(ret == 0){
DWORD dType = REG_SZ;
DWORD dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL, dType , (LPBYTE)
sPluginPath, dSize);
if(ret == ERROR_SUCCESS){
if(strcmp(sPluginPath, sSoPath) == 0)
ret = 0;
@@ -97,9 +78,7 @@
}
else
ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
return ret;
}
--
To view, visit https://gerrit.libreoffice.org/3785
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Andras Timar ati...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --ena...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3786 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3786/1 configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --enable-headless This fix a build error since otherwise X libraries are required Backport of 759cc27530a5f58b43721f2d760c9429561a12fd Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 390b3eb..b196fe9 100644 --- a/configure.ac +++ b/configure.ac @@ -8304,7 +8304,7 @@ dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents dnl === AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents]) -if test $_os != Android -a $_os != iOS +if test $_os != Android -a $_os != iOS -a $enable_headless != yes then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=YES -- To view, visit https://gerrit.libreoffice.org/3786 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docstream.py
src/docrecord.py | 25 -
src/docstream.py | 23 ++-
2 files changed, 22 insertions(+), 26 deletions(-)
New commits:
commit 2c4e52467c405d35823a781e7745a1fe7ae42a30
Author: Miklos Vajna vmik...@suse.cz
Date: Sat May 4 20:09:32 2013 +0200
retrieveText - retrieveOffset
So finally we have retrieveOffset to look up text based on raw byte
offsets and retrieveCP to look up logical character positions.
retrieveText tried to do both, without success.
diff --git a/src/docrecord.py b/src/docrecord.py
index b46d0b1..9fda05f 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -30,23 +30,6 @@ class FcCompressed(DOCDirStream):
self.printAndSet(r1, self.r1)
print '/fcCompressed'
-def getTransformedValue(self, start, end, logicalPositions = True,
logicalLength = True):
-offset = self.fc
-if self.fCompressed:
-offset = self.fc/2
-if logicalPositions:
-fro = offset + start
-to = offset + end
-else:
-fro = start
-to = end
-if self.fCompressed:
-return globals.encodeName(self.mainStream.bytes[fro:to])
-else:
-if logicalLength:
-to += (to - fro)
-return
globals.encodeName(self.mainStream.bytes[fro:to].decode('utf-16'), lowOnly =
True)
-
class Pcd(DOCDirStream):
The Pcd structure specifies the location of text in the WordDocument
Stream and additional properties for this text.
def __init__(self, bytes, mainStream, offset, size):
@@ -217,7 +200,7 @@ class PlcfBkl(DOCDirStream, PLC):
end = offset + self.getuInt32(pos = pos)
print 'aCP index=%d bookmarkEnd=%d' % (i, end)
start = self.start.aCP[i]
-print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveText(start, end))
+print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveOffset(start, end))
pos += 4
print '/aCP'
print '/plcfBkl'
@@ -252,7 +235,7 @@ class PlcPcd(DOCDirStream, PLC):
start, end = self.ranges[i]
print 'aCP index=%d start=%d end=%d' % (i, start, end)
self.aPcd[i].dump()
-print 'transformed value=%s/' %
self.quoteAttr(self.aPcd[i].fc.getTransformedValue(start, end))
+print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveCPs(start, end))
print '/aCP'
print '/plcPcd'
@@ -675,7 +658,7 @@ class ChpxFkp(DOCDirStream):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print 'rgfc index=%d start=%d end=%d' % (i, start, end)
-print 'transformed value=%s/' %
self.quoteAttr(self.pnFkpChpx.mainStream.retrieveText(start, end))
+print 'transformed value=%s/' %
self.quoteAttr(self.pnFkpChpx.mainStream.retrieveOffset(start, end))
pos += 4
# rgbx
@@ -704,7 +687,7 @@ class PapxFkp(DOCDirStream):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print 'rgfc index=%d start=%d end=%d' % (i, start, end)
-print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveText(start, end))
+print 'transformed value=%s/' %
self.quoteAttr(self.mainStream.retrieveOffset(start, end))
pos += 4
# rgbx
diff --git a/src/docstream.py b/src/docstream.py
index dec8cb6..d98e0ea 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -674,11 +674,25 @@ class WordDocumentStream(DOCDirStream):
index = i
return index
-def retrieveText(self, start, end):
-Deprecated, use retrieveCPs instead.
+def retrieveOffset(self, start, end):
+Retrieves text, defined by raw byte offsets.
+
+# Is the given offset compressed?
plcPcd = self.clx.pcdt.plcPcd
-idx = self.__findText(plcPcd, start)
-return plcPcd.aPcd[idx].fc.getTransformedValue(start, end,
logicalPositions = False, logicalLength = False)
+for i in range(len(plcPcd.aCp)):
+aPcd = plcPcd.aPcd[i]
+fcCompressed = aPcd.fc
+if fcCompressed.fCompressed == 1:
+offset = fcCompressed.fc/2
+else:
+offset = fcCompressed.fc
+if offset = start:
+compressed = fcCompressed.fCompressed
+
+if compressed:
+return globals.encodeName(self.bytes[start:end])
+else:
+return globals.encodeName(self.bytes[start:end].decode('utf-16'),
lowOnly = True)
def retrieveCP(self, cp):
Implements 2.4.1 Retrieving Text.
@@ -686,7 +700,6 @@ class WordDocumentStream(DOCDirStream):
for i in range(len(plcPcd.aCp)):
if plcPcd.aCp[i] = cp:
index = i
-break
[Libreoffice-commits] core.git: 2 commits - cui/source vcl/source
cui/source/inc/macroass.hxx |1 +
cui/source/tabpages/macroass.cxx | 31 +++
vcl/source/window/builder.cxx|3 +++
3 files changed, 27 insertions(+), 8 deletions(-)
New commits:
commit cf3d6757a9052565fa8f5b3301e2fe6874af2f66
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 3 17:17:10 2013 +0100
fix macro assign dialog
Which was empty of contents e.g. from autotext-macro...
because of 5d84af7e83404f22d3c9cd0b0bb88fb84d0550e7
fdo#57553: Picture dialog Macro tab page: lazily init
which was because of bd2c14ec78a7549d4a19738154cdd5ea890f61c4
we have to have all tabpages in all modes now
which was because we need to create all tabpages in order to determine their
size for layout.
Change-Id: I01fe03abf3e4582e87927729286a21d0bac7037c
Change-Id: Ic662f6a927225b56820ccebf135b82ab1631974d
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 133d88f..72ccce6 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -69,6 +69,7 @@ public:
virtual voidPageCreated (SfxAllItemSet aSet);
using TabPage::ActivatePage; // FIXME WTF is this nonsense?
virtual voidActivatePage( const SfxItemSet );
+voidLaunchFillGroup();
// - inherit from the base -
virtual sal_BoolFillItemSet( SfxItemSet rSet );
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 6c127c4..92db6dd 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -213,6 +213,16 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet rSet )
return sal_False;
}
+void _SfxMacroTabPage::LaunchFillGroup()
+{
+if (!mpImpl-maFillGroupTimer.GetTimeoutHdl().IsSet())
+{
+mpImpl-maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this,
_SfxMacroTabPage, TimeOut_Impl ) );
+mpImpl-maFillGroupTimer.SetTimeout( 0 );
+mpImpl-maFillGroupTimer.Start();
+}
+}
+
void _SfxMacroTabPage::ActivatePage( const SfxItemSet )
{
// fdo#57553 lazily init script providers, because it is annoying if done
@@ -220,13 +230,9 @@ void _SfxMacroTabPage::ActivatePage( const SfxItemSet )
if (!mpImpl-m_bDummyActivated)
{
mpImpl-m_bDummyActivated = true;
+return;
}
-else if (!mpImpl-maFillGroupTimer.GetTimeoutHdl().IsSet())
-{
-mpImpl-maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this,
_SfxMacroTabPage, TimeOut_Impl ) );
-mpImpl-maFillGroupTimer.SetTimeout( 0 );
-mpImpl-maFillGroupTimer.Start();
-}
+LaunchFillGroup();
}
void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
@@ -477,17 +483,26 @@ SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const
ResId rResId, const Re
ScriptChanged();
}
+namespace
+{
+SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet
rAttrSet )
+{
+return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN
), NULL, rAttrSet );
+}
+}
+
SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet
rAttrSet )
{
-return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN ),
NULL, rAttrSet );
+return CreateSfxMacroTabPage(pParent, rAttrSet);
}
SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference XFrame
rxDocumentFrame, const SfxItemSet rSet )
: SfxNoLayoutSingleTabDialog( pParent, rSet, 0 )
{
-SfxTabPage* pPage = SfxMacroTabPage::Create( this, rSet );
+SfxMacroTabPage* pPage = CreateSfxMacroTabPage(this, rSet);
pPage-SetFrame( rxDocumentFrame );
SetTabPage( pPage );
+pPage-LaunchFillGroup();
}
SfxMacroAssignDlg::~SfxMacroAssignDlg()
commit 742e67453fba6ea540cc6f90ee52414b16543694
Author: Caolán McNamara caol...@redhat.com
Date: Sat May 4 20:12:30 2013 +0100
extract correct widget id for responses
Change-Id: I5ce14e346b8ee609fdad4deae9929a90cbadd84e
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index cc3919e..c3e0a7f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2495,6 +2495,9 @@ void VclBuilder::handleActionWidget(xmlreader::XmlReader
reader)
reader.nextItem(xmlreader::XmlReader::TEXT_RAW, name, nsId);
OString sID = OString(name.begin, name.length);
+sal_Int32 nDelim = sID.indexOf(':');
+if (nDelim != -1)
+sID = sID.copy(0, nDelim);
set_response(sID, sResponse.toInt32());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 68/e707bbc6fe23881b822e6efab8a2933343dc1a
68/e707bbc6fe23881b822e6efab8a2933343dc1a |1 + 1 file changed, 1 insertion(+) New commits: commit a3ee88efab2de0f311033e11086ac226b6701a41 Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 20:54:02 2013 +0100 Notes added by 'git notes add' diff --git a/68/e707bbc6fe23881b822e6efab8a2933343dc1a b/68/e707bbc6fe23881b822e6efab8a2933343dc1a new file mode 100644 index 000..b891babe --- /dev/null +++ b/68/e707bbc6fe23881b822e6efab8a2933343dc1a @@ -0,0 +1 @@ +merged as: 85f49fdccddef6b5a5bdc1b95f5b04714179c898 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 40/1e8f2db607081e62eaaa1f08a8cd8971a3f637
40/1e8f2db607081e62eaaa1f08a8cd8971a3f637 |1 + 1 file changed, 1 insertion(+) New commits: commit 098c55da2bfc4f419a670ff61ea53c957f4f7efa Author: Caolán McNamara caol...@redhat.com Date: Sat May 4 20:54:30 2013 +0100 Notes added by 'git notes add' diff --git a/40/1e8f2db607081e62eaaa1f08a8cd8971a3f637 b/40/1e8f2db607081e62eaaa1f08a8cd8971a3f637 new file mode 100644 index 000..b891babe --- /dev/null +++ b/40/1e8f2db607081e62eaaa1f08a8cd8971a3f637 @@ -0,0 +1 @@ +merged as: 85f49fdccddef6b5a5bdc1b95f5b04714179c898 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#39468 Translate German Comments - rest of vcl/source/edi...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3787
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3787/1
fdo#39468 Translate German Comments - rest of vcl/source/edit/...
Change-Id: I6cb657853cf3e8d4e35c0dc09be6a4a15ba3a336
---
M vcl/source/edit/textund2.hxx
M vcl/source/edit/textundo.cxx
M vcl/source/edit/textview.cxx
M vcl/source/edit/vclmedit.cxx
M vcl/source/edit/xtextedt.cxx
5 files changed, 108 insertions(+), 170 deletions(-)
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 17a2918..396317e 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -26,9 +26,9 @@
class TextUndoDelPara : public TextUndo
{
private:
-sal_BoolmbDelObject;
-sal_uLong mnPara;
-TextNode* mpNode; // Zeigt auf das gueltige, nicht zerstoerte Objekt!
+sal_BoolmbDelObject;
+sal_uLong mnPara;
+TextNode* mpNode; // points at the valid not-destroyed object
public:
TYPEINFO();
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 3cbb85d..c37bfea 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -65,10 +65,6 @@
} // namespace
-//
-// TextUndoManager
-// ===
-//
TextUndoManager::TextUndoManager( TextEngine* p )
{
@@ -115,9 +111,6 @@
void TextUndoManager::UndoRedoStart()
{
DBG_ASSERT( GetView(), Undo/Redo: Active View? );
-
-// if ( GetView() )
-// GetView()-HideSelection();
}
void TextUndoManager::UndoRedoEnd()
@@ -133,12 +126,6 @@
mpTextEngine-FormatAndUpdate( GetView() );
}
-
-
-//
-// TextUndo
-//
-//
TextUndo::TextUndo( TextEngine* p )
{
@@ -160,12 +147,6 @@
GetView()-ImpSetSelection( rSel );
}
-
-//
-// TextUndoDelPara
-// ===
-//
-
TextUndoDelPara::TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode,
sal_uLong nPara )
: TextUndo( pTextEngine )
{
@@ -183,7 +164,7 @@
void TextUndoDelPara::Undo()
{
GetTextEngine()-InsertContent( mpNode, mnPara );
-mbDelObject = sal_False;// gehoert wieder der Engine
+mbDelObject = sal_False;// belongs again to the engine
if ( GetView() )
{
@@ -194,18 +175,17 @@
void TextUndoDelPara::Redo()
{
-// pNode stimmt nicht mehr, falls zwischendurch Undos, in denen
-// Absaetze verschmolzen sind.
+// pNode is not valid anymore in case an Undo joined paragraphs
mpNode = GetDoc()-GetNodes().GetObject( mnPara );
delete GetTEParaPortions()-GetObject( mnPara );
GetTEParaPortions()-Remove( mnPara );
-// Node nicht loeschen, haengt im Undo!
+// do not delte Node because of Undo!
GetDoc()-GetNodes().Remove( mnPara );
GetTextEngine()-ImpParagraphRemoved( mnPara );
-mbDelObject = sal_True; // gehoert wieder dem Undo
+mbDelObject = sal_True; // belongs again to the Undo
sal_uLong nParas = GetDoc()-GetNodes().Count();
sal_uLong n = mnPara nParas ? mnPara : (nParas-1);
@@ -218,12 +198,6 @@
{
return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr());
}
-
-
-//
-// TextUndoConnectParas
-//
-//
TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong
nPara, sal_uInt16 nPos )
: TextUndo( pTextEngine )
@@ -253,12 +227,6 @@
return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr());
}
-
-//
-// TextUndoSplitPara
-// =
-//
-
TextUndoSplitPara::TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong
nPara, sal_uInt16 nPos )
: TextUndo( pTextEngine )
{
@@ -286,12 +254,6 @@
{
return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr());
}
-
-
-//
-// TextUndoInsertChars
-// ===
-//
TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const
TextPaM rTextPaM, const XubString rStr )
: TextUndo( pTextEngine ),
@@ -341,13 +303,6 @@
Shorten(sText);
return OUString(ResId(STR_TEXTUNDO_INSERTCHARS,
*ImplGetResMgr())).replaceAll($1, sText);
}
-
-
-
-//
-// TextUndoRemoveChars
-// ===
-//
TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const
TextPaM rTextPaM, const XubString rStr )
: TextUndo( pTextEngine ),
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 4483616..5b5adde 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -177,9 +177,6 @@
boolmbCursorAtEndOfLine;
};
-// -
-// (+) class TextView
-// -
TextView::TextView( TextEngine* pEng, Window* pWindow ) :
mpImpl(new ImpTextView)
{
@@ -254,12 +251,11 @@
void TextView::SetSelection( const TextSelection rTextSel,
fdo#41572 Making it possible to add custom animation to master slides
Hey ! I am hereby attaching a patch that shows my initial work on the task ,and it would be great if someone can guide if i am going swrong somewhere. Though it is not complete according to my plans on the code,but still it would be great if there is some more efficient code pointers someone can provide. Regards, Janit 0001-fdo-41572-Making-it-possible-to-add-Custom-Animation.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Partially translate german comments in sw/source/filter/ww8/
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3788
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3788/1
Partially translate german comments in sw/source/filter/ww8/
Please, only apply this patch if you are a native speaking German.
I'm not a native speaker, so a double check is really necessary and appreciated.
Thanks in advance!
Change-Id: I9493d128e124d319391aa851ae364aefeb27c512
---
M sw/source/filter/ww8/ww8scan.cxx
1 file changed, 181 insertions(+), 217 deletions(-)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 7894120..eb649b0 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -112,7 +112,7 @@
// WW7- Sprms
static const SprmInfo aSprms[] =
{
-{ 0, 0, L_FIX}, // Default-sprm, wird uebersprungen
+{ 0, 0, L_FIX}, // Default-sprm, will be skipped
{ 2, 1, L_FIX}, // sprmPIstd, pap.istd (style code)
{ 3, 0, L_VAR}, // sprmPIstdPermute pap.istd permutation
{ 4, 1, L_FIX}, // sprmPIncLv1 pap.istddifference
@@ -939,13 +939,10 @@
return 0; // SPRM _not_ found
}
-//-
-// temporaerer Test
-//-
-// WW8PLCFx_PCDAttrs halten sich an WW8PLCF_Pcd fest und besitzen deshalb keine
-// eigenen Iteratoren. Alle sich auf Iteratoren beziehenden Methoden
-// sind deshalb Dummies.
-
+// temporary test
+// WW8PLCFx_PCDAttrs cling to WW8PLCF_Pcd and therefore do not have their own
iterators.
+// All relating to iterators methods are therefore dummies.
+// All iterators related to methods are consequently dummies.
WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion,
WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase)
: WW8PLCFx(eVersion, true), pPcdI(pPLCFx_PCD-GetPLCFIter()),
@@ -1013,16 +1010,16 @@
}
else
{
-// PRM Variante 1: Sprm wird direkt in Member-Var abgelegt
+// SPRM is deposited directly into members-Var
/*
-Dies sind die Attr, die in der Piece-Table stehen, statt im Text !
+These are the attr that are in the piece-table, instead of in the
text!
*/
if (IsSevenMinus(GetFIBVersion()))
{
aShortSprm[0] = (sal_uInt8)( ( nPrm 0xfe) 1 );
aShortSprm[1] = (sal_uInt8)( nPrm 8 );
-p-nSprmsLen = ( nPrm ) ? 2 : 0;// Laenge
+p-nSprmsLen = ( nPrm ) ? 2 : 0;// length
// store Postion of internal mini storage in Data Pointer
p-pMemPos = aShortSprm;
@@ -1034,7 +1031,7 @@
sal_uInt8 nSprmListIdx = (sal_uInt8)((nPrm 0xfe) 1);
if( nSprmListIdx )
{
-// process Sprm Id Matching as explained in MS Doku
+// process Sprm Id Matching as explained in MS Documentation
//
// ''Property Modifier(variant 1) (PRM)''
// see file: s62f39.htm
@@ -1132,13 +1129,11 @@
}
}
-//
-
WW8PLCFx_PCD::WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
WW8_CP nStartCp, bool bVer67P)
: WW8PLCFx(eVersion, false), nClipStart(-1)
{
-// eigenen Iterator konstruieren
+// construct own iterator
pPcdI = new WW8PLCFpcd_Iter(*pPLCFpcd, nStartCp);
bVer67= bVer67P;
}
@@ -1190,7 +1185,7 @@
void WW8PLCFx_PCD::advance()
{
-OSL_ENSURE(pPcdI , pPcdI fehlt);
+OSL_ENSURE(pPcdI , missing pPcdI);
if (pPcdI)
pPcdI-advance();
}
@@ -1240,7 +1235,7 @@
void* pData;
if ( !pPcdI-Get( nCpStart, nCpEnd, pData ) )
{
-OSL_ENSURE( !this, AktPieceStartFc2Cp() - Fehler );
+OSL_ENSURE( !this, AktPieceStartFc2Cp() - error );
return WW8_CP_MAX;
}
bool bIsUnicode = false;
@@ -1259,10 +1254,7 @@
return nCpStart + (nStartPos - nFcStart) / nUnicodeFactor;
}
-//-
-// Hilfsroutinen fuer alle
-//-
-
+// Helper routines for all
short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace,
sal_uInt8 *pCol, short *pIdx) const
{
@@ -1387,8 +1379,8 @@
WW8_CP nCpStart, nCpEnd;
void* pData;
if( !pPieceIter-Get( nCpStart, nCpEnd, pData ) )
-{ // ausserhalb PLCFfpcd ?
-OSL_ENSURE( !this, PLCFpcd-WW8Fc2Cp() ging schief );
+{ // outside PLCFfpcd ?
+OSL_ENSURE( !this, PLCFpcd-WW8Fc2Cp() went wrong );
break;
}
sal_Int32 nFcStart = SVBT32ToUInt32( ((WW8_PCD*)pData)-fc );
@@ -1472,7 +1464,7 @@
if( pTestFlag )
*pTestFlag = false;
else {
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/download_external_dependencies.pl |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 365ff9c02db80644372043d85d8e1c7e2ffe94de
Author: Andrea Pescetti pesce...@apache.org
Date: Sat May 4 22:15:24 2013 +
Reorder parameters to get a more meaningful output - likely the intended
one.
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index 070340f..855f430 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -602,9 +602,9 @@ sub DownloadFile ($$$)
{
unlink($temporary_filename);
printf(%s checksum does not match (%s instead of %s)\n,
+ $checksum-{'type'},
$file_checksum,
- $checksum-{'value'},
- $checksum-{'type'});
+ $checksum-{'value'});
return 0;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LibreOffice 4.0.3 RC3 available
Dear Community, The Document Foundation is pleased to announce the third release candidate of our upcoming LibreOffice 4.0.3. This will be the third in a series of frequent updates to our feature-packed 4.0 branch. Please be aware that LibreOffice 4.0.3 RC3 is not ready for production use, you should continue to use LibreOffice 4.0.2 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test - or checkout our manual test database for starting right away - http://manual-test.libreoffice.org/runtests/ For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ Release candidate 2 was built and is available via http://downloadarchive.documentfoundation.org/libreoffice/old/ - but is superseded by RC3 due to a showstopper found. The list of issues and fixed bugs for 4.0.3 RC2 is in our wiki: http://wiki.documentfoundation.org/Releases/4.0.3/RC2 Whereas the list of known issues and fixed bugs with 4.0.3 RC3 is available from here: http://wiki.documentfoundation.org/Releases/4.0.3/RC3 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Fostering project internal communication
Hello, sorry for spamming all the lists, but in the light of recent events and discussions, I'd like to make all of you aware of an important mailing list, that so far has not been used as extensively as it should be, which led to some frustration and communication issues. As part of our mission to foster the project internal communication, I'd like to tell you about our so called projects mailing list, which Sophie initiated quite a while ago, and which should be used for communication amongst the various projects - e.g. design and marketing, development and marketing, UX and development, and the like. The list's intention is not to be a gossip list where everything should be thrown at, but to make all affected projects aware of important changes. Philosophy: Low traffic, but important topics. Some examples are: Change of version numbers, a new slogan, design changes, new products. In other words: Everything that has an impact on other areas of working than the one where the change originally comes from. If one team decides LibreOffice will now be called different, and has a shiny new colour, surely marketing should know in time. Well, a bit of a made up example, but you get the point... ;-) We have seen some unpleasant events in the past, that based on my experience, are mostly due to the lack of communication, or due to miscommunication. To avoid that in the future, I'd like to call out to everyone of you, if you are active in one of the subprojects, to also join this mailing list by sending an empty e-mail to projects+subscr...@global.libreoffice.org and following the instructions mailed back. At least one or two representatives from *each* project should join this list, to act as a gateway. I will soon follow up further with some details and topics that have reached me the past weeks, and how we could solve them. Again, sorry for spamming, and have a great weekend! Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
