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

[Michael Stahl]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   45 +++---
 1 file changed, 31 insertions(+), 14 deletions(-)

New commits:
commit a09865cc0f177a28622330866b3ad5baf4b99bd6
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 20 16:29:40 2013 +0100

fdo#60789: writerfilter: continue the import if comment insertion fails

Catch exceptions in DomainMapper_Impl::PopFieldContext().

Change-Id: Ia60857a5f773c9d89217991d481a5f20d0de3151
(cherry picked from commit 4c165c708ce852b4d52527422b327b2f6ad73685)
Reviewed-on: https://gerrit.libreoffice.org/2294
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 68449a0..695a0f3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1574,23 +1574,40 @@ void DomainMapper_Impl::PopAnnotation()
 
 m_aTextAppendStack.pop();
 
-// See if the annotation will be a single position or a range.
-if (!m_aAnnotationPosition.m_xStart.is() || 
!m_aAnnotationPosition.m_xEnd.is())
+try
 {
-uno::Sequence beans::PropertyValue  aEmptyProperties;
-appendTextContent( uno::Reference text::XTextContent ( 
m_xAnnotationField, uno::UNO_QUERY_THROW ), aEmptyProperties );
+// See if the annotation will be a single position or a range.
+if (!m_aAnnotationPosition.m_xStart.is() ||
+!m_aAnnotationPosition.m_xEnd.is())
+{
+uno::Sequence beans::PropertyValue  aEmptyProperties;
+appendTextContent(uno::Referencetext::XTextContent(
+m_xAnnotationField, uno::UNO_QUERY_THROW), aEmptyProperties);
+}
+else
+{
+// Create a range that points to the annotation start/end.
+uno::Referencetext::XText const xText =
+m_aAnnotationPosition.m_xStart-getText();
+uno::Referencetext::XTextCursor const xCursor =
+xText-createTextCursorByRange(m_aAnnotationPosition.m_xStart);
+xCursor-gotoRange(m_aAnnotationPosition.m_xEnd, true);
+uno::Referencetext::XTextRange const xTextRange(
+xCursor, uno::UNO_QUERY_THROW);
+
+// Attach the annotation to the range.
+uno::Referencetext::XTextAppend const xTextAppend =
+m_aTextAppendStack.top().xTextAppend;
+xTextAppend-insertTextContent(xTextRange,
+uno::Referencetext::XTextContent(m_xAnnotationField,
+uno::UNO_QUERY_THROW),
+!xCursor-isCollapsed());
+}
 }
-else
+catch (uno::Exception const e)
 {
-// Create a range that points to the annotation start/end.
-uno::Referencetext::XText xText = 
m_aAnnotationPosition.m_xStart-getText();
-uno::Referencetext::XTextCursor xCursor = 
xText-createTextCursorByRange(m_aAnnotationPosition.m_xStart);
-xCursor-gotoRange(m_aAnnotationPosition.m_xEnd, true);
-uno::Referencetext::XTextRange xTextRange(xCursor, 
uno::UNO_QUERY_THROW);
-
-// Attach the annotation to the range.
-uno::Referencetext::XTextAppend xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
-xTextAppend-insertTextContent(xTextRange, 
uno::Referencetext::XTextContent(m_xAnnotationField, uno::UNO_QUERY_THROW), 
!xCursor-isCollapsed());
+SAL_WARN(writerfilter,
+Cannot insert annotation field: exception:   e.Message);
 }
 
 m_aAnnotationPosition.m_xStart.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 310b5976bb827a0ffb274f70878852e4474a0559
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 20 16:32:59 2013 +0100

fdo#60789: writerfilter: do not insert a character at field start

The character inserted in DomainMapper_Impl::PushFieldContext() causes
problems in this bugdoc because there is a commentRangeStart immediately
before a text field and the call to delete it via setString() disposes
the SwXTextRange that is stored in m_aAnnotationPosition.m_xStart,
which results in an exception when trying to insert the comment.

At least all the fields in the bugdoc import fine with this change.

Change-Id: I6c08d72fafb0529e8612f1e35b2c8b871edb5a52
(cherry picked from commit 6145c6efa4f346287ed9693c9d00038d829d5a35)
Reviewed-on: https://gerrit.libreoffice.org/2295
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 695a0f3..88b4e42 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2033,10 +2033,7 @@ void DomainMapper_Impl::PushFieldContext()
 uno::Reference text::XTextRange  xStart;
 if (xTextAppend.is())
 {
-//insert a dummy char to make sure the start range doesn't move 
together with the to-be-appended text
-xTextAppend-appendTextPortion(OUString( '-' ), uno::Sequence 
beans::PropertyValue () );
 uno::Reference text::XTextCursor  xCrsr = 
xTextAppend-createTextCursorByRange( xTextAppend-getEnd() );
-xCrsr-goLeft( 1, false );
 xStart = xCrsr-getStart();
 }
 m_aFieldStack.push( FieldContextPtr( new FieldContext( xStart ) ) );
@@ -3310,9 +3307,6 @@ void DomainMapper_Impl::PopFieldContext()
 try
 {
 uno::Reference text::XTextCursor  xCrsr = 
xTextAppend-createTextCursorByRange(pContext-GetStartRange());
-//remove the dummy character
-xCrsr-goRight( 1, true );
-xCrsr-setString( OUString() );
 uno::Reference text::XTextContent  xToInsert( 
pContext-GetTOC(), uno::UNO_QUERY );
 if( xToInsert.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: problem with assert statement in ustring.hxx

[Lubos Lunak]

On Thursday 21 of February 2013, Markus Mohrhard wrote:
 Hey,

 I'm currently running the calc files throough the automatic import
 test and the first XLSX file that crashed was novell#349591.

 THe problem there is the assert statement in ustring.hxx:232 together
 with the vmldrawing.cxx:59.

 Is it correct that we can't handle \0 in a string literal or is the
 assert statement wrong?

 ustring.hxx:189 (i.e. doxygen docs for the function) :

  If there are any embedded \0's in the string literal, the result is 
undefined.
  Use the overload that explicitly accepts length.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

On 02/20/2013 04:25 PM, julien2412 wrote:

Lubos Lunak wrote

Lubos Lunak wrote

  Sorry, I did not realize that = { 0 } actually clears the rest of the
array.
And I do not quite understand why clearing an entire array is supposed to
be
a good way to initialize it when just setting the last one to 0 is enough.
...

Why pReceiveBuffer[nBytes-1] = 0; would need to stay?


  If I'm reading the code correctly, nBytes-1 is not the position after
the
read data, but the last read item. Which should mean that the repeated
recv()
may rewrite all the 0's from the initialization. That rather begs the
question why it changes the last read item instead of terminating it, so
the
code may have been already broken to begin with.


I thought it could be interesting to put together declaration and
initialization so we're sure we won't have some side effects (I thought it
could be more clean too).
To be honest, I thought too it was a very straightforward patch, so i pushed
it on master instead of having submitted for gerrit review. Obviously, I was
wrong.

For the second part of your message, I really don't know.

Again, don't hesitate to tell me if I must revert this commit.


FYI:  Without having seen this mail thread, I did see the couple of 
recent commits to desktop/source/app/officeipcthread.cxx last night, saw 
that they still don't address all problems with the sending side not 
including NUL bytes at places where the receiving side expects them, 
worked on a clean-up of that code, but didn't come around yet to push 
it.  Will happen shortly.


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/uiconfig tubes/uiconfig vcl/uiconfig

[Caolán McNamara]

 sw/uiconfig/swriter/ui/splittable.ui |8 +-
 tubes/uiconfig/ui/contacts.ui|   62 +++--
 vcl/uiconfig/ui/printdialog.ui   |  103 ++-
 3 files changed, 92 insertions(+), 81 deletions(-)

New commits:
commit b2e55c2f4dc2bdc780e70f771650b82819166953
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Feb 20 20:21:30 2013 +

Related: fdo#60920 various efforts to consistently apply HIG rules

(cherry picked from commit 76bc43823a53d76e49260a601e893bc1a791fb03)

Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88
Reviewed-on: https://gerrit.libreoffice.org/2301
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/uiconfig/swriter/ui/splittable.ui 
b/sw/uiconfig/swriter/ui/splittable.ui
index 06b12ab..a10c5f1 100644
--- a/sw/uiconfig/swriter/ui/splittable.ui
+++ b/sw/uiconfig/swriter/ui/splittable.ui
@@ -3,14 +3,14 @@
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=SplitTableDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
 property name=title translatable=yesSplit Table/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
 property name=orientationvertical/property
-property name=spacing2/property
+property name=spacing12/property
 child internal-child=action_area
   object class=GtkButtonBox id=dialog-action_area1
 property name=can_focusFalse/property
@@ -76,14 +76,14 @@
   object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=top_padding5/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkGrid id=grid1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=row_spacing6/property
-property name=column_spacing5/property
+property name=column_spacing6/property
 child
   object class=GtkRadioButton id=copyheading
 property name=label translatable=yesCopy 
heading/property
diff --git a/tubes/uiconfig/ui/contacts.ui b/tubes/uiconfig/ui/contacts.ui
index 5500c0d..25fc400 100644
--- a/tubes/uiconfig/ui/contacts.ui
+++ b/tubes/uiconfig/ui/contacts.ui
@@ -3,24 +3,13 @@
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=ContactsDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
 property name=orientationvertical/property
-child
-  object class=GtkLabel id=label1
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=label translatable=yesSelect a contact to 
collaborate with/property
-  /object
-  packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position0/property
-  /packing
-/child
+property name=spacing12/property
 child internal-child=action_area
   object class=GtkButtonBox id=dialog-action_area1
 property name=can_focusFalse/property
@@ -28,11 +17,9 @@
 child
   object class=GtkButton id=listen
 property name=label translatable=yesListen/property
-property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
   /object
   packing
 property name=expandFalse/property
@@ -43,11 +30,9 @@
 child
   object class=GtkButton id=invite
 property name=label translatable=yesInvite/property
-property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
   /object
   packing
 property name=expandFalse/property
@@ -58,11 +43,9 @@
   

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

[Takeshi Abe]

 sw/source/ui/uiview/viewsrch.cxx  |2 -
 sw/source/ui/uiview/viewstat.cxx  |4 +--
 sw/source/ui/uiview/viewtab.cxx   |   37 +--
 sw/source/ui/uno/swdetect.cxx |6 ++---
 sw/source/ui/uno/unoatxt.cxx  |6 ++---
 sw/source/ui/uno/unomailmerge.cxx |   40 +++---
 sw/source/ui/uno/unomod.cxx   |   20 +--
 sw/source/ui/uno/unotxdoc.cxx |   20 +--
 8 files changed, 67 insertions(+), 68 deletions(-)

New commits:
commit f2f8c9d37f5225c07e383141cb4f602f5339b926
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Feb 21 17:00:35 2013 +0900

sal_Bool to bool

Change-Id: I32c25b53d13c4537b2a89a1976deb14232a04e00

diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 6adf115..5488033 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -521,7 +521,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
 pWrtShell-Pop(sal_False);
 pWait = new SwWait( *GetDocShell(), sal_True );
 
-sal_Bool bSrchBkwrd = DOCPOS_START == aOpts.eEnd;
+bool bSrchBkwrd = DOCPOS_START == aOpts.eEnd;
 
 aOpts.eEnd =  bSrchBkwrd ? DOCPOS_START : DOCPOS_END;
 aOpts.eStart = bSrchBkwrd ? DOCPOS_END : DOCPOS_START;
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index 2be7005..0242587 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -66,7 +66,7 @@ void SwView::GetState(SfxItemSet rSet)
 sal_uInt16 nWhich = aIter.FirstWhich();
 sal_uInt16 eFrmType = FRMTYPE_NONE;
 int bGetFrmType = sal_False;
-sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+bool bWeb = 0 != PTR_CAST(SwWebView, this);
 
 while(nWhich)
 {
@@ -430,7 +430,7 @@ void SwView::GetState(SfxItemSet rSet)
 void SwView::GetDrawState(SfxItemSet rSet)
 {
 SfxWhichIter aIter(rSet);
-sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+bool bWeb = 0 != PTR_CAST(SwWebView, this);
 
 for( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich;
 nWhich = aIter.NextWhich() )
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 19983d5..91fe6f3 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -75,7 +75,7 @@ static void lcl_FillSvxColumn(const SwFmtCol rCol,
 const SwColumns rCols = rCol.GetColumns();
 sal_uInt16 nWidth = 0;
 
-sal_Bool bOrtho = rCol.IsOrtho()  rCols.size();
+bool bOrtho = rCol.IsOrtho()  rCols.size();
 long nInnerWidth = 0;
 if( bOrtho )
 {
@@ -269,9 +269,9 @@ void SwView::ExecTabWin( SfxRequest rReq )
 const long nPageWidth  = bBrowse ? rPageRect.Width() : rFrmSize.GetWidth();
 const long nPageHeight = bBrowse ? rPageRect.Height() : 
rFrmSize.GetHeight();
 
-sal_Bool bUnlockView = sal_False;
+bool bUnlockView = false;
 rSh.StartAllAction();
-sal_Bool bSect = 0 != (nFrmType  FRMTYPE_COLSECT);
+bool bSect = 0 != (nFrmType  FRMTYPE_COLSECT);
 
 switch  ( nSlot )
 {
@@ -502,7 +502,7 @@ void SwView::ExecTabWin( SfxRequest rReq )
 if ( nFrmType  ( FRMTYPE_HEADER | FRMTYPE_FOOTER ))
 {
 
-const sal_Bool bHead = nFrmType  FRMTYPE_HEADER ? sal_True : 
sal_False;
+const bool bHead = nFrmType  FRMTYPE_HEADER;
 SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() );
 if ( bHead )
 aUL.SetUpper( (sal_uInt16)aLongULSpace.GetUpper() );
@@ -710,7 +710,7 @@ void SwView::ExecTabWin( SfxRequest rReq )
 {
 if( !rSh.IsViewLocked() )
 {
-bUnlockView = sal_True;
+bUnlockView = true;
 rSh.LockView( sal_True );
 }
 rSh.SetMouseTabCols( aTabCols, bSingleLine,
@@ -830,7 +830,7 @@ void SwView::ExecTabWin( SfxRequest rReq )
 {
 if( !rSh.IsViewLocked() )
 {
-bUnlockView = sal_True;
+bUnlockView = true;
 rSh.LockView( sal_True );
 }
 rSh.SetMouseTabRows( aTabCols, bSingleLine, aTabColFromDocPos 
);
@@ -904,7 +904,7 @@ void SwView::StateTabWin(SfxItemSet rSet)
 
 SfxWhichIter aIter( rSet );
 sal_uInt16 nWhich = aIter.FirstWhich();
-sal_Bool bPutContentProtection = sal_False;
+bool bPutContentProtection = false;
 
 while ( nWhich )
 {
@@ -1218,18 +1218,18 @@ void SwView::StateTabWin(SfxItemSet rSet)
 case SID_RULER_BORDERS_VERTICAL:
 case SID_RULER_BORDERS:
 {
-sal_Bool bFrameHasVerticalColumns(sal_False);
+bool bFrameHasVerticalColumns(false);
 {
 sal_Bool bFrameRTL;
 sal_Bool bFrameVertL2R;
 bFrameHasVerticalColumns = 

The meaning of core/starmath/sdi/smath.sdi

[Maciej Rumianowski]

Hi *,

does someone know what is the meaning of this (
http://opengrok.libreoffice.org/xref/core/starmath/sdi/smath.sdi) file?
It uses a lot of SfxVoidItem which I am currently investigating and trying
to use as DisabledItem mark.

http://cgit.freedesktop.org/libreoffice/core/tree/svl/source/items/itemset.cxx

 void SfxItemSet::DisableItem(sal_uInt16 nWhich)
 {
 DBG_CHKTHIS(SfxItemSet, 0);
 Put( SfxVoidItem(0), nWhich );
 }

 Because of Bug 34465 Items should be inserted at same nWhich as their
.Which().

Best Regards,
Maciek
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 desktop/source/app/officeipcthread.cxx |  111 -
 1 file changed, 56 insertions(+), 55 deletions(-)

New commits:
commit b6ff19fba3a1a6d65134539a71d7a8df0e35d4ff
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 21 10:33:45 2013 +0100

Clean up code that sends and recvs strings accross the OfficeIPC pipe

Change-Id: I5e85d5e0e4e53f3c61e59430afea15028444018f

diff --git a/desktop/source/app/officeipcthread.cxx 
b/desktop/source/app/officeipcthread.cxx
index 445ccb4..b5e4574 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -54,12 +54,38 @@ using ::rtl::OUStringBuffer;
 
 const char  *OfficeIPCThread::sc_aShowSequence = -tofront;
 const int OfficeIPCThread::sc_nShSeqLength = 5;
-const char  *OfficeIPCThread::sc_aConfirmationSequence = 
InternalIPC::ProcessingDone;
-const int OfficeIPCThread::sc_nCSeqLength = 27;
-const char  *OfficeIPCThread::sc_aSendArgumentsSequence = 
InternalIPC::SendArguments;
-const int OfficeIPCThread::sc_nCSASeqLength = 26;
 
-namespace { static char const ARGUMENT_PREFIX[] = InternalIPC::Arguments; }
+namespace {
+
+static char const SEND_ARGUMENTS[] = InternalIPC::SendArguments;
+static char const ARGUMENT_PREFIX[] = InternalIPC::Arguments;
+static char const PROCESSING_DONE[] = InternalIPC::ProcessingDone;
+
+// Receives packets from the pipe until a packet ends in a NUL character (that
+// will not be included in the returned string) or it cannot read anything (due
+// to error or closed pipe, in which case an empty string will be returned to
+// signal failure):
+OString readStringFromPipe(osl::StreamPipe  pipe) {
+for (OStringBuffer str;;) {
+char buf[1024];
+sal_Int32 n = pipe.recv(buf, SAL_N_ELEMENTS(buf));
+if (n = 0) {
+return ;
+}
+bool end = false;
+if (buf[n - 1] == '\0') {
+end = true;
+--n;
+}
+str.append(buf, n);
+//TODO: how does OStringBuffer.append handle overflow?
+if (end) {
+return str.makeStringAndClear();
+}
+}
+}
+
+}
 
 // Type of pipe we use
 enum PipeMode
@@ -497,18 +523,7 @@ OfficeIPCThread::Status 
OfficeIPCThread::EnableOfficeIPCThread()
 else if( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, 
rSecurity )) // Creation not successfull, now we try to connect
 {
 osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
-char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
-int nResult = 0;
-int nBytes = 0;
-int nBufSz = sc_nCSASeqLength + 1;
-// read byte per byte
-while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes, 
nBufSz-nBytes))0) {
-nBytes += nResult;
-if (pReceiveBuffer[nBytes-1]=='\0') {
-break;
-}
-}
-if (rtl::OString(sc_aSendArgumentsSequence).equals(pReceiveBuffer))
+if (readStringFromPipe(aStreamPipe) == SEND_ARGUMENTS)
 {
 // Pipe connected to first office
 nPipeMode = PIPEMODE_CONNECTED;
@@ -563,19 +578,16 @@ OfficeIPCThread::Status 
OfficeIPCThread::EnableOfficeIPCThread()
 return IPC_STATUS_BOOTSTRAP_ERROR;
 }
 }
+aArguments.append('\0');
 // finally, write the string onto the pipe
-aStreamPipe.write(aArguments.getStr(), aArguments.getLength());
-aStreamPipe.write(\0, 1);
-
-rtl::OString aToken(sc_aConfirmationSequence);
-char *pReceiveBuffer = new char[aToken.getLength()+1];
-sal_Int32 n = aStreamPipe.read(pReceiveBuffer, aToken.getLength());
-pReceiveBuffer[n]='\0';
-
-bool bIsConfirmationSequence = aToken.equals(pReceiveBuffer);
-delete[] pReceiveBuffer;
+sal_Int32 n = aStreamPipe.write(
+aArguments.getStr(), aArguments.getLength());
+if (n != aArguments.getLength()) {
+SAL_INFO(desktop, short write:   n);
+return IPC_STATUS_BOOTSTRAP_ERROR;
+}
 
-if (!bIsConfirmationSequence)
+if (readStringFromPipe(aStreamPipe) != PROCESSING_DONE)
 {
 // something went wrong
 return IPC_STATUS_BOOTSTRAP_ERROR;
@@ -671,30 +683,16 @@ void OfficeIPCThread::execute()
 break;
 }
 
-// notify client we're ready to process its args
-int nBytes = 0;
-int nResult;
-while (
-(nResult = aStreamPipe.send(sc_aSendArgumentsSequence+nBytes, 
sc_nCSASeqLength-nBytes))0 
-((nBytes += nResult)  sc_nCSASeqLength) ) ;
-aStreamPipe.write(\0, 1);
-
-// test byte by byte
-const int nBufSz = 2048;
-char pBuf[nBufSz];
-nBytes = 0;
-rtl::OStringBuffer aBuf;
-// 

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

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 -
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   26 ---
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |6 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 36c64bc194714d60a5c18f63bcfc0f721c2056db
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Feb 21 10:27:31 2013 +0100

n#779642: table positions need to be stacked to handle nested table

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 6f1a400..8474a2f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -717,7 +717,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 uno::Referencetext::XTextRange xStart;
 uno::Referencetext::XTextRange xEnd;
 // If we want to make this table a floating one.
-uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getTablePosition();
+uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getCurrentTablePosition();
 bool bFloating = aFrameProperties.hasElements();
 // Additional checks: if we can do this.
 if (bFloating  (*m_pTableSeq)[0].getLength()  0  
(*m_pTableSeq)[0][0].getLength()  0)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index f09a3e2..d3ddf82 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -24,7 +24,6 @@
 #include CellMarginHandler.hxx
 #include ConversionHelper.hxx
 #include MeasureHandler.hxx
-#include TablePositionHandler.hxx
 #include TDefTableHandler.hxx
 #include com/sun/star/text/HoriOrientation.hpp
 #include com/sun/star/text/SizeType.hpp
@@ -322,9 +321,14 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 writerfilter::ReferenceProperties::Pointer_t pProperties 
= rSprm.getProps();
 if (pProperties.get())
 {
-TablePositionHandlerPtr pHandler( new 
TablePositionHandler );
+TablePositionHandlerPtr pHandler = 
m_aTablePositions.back();
+if ( !pHandler )
+{
+m_aTablePositions.pop_back();
+pHandler.reset( new TablePositionHandler );
+m_aTablePositions.push_back( pHandler );
+}
 pProperties-resolve(*pHandler);
-m_aTablePosition = pHandler-getTablePosition();
 }
 }
 break;
@@ -360,6 +364,14 @@ boost::shared_ptr vector sal_Int32   
DomainMapperTableManager::getCurrentCel
 return m_aCellWidths.back( );
 }
 
+const uno::Sequencebeans::PropertyValue 
DomainMapperTableManager::getCurrentTablePosition( )
+{
+if ( !m_aTablePositions.empty( )  m_aTablePositions.back() )
+return m_aTablePositions.back( )-getTablePosition();
+else
+return uno::Sequence beans::PropertyValue ( 0 );
+}
+
 void DomainMapperTableManager::startLevel( )
 {
 DomainMapperTableManager_Base_t::startLevel( );
@@ -375,9 +387,11 @@ void DomainMapperTableManager::startLevel( )
 IntVectorPtr pNewGrid( new vectorsal_Int32 );
 IntVectorPtr pNewSpans( new vectorsal_Int32 );
 IntVectorPtr pNewCellWidths( new vectorsal_Int32 );
+TablePositionHandlerPtr pNewPositionHandler;
 m_aTableGrid.push_back( pNewGrid );
 m_aGridSpans.push_back( pNewSpans );
 m_aCellWidths.push_back( pNewCellWidths );
+m_aTablePositions.push_back( pNewPositionHandler );
 m_nCell.push_back( 0 );
 m_nTableWidth = 0;
 
@@ -394,6 +408,7 @@ void DomainMapperTableManager::endLevel( )
 m_nCell.pop_back( );
 m_nTableWidth = 0;
 
+
 DomainMapperTableManager_Base_t::endLevel( );
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger-startElement(dmappertablemanager.endLevel);
@@ -403,6 +418,10 @@ void DomainMapperTableManager::endLevel( )
 
 dmapper_logger-endElement();
 #endif
+
+// Pop back the table position after endLevel as it's used
+// in the endTable method called in endLevel.
+m_aTablePositions.pop_back();
 }
 
 
@@ -576,7 +595,6 @@ void DomainMapperTableManager::clearData()
 m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0;
 m_sTableStyleName = OUString();
 m_pTableStyleTextProperies.reset();
-m_aTablePosition = uno::Sequencebeans::PropertyValue(0);
 }
 
 
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index e18dcea..d3164ea 100644
--- 

[Libreoffice-commits] core.git: android/experimental android/qa

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile  |4 ++--
 android/experimental/LibreOffice4Android/Makefile |2 +-
 android/qa/desktop/Makefile   |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f6991262cbaca21f576483b6ded35c532cda90e1
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 21 11:25:41 2013 +0200

UNO_TYPES and UNO_MORE_TYPES must contain file: URLs, not pathnames

Apparently it (by accident?) used to work to use pathnames.

Change-Id: Icebda427cef645ed53594e179c211d2a9d020583

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 7ac9b1c..c0e9ca8 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -63,13 +63,13 @@ copy-stuff:
echo 'BRAND_BASE_DIR=file:///assets'  assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
module:$${BRAND_BASE_DIR}/share/registry/modules 
res:$${BRAND_BASE_DIR}/share/registry'  assets/program/fundamentalrc
echo 
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'  
assets/program/fundamentalrc
-   echo 'URE_MORE_TYPES=$(APP_DATA_PATH)/program/offapi.rdb 
$(APP_DATA_PATH)/program/oovbaapi.rdb'  assets/program/fundamentalrc
+   echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb 
file://$(APP_DATA_PATH)/program/oovbaapi.rdb'  assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb 
$$BRAND_BASE_DIR/program/services*'  assets/program/fundamentalrc
 #
 # Set up unorc
echo '[Bootstrap]'  assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/  
assets/program/unorc
-   echo 'UNO_TYPES=$(APP_DATA_PATH)/program/ure/types.rdb 
$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}'  assets/program/unorc
+   echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/ure/types.rdb 
file://$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}'  
assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb 
$${URE_MORE_SERVICES}'  assets/program/unorc
 #
 # Set up bootstraprc
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 24ebbe5..d0ae325 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -67,7 +67,7 @@ copy-stuff:
 # Set up unorc
echo '[Bootstrap]'  assets/program/unorc
echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/'  
assets/program/unorc
-   echo 'UNO_TYPES=$$APP_DATA_DIR/program/ure/types.rdb 
$$APP_DATA_DIR/program/types.rdb $$APP_DATA_DIR/program/offapi.rdb 
$$APP_DATA_DIR/program/oovbaapi.rdb'  assets/program/unorc
+   echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/ure/types.rdb 
file://$$APP_DATA_DIR/program/types.rdb 
file://$$APP_DATA_DIR/program/offapi.rdb 
file://$$APP_DATA_DIR/program/oovbaapi.rdb'  assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb 
file:///assets/xml/services.rdb $$BRAND_BASE_DIR/program/services*'  
assets/program/unorc
 #
 # Set up bootstraprc
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c7581a2..685e584 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -63,18 +63,18 @@ copy-stuff:
 #
 # Set up fundamentalrc
echo '[Bootstrap]'  assets/program/fundamentalrc
-   echo LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/  
assets/program/fundamentalrc
+   echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/  
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/  
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets'  assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
module:$${BRAND_BASE_DIR}/share/registry/modules 
res:$${BRAND_BASE_DIR}/share/registry'  assets/program/fundamentalrc
echo 
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'  
assets/program/fundamentalrc
-   echo 'URE_MORE_TYPES=$(APP_DATA_PATH)/program/offapi.rdb 
$(APP_DATA_PATH)/program/oovbaapi.rdb'  assets/program/fundamentalrc
+   echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb 
file://$(APP_DATA_PATH)/program/oovbaapi.rdb'  assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb 
$$BRAND_BASE_DIR/program/services*'  assets/program/fundamentalrc
 #
 # Set up unorc
echo '[Bootstrap]'  assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/  
assets/program/unorc
-   echo 'UNO_TYPES=$(APP_DATA_PATH)/program/ure/types.rdb 
$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}'  assets/program/unorc
+   echo 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 -
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   26 ---
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |5 ++
 3 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit 9965b124b5631bb0e1bf5be394224251c72fe0e5
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Feb 21 10:27:31 2013 +0100

n#779642: table positions need to be stacked to handle nested table

(cherry picked from commit 36c64bc194714d60a5c18f63bcfc0f721c2056db)

Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.hxx

Change-Id: If592f5a2f29c207daf9a603a4332da9bc8c5ae3b

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 65a26f9..9c2d298 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -720,7 +720,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 uno::Referencetext::XTextRange xStart;
 uno::Referencetext::XTextRange xEnd;
 // If we want to make this table a floating one.
-uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getTablePosition();
+uno::Sequencebeans::PropertyValue aFrameProperties = 
m_rDMapper_Impl.getTableManager().getCurrentTablePosition();
 bool bFloating = aFrameProperties.hasElements();
 // Additional checks: if we can do this.
 if (bFloating  (*m_pTableSeq)[0].getLength()  0  
(*m_pTableSeq)[0][0].getLength()  0)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 43a8238..a396d69 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -33,7 +33,6 @@
 #include CellMarginHandler.hxx
 #include ConversionHelper.hxx
 #include MeasureHandler.hxx
-#include TablePositionHandler.hxx
 #include TDefTableHandler.hxx
 #include com/sun/star/text/HoriOrientation.hpp
 #include com/sun/star/text/SizeType.hpp
@@ -330,9 +329,14 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 writerfilter::ReferenceProperties::Pointer_t pProperties 
= rSprm.getProps();
 if (pProperties.get())
 {
-TablePositionHandlerPtr pHandler( new 
TablePositionHandler );
+TablePositionHandlerPtr pHandler = 
m_aTablePositions.back();
+if ( !pHandler )
+{
+m_aTablePositions.pop_back();
+pHandler.reset( new TablePositionHandler );
+m_aTablePositions.push_back( pHandler );
+}
 pProperties-resolve(*pHandler);
-m_aTablePosition = pHandler-getTablePosition();
 }
 }
 break;
@@ -368,6 +372,14 @@ boost::shared_ptr vector sal_Int32   
DomainMapperTableManager::getCurrentCel
 return m_aCellWidths.back( );
 }
 
+const uno::Sequencebeans::PropertyValue 
DomainMapperTableManager::getCurrentTablePosition( )
+{
+if ( !m_aTablePositions.empty( )  m_aTablePositions.back() )
+return m_aTablePositions.back( )-getTablePosition();
+else
+return uno::Sequence beans::PropertyValue ( 0 );
+}
+
 void DomainMapperTableManager::startLevel( )
 {
 DomainMapperTableManager_Base_t::startLevel( );
@@ -383,9 +395,11 @@ void DomainMapperTableManager::startLevel( )
 IntVectorPtr pNewGrid( new vectorsal_Int32 );
 IntVectorPtr pNewSpans( new vectorsal_Int32 );
 IntVectorPtr pNewCellWidths( new vectorsal_Int32 );
+TablePositionHandlerPtr pNewPositionHandler;
 m_aTableGrid.push_back( pNewGrid );
 m_aGridSpans.push_back( pNewSpans );
 m_aCellWidths.push_back( pNewCellWidths );
+m_aTablePositions.push_back( pNewPositionHandler );
 m_nCell.push_back( 0 );
 m_nTableWidth = 0;
 
@@ -402,6 +416,7 @@ void DomainMapperTableManager::endLevel( )
 m_nCell.pop_back( );
 m_nTableWidth = 0;
 
+
 DomainMapperTableManager_Base_t::endLevel( );
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger-startElement(dmappertablemanager.endLevel);
@@ -411,6 +426,10 @@ void DomainMapperTableManager::endLevel( )
 
 dmapper_logger-endElement();
 #endif
+
+// Pop back the table position after endLevel as it's used
+// in the endTable method called in endLevel.
+m_aTablePositions.pop_back();
 }
 
 
@@ -612,7 +631,6 @@ void DomainMapperTableManager::clearData()
 m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0;
 m_sTableStyleName = ::rtl::OUString();
 m_pTableStyleTextProperies.reset();
-m_aTablePosition = 

[Libreoffice-commits] core.git: download.lst Makefile.fetch

[Fridrich Štrba]

 Makefile.fetch |1 -
 download.lst   |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 81e065b0ec2764ef44116512631d2ae8260df47a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 21 11:11:50 2013 +0100

Don't download a zip we don't use

Change-Id: I57f85796896dd3d76096922c53fc3c2de58eae4a

diff --git a/Makefile.fetch b/Makefile.fetch
index 7326355..961b4662 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -112,7 +112,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
$(call fetch_Optional,ICU,$(ICU_TARBALL)) \
-   $(call fetch_Optional,ICU,$(ICU_DATA_SUBSET_ZIP)) \
$(call 
fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLOW_ENGINE_TARBALL)) \
$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLUTE_TARBALL)) 
\
$(call 
fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBBASE_TARBALL)) \
diff --git a/download.lst b/download.lst
index 1131379..0224e1d 100644
--- a/download.lst
+++ b/download.lst
@@ -37,7 +37,6 @@ export GLIBC_TARBALL := 
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
-export ICU_DATA_SUBSET_ZIP := 
fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
 export ICU_TARBALL := 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst Makefile.fetch

[Fridrich Štrba]

 Makefile.fetch |1 -
 download.lst   |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 44bde255128378f34f6d5b63a66bbacb0575fa76
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 21 11:11:50 2013 +0100

Don't download a zip we don't use

Change-Id: I57f85796896dd3d76096922c53fc3c2de58eae4a
(cherry picked from commit 81e065b0ec2764ef44116512631d2ae8260df47a)
Reviewed-on: https://gerrit.libreoffice.org/2309
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/Makefile.fetch b/Makefile.fetch
index 132244e..78354de 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -112,7 +112,6 @@ $(WORKDIR)/download: $(SRCDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)/M
$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
$(call fetch_Optional,ICU,$(ICU_TARBALL)) \
-   $(call fetch_Optional,ICU,$(ICU_DATA_SUBSET_ZIP)) \
$(call 
fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLOW_ENGINE_TARBALL)) \
$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLUTE_TARBALL)) 
\
$(call 
fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBBASE_TARBALL)) \
diff --git a/download.lst b/download.lst
index bc83a8b..1eca937 100644
--- a/download.lst
+++ b/download.lst
@@ -35,7 +35,6 @@ export GRAPHITE_TARBALL := 
f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
-export ICU_DATA_SUBSET_ZIP := 
fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
 export ICU_TARBALL := 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unable to build due to libwpd-stream.h missing

[Jack Wakefield]

I saw that there was a commit yesterday by Bjoern Michaelsen to attempt to
fix the issue and can confirm after pulling the latest git I was able to
successfully compile.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

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

New commits:
commit e5cdfe589f8ce559a9e6d8fee3b1a6bd3c9ec233
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 21 11:47:14 2013 +0100

This apparently wants sal_uLong, not bool

Change-Id: I0cf295ea2f83908d98427ae1f3bb6fa1dbbd0b12

diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 9dc63e3..886a826 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -423,7 +423,7 @@ struct TmpDictionary
 return xStream;
 }
 
-bool renameTmpToURL()
+sal_uLong renameTmpToURL()
 {
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] quiet external module build log unless failure

[Norbert Thiebaud (via Code Review)]

Hello LibreOffice gerrit bot, David Tardon,

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

https://gerrit.libreoffice.org/2304

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

Change subject: quiet external module build log unless failure
..

quiet external module build log unless failure

ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This add the configure option --enable-quiet-external
that store the output of external modules in a log file
and only print them as a whole if the module failed do build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
---
M apache-commons/ExternalProject_apache_commons_codec.mk
M apache-commons/ExternalProject_apache_commons_httpclient.mk
M apache-commons/ExternalProject_apache_commons_lang.mk
M apache-commons/ExternalProject_apache_commons_logging.mk
M beanshell/ExternalProject_beanshell.mk
M cairo/ExternalProject_cairo.mk
M cairo/ExternalProject_pixman.mk
M config_host.mk.in
M configure.ac
M cppunit/ExternalProject_cppunit.mk
M curl/ExternalProject_curl.mk
M expat/ExternalProject_expat.mk
M fontconfig/ExternalProject_fontconfig.mk
M hsqldb/ExternalProject_hsqldb.mk
M hunspell/ExternalProject_hunspell.mk
M hyphen/ExternalProject_hyphen.mk
M icu/ExternalProject_icu.mk
M jfreereport/ExternalProject_jfreereport_flow_engine.mk
M jfreereport/ExternalProject_jfreereport_flute.mk
M jfreereport/ExternalProject_jfreereport_libbase.mk
M jfreereport/ExternalProject_jfreereport_libfonts.mk
M jfreereport/ExternalProject_jfreereport_libformula.mk
M jfreereport/ExternalProject_jfreereport_liblayout.mk
M jfreereport/ExternalProject_jfreereport_libloader.mk
M jfreereport/ExternalProject_jfreereport_librepository.mk
M jfreereport/ExternalProject_jfreereport_libserializer.mk
M jfreereport/ExternalProject_jfreereport_libxml.mk
M jfreereport/ExternalProject_jfreereport_sac.mk
M lcms2/ExternalProject_lcms2.mk
M libcdr/ExternalProject_libcdr.mk
M libexttextcat/ExternalProject_exttextcat.mk
M liblangtag/ExternalProject_langtag.mk
M libmspub/ExternalProject_libmspub.mk
M liborcus/ExternalProject_liborcus.mk
M libvisio/ExternalProject_libvisio.mk
M libwpd/ExternalProject_libwpd.mk
M libxml2/ExternalProject_xml2.mk
M libxmlsec/ExternalProject_xmlsec.mk
M libxslt/ExternalProject_xslt.mk
M lpsolve/ExternalProject_lpsolve.mk
M mythes/ExternalProject_mythes.mk
M nss/ExternalProject_nss.mk
M openldap/ExternalProject_openldap.mk
M openssl/ExternalProject_openssl.mk
M postgresql/ExternalProject_postgresql.mk
M python3/ExternalProject_python3.mk
M pyuno/CustomTarget_zipcore.mk
M redland/ExternalProject_raptor.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
M rhino/ExternalProject_rhino.mk
M solenv/gbuild/ExternalProject.mk
M solenv/gbuild/Helper.mk
M solenv/gbuild/Zip.mk
M solenv/gbuild/gbuild.mk
M tomcat/ExternalProject_tomcat.mk
M xpdf/ExternalProject_xpdf.mk
57 files changed, 967 insertions(+), 920 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2304/3
-- 
To view, visit https://gerrit.libreoffice.org/2304
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

Re: [Libreoffice-commits] core.git: desktop/source

[Lubos Lunak]

On Thursday 21 of February 2013, Stephan Bergmann wrote:
 FYI:  Without having seen this mail thread, I did see the couple of
 recent commits to desktop/source/app/officeipcthread.cxx last night, saw
 that they still don't address all problems with the sending side not
 including NUL bytes at places where the receiving side expects them,
 worked on a clean-up of that code, but didn't come around yet to push
 it.  Will happen shortly.

 I don't know what the code is supposed to do exactly, but just from looking 
at it I agree with Matteo's comments on it.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 cui/uiconfig/ui/optmemorypage.ui |8 +
 vcl/inc/vcl/builder.hxx  |4 ++
 vcl/source/window/builder.cxx|   60 ---
 3 files changed, 63 insertions(+), 9 deletions(-)

New commits:
commit fc2f3ce3c1beb845368a29ebaa29b1c90f4d1469
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 21 11:55:01 2013 +

add a mechanism to load date fields from .ui files

Change-Id: If546e2f5c0f4b58d1306c737bf69799e8033c5c0

diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index e3be9b6..3675e6c 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -23,11 +23,9 @@
 property name=page_increment10/property
   /object
   object class=GtkAdjustment id=adjustment4
-property name=lower1/property
-property name=upper1439/property
-property name=value10/property
-property name=step_increment1/property
-property name=page_increment10/property
+property name=lower1/property
+property name=upper2359/property
+property name=value10/property
   /object
   object class=GtkBox id=OptMemoryPage
 property name=visibleTrue/property
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 41178ed..11693a3 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -23,6 +23,7 @@ class ListBox;
 class NumericFormatter;
 class PopupMenu;
 class ScrollBar;
+class DateField;
 class TimeField;
 class VclMultiLineEdit;
 
@@ -129,6 +130,7 @@ private:
 typedef stringmap Adjustment;
 const Adjustment *get_adjustment_by_name(OString sID) const;
 static void mungeAdjustment(NumericFormatter rTarget, const Adjustment 
rAdjustment);
+static void mungeAdjustment(DateField rTarget, const Adjustment 
rAdjustment);
 static void mungeAdjustment(TimeField rTarget, const Adjustment 
rAdjustment);
 static void mungeAdjustment(ScrollBar rTarget, const Adjustment 
rAdjustment);
 
@@ -169,6 +171,7 @@ private:
 
 std::vectorWidgetAdjustmentMap m_aNumericFormatterAdjustmentMaps;
 std::vectorWidgetAdjustmentMap m_aTimeFormatterAdjustmentMaps;
+std::vectorWidgetAdjustmentMap m_aDateFormatterAdjustmentMaps;
 std::vectorWidgetAdjustmentMap m_aScrollAdjustmentMaps;
 std::mapOString, Adjustment m_aAdjustments;
 
@@ -263,6 +266,7 @@ private:
 
 void connectNumericFormatterAdjustment(const OString id, const OString 
rAdjustment);
 void connectTimeFormatterAdjustment(const OString id, const OString 
rAdjustment);
+void connectDateFormatterAdjustment(const OString id, const OString 
rAdjustment);
 
 bool extractGroup(const OString id, stringmap rVec);
 bool extractModel(const OString id, stringmap rVec);
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index dc25339..264bf92 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -256,6 +256,16 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, 
OUString sUIFile, OStri
 mungeAdjustment(*pTarget, *pAdjustment);
 }
 
+for (std::vectorWidgetAdjustmentMap::iterator aI = 
m_pParserState-m_aDateFormatterAdjustmentMaps.begin(),
+ aEnd = m_pParserState-m_aDateFormatterAdjustmentMaps.end(); aI != 
aEnd; ++aI)
+{
+DateField *pTarget = dynamic_castDateField*(getWindow(aI-m_sID));
+const Adjustment *pAdjustment = get_adjustment_by_name(aI-m_sValue);
+SAL_WARN_IF(!pTarget || !pAdjustment, vcl, missing elements of 
spinbutton/adjustment);
+if (pTarget  pAdjustment)
+mungeAdjustment(*pTarget, *pAdjustment);
+}
+
 //Set ScrollBar adjustments when everything has been imported
 for (std::vectorWidgetAdjustmentMap::iterator aI = 
m_pParserState-m_aScrollAdjustmentMaps.begin(),
  aEnd = m_pParserState-m_aScrollAdjustmentMaps.end(); aI != aEnd; 
++aI)
@@ -715,6 +725,12 @@ void VclBuilder::connectTimeFormatterAdjustment(const 
OString id, const OString
 
m_pParserState-m_aTimeFormatterAdjustmentMaps.push_back(WidgetAdjustmentMap(id,
 rAdjustment));
 }
 
+void VclBuilder::connectDateFormatterAdjustment(const OString id, const 
OString rAdjustment)
+{
+if (!rAdjustment.isEmpty())
+
m_pParserState-m_aDateFormatterAdjustmentMaps.push_back(WidgetAdjustmentMap(id,
 rAdjustment));
+}
+
 bool VclBuilder::extractScrollAdjustment(const OString id, 
VclBuilder::stringmap rMap)
 {
 VclBuilder::stringmap::iterator aFind = rMap.find(OString(adjustment));
@@ -1024,6 +1040,13 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 TimeField *pField = new TimeField(pParent, nBits);
 pWindow = pField;
 }
+else if (sPattern == yy:mm:dd)
+{
+connectDateFormatterAdjustment(id, sAdjustment);
+SAL_INFO(vcl.layout, making date field for   
name.getStr() sUnit.getStr());

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

[Ivan Timofeev]

 cui/uiconfig/ui/optviewpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff65f9af46e1b63d17038ebf1229f974dcb7a92b
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Feb 21 16:06:38 2013 +0400

windowsize must be a MetricField

Change-Id: I360de01d1afa129bec2dc9aabfb16820ec5e3269

diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index f1cb8c7..2cc72b1 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -43,7 +43,7 @@
 property name=xalign0/property
 property name=label 
translatable=yesSc_aling/property
 property name=use_underlineTrue/property
-property 
name=mnemonic_widgetwindowsize/property
+property 
name=mnemonic_widgetwindowsize:0%/property
   /object
   packing
 property name=left_attach0/property
@@ -53,7 +53,7 @@
   /packing
 /child
 child
-  object class=GtkSpinButton id=windowsize
+  object class=GtkSpinButton id=windowsize:0%
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=halignstart/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: desktop/source

[Norbert Thiebaud]

On Wed, Feb 20, 2013 at 7:54 AM, julien2412 serval2...@yahoo.fr wrote:

 Yes I meant it, why? Is it wrong?
 if pReceiveBuffer is initialized with 0 for the (sc_nCSASeqLength + 1)
 elements thanks to = {0} initialization, what obvious thing did I miss? Why
 pReceiveBuffer[nBytes-1] = 0; would need to stay?

Ok since I added that particular code,  let me explain

 -if (nBytes  0)
 -{
 -pReceiveBuffer[nBytes-1] = 0;
 -}

was needed because the loop before can exit under 2 conditions:
the normal one where  a[nBytes - 1] is already 0
or the 'non-normal' one when the recv return 0 (or -1 for that matter)
which mean the pipe got interrupted prematurely, in which case the
buffer would _not_ be 0-terminated
which was relyied upon later.

there is also the case where recv bail out before reading anything at
that point nByte = 0 si of course we do not want to do a[nByte - 1]
and for that case a[0] is set to 0;

initializing the whole buffer is a waste in all case but the corner
case where the pipe get broken.

Note: it is clearly not expected that the pipe close with receiving
a\0 as last character... ortherwise we would already be segfaulting a
lot due to the code aftert that that _assume_ that the buffer is a
0-terminated string.
so there is no particular danger that a valid character would be
overwritten in normal expected cases.

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

About -std=c++98 by default in CXXFLAGS

[julien2412]

Hello,

Since all compilers aren't ready for C++11, would it be relevant to include
by default -std=c++98 in CXXFLAGS ?
The goal is, for beginners like me, to avoid submitting things like
https://gerrit.libreoffice.org/2302 :-)

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-std-c-98-by-default-in-CXXFLAGS-tp4039130.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

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

[Eike Rathke]

 chart2/source/tools/ExplicitCategoriesProvider.cxx |   24 +
 1 file changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 6d11841cc4de7ebac880d2d2c8307a886de7720d
Author: Eike Rathke er...@redhat.com
Date:   Tue Feb 19 19:22:27 2013 +0100

do not access vector elements beyond size, rhbz#847519 related

The actual bug (crash) is not triggered anymore because the categories
are assembled differently, nevertheless the code in question could
expose the same behavior under different preconditions.

Change-Id: Ic37f6b34effaf4e5252e80aab46b021547b36efb
(cherry picked from commit d1ba2cd612a4c39976e2980c7dc4e3fa38c88470)
Reviewed-on: https://gerrit.libreoffice.org/2274
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx 
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index bc938e6..c593a51 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -362,11 +362,14 @@ Sequence OUString  lcl_getExplicitSimpleCategories(
 }
 for( aOuterIt=rComplexCats.begin(); aOuterIt != aOuterEnd; ++aOuterIt )
 {
-sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
-if( nCurrentCount nMaxCategoryCount )
+if ( !aOuterIt-empty() )
 {
-ComplexCategory rComplexCategory = aOuterIt-back();
-rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
+sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
+if( nCurrentCount nMaxCategoryCount )
+{
+ComplexCategory rComplexCategory = aOuterIt-back();
+rComplexCategory.Count += 
(nMaxCategoryCount-nCurrentCount);
+}
 }
 }
 }
@@ -398,12 +401,15 @@ Sequence OUString  lcl_getExplicitSimpleCategories(
 OUString aText;
 for( aOuterIt=aComplexCatsPerIndex.begin() ; aOuterIt != 
aOuterEnd; ++aOuterIt )
 {
-OUString aAddText = (*aOuterIt)[nN].Text;
-if( !aAddText.isEmpty() )
+if ( static_castsize_t(nN)  aOuterIt-size() )
 {
-if(!aText.isEmpty())
-aText += aSpace;
-aText += aAddText;
+OUString aAddText = (*aOuterIt)[nN].Text;
+if( !aAddText.isEmpty() )
+{
+if(!aText.isEmpty())
+aText += aSpace;
+aText += aAddText;
+}
 }
 }
 aRet[nN]=aText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/uiconfig

[Stephan Bergmann]

 desktop/uiconfig/ui/extensionmanager.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc7c1110b2ae099925430de8a8faf5f8abf258a7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 21 13:18:09 2013 +0100

Missing lib:widget delimiter from : to - change

Change-Id: I131ead5269fb0815de0e96fa268358461d45e47c

diff --git a/desktop/uiconfig/ui/extensionmanager.ui 
b/desktop/uiconfig/ui/extensionmanager.ui
index fc33697..b896c1a 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -95,7 +95,7 @@
 property name=orientationvertical/property
 property name=spacing10/property
 child
-  object class=deploymentgui:ExtBoxWithBtns id=extensions
+  object class=deploymentgui-ExtBoxWithBtns id=extensions
 property name=width_request600/property
 property name=height_request320/property
 property name=visibleTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 57061, which changed state.

Bug 57061 Summary: Not all personal data imported during install from /3 User 
Profile
https://bugs.freedesktop.org/show_bug.cgi?id=57061

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

Re: [Libreoffice-commits] core.git: desktop/source

[julien2412]

Norbert Thiebaud wrote
 On Wed, Feb 20, 2013 at 7:54 AM, julien2412 lt;

 serval2412@

 gt; wrote:

 Yes I meant it, why? Is it wrong?
 if pReceiveBuffer is initialized with 0 for the (sc_nCSASeqLength + 1)
 elements thanks to = {0} initialization, what obvious thing did I miss?
 Why
 pReceiveBuffer[nBytes-1] = 0; would need to stay?
 
 Ok since I added that particular code,  let me explain
 
 -if (nBytes  0)
 -{
 -pReceiveBuffer[nBytes-1] = 0;
 -}
 
 was needed because the loop before can exit under 2 conditions:
 the normal one where  a[nBytes - 1] is already 0
 or the 'non-normal' one when the recv return 0 (or -1 for that matter)
 which mean the pipe got interrupted prematurely, in which case the
 buffer would _not_ be 0-terminated
 which was relyied upon later.
 
 there is also the case where recv bail out before reading anything at
 that point nByte = 0 si of course we do not want to do a[nByte - 1]
 and for that case a[0] is set to 0;
 
 initializing the whole buffer is a waste in all case but the corner
 case where the pipe get broken.
 
 Note: it is clearly not expected that the pipe close with receiving
 a\0 as last character... ortherwise we would already be segfaulting a
 lot due to the code aftert that that _assume_ that the buffer is a
 0-terminated string.
 so there is no particular danger that a valid character would be
 overwritten in normal expected cases.

Thank you Norbert for the explanation.
As I indicated in my previous message, I would have been ready to revert my
commit but it seems Stephan fixed the whole thing, see
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=b6ff19fba3a1a6d65134539a71d7a8df0e35d4ff.

Julien
PS : I thought I had found something useful but I must definitely forget
about {0} initialization since it must be used far more carefully than I
expected :-)



--
View this message in context: 
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-desktop-source-tp4038892p4039132.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

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

[Norbert Thiebaud]

 configure.ac |   40 ++--
 1 file changed, 14 insertions(+), 26 deletions(-)

New commits:
commit 437b044caea90badab6f99dc609ea07e37dc5feb
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Feb 21 00:21:47 2013 -0600

clean-up the output and simplify the MOZAB driver config

Change-Id: Iff63e4dd2471d5b5c0e7c52344d694a0e46ce6a0
Reviewed-on: https://gerrit.libreoffice.org/2305
Reviewed-by: David Ostrovsky david.ostrov...@gmx.de
Tested-by: David Ostrovsky david.ostrov...@gmx.de

diff --git a/configure.ac b/configure.ac
index 25145ca..c58f320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8277,30 +8277,15 @@ dnl 
===
 dnl Check for mozilla ab connectivity for windows
 dnl ===
 
-AC_MSG_CHECKING([whether to enable build of Mozilla addressbook connectivity 
driver for Windows])
-if test $enable_win_mozab_driver = yes -a $_os = WINNT -a 
$WITH_MINGW != YES ; then
-AC_MSG_RESULT([yes])
-WITH_MOZAB4WIN=YES
-BUILD_MOZAB=YES
-if test $enable_build_mozab = no ; then
-BUILD_MOZAB=NO
-fi
-else
-AC_MSG_RESULT([no])
-WITH_MOZAB4WIN=NO
-fi
-AC_SUBST(WITH_MOZAB4WIN)
-AC_SUBST(BUILD_MOZAB)
-
-if test $_os != WINNT; then
-# on all other platforms Mozilla addressbook connectivity
-# is unconditionally built
-# new and shiny mork driver
-   AC_MSG_RESULT([yes (new mork driver)])
-else
-if test $WITH_MOZAB4WIN = NO; then
-AC_MSG_RESULT([no])
-else
+if test $_os = WINNT; then
+AC_MSG_CHECKING([whether to enable build of Mozilla addressbook 
connectivity driver for Windows])
+if test $enable_win_mozab_driver = yes -a $WITH_MINGW != YES ; then
+AC_MSG_RESULT([yes])
+WITH_MOZAB4WIN=YES
+BUILD_MOZAB=YES
+if test $enable_build_mozab = no ; then
+BUILD_MOZAB=NO
+fi
 AC_MSG_RESULT([yes, internal (old windows mozab driver)])
 BUILD_TYPE=$BUILD_TYPE MOZ
 EXTMSV80=`cygpath  -u $SRC_ROOT/external/msvcp80`
@@ -8331,10 +8316,13 @@ else
 and relaunch ./autogen.sh])
 fi
 fi
+else
+AC_MSG_RESULT([no])
+WITH_MOZAB4WIN=NO
 fi
 fi
-
-
+AC_SUBST(WITH_MOZAB4WIN)
+AC_SUBST(BUILD_MOZAB)
 AC_SUBST(MSVC80_DLL_DIR)
 AC_SUBST(MSVC80_MNFST)
 AC_SUBST(EXTMSV80)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrew Branch]

 sw/source/core/access/accmap.cxx  |4 +---
 sw/source/core/access/accportions.cxx |   20 +++-
 sw/source/core/access/acctable.cxx|   26 +-
 3 files changed, 13 insertions(+), 37 deletions(-)

New commits:
commit 868cb16417f7a4c9bdbb55b6262eddad3db6dc14
Author: Andrew Branch andyb1@gmail.com
Date:   Wed Feb 20 20:43:58 2013 +

fdo#57950: Remove some chained appends in filter in sw/access

Change-Id: I9f3b44d6ea154d628dd59e31d9403097809a2853
Reviewed-on: https://gerrit.libreoffice.org/2300
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 4f737a8..513c195 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -175,9 +175,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster 
/*rBC*/,
 {
 (void)r;
 #if OSL_DEBUG_LEVEL  0
-rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(Runtime 
exception caught while notifying shape.:\n));
-aError.append(rtl::OUStringToOString(r.Message, 
RTL_TEXTENCODING_ASCII_US));
-OSL_FAIL( aError.getStr() );
+  OSL_FAIL( Runtime exception caught while notifying shape.:\n + 
OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US) );
 #endif
 }
 }
diff --git a/sw/source/core/access/accportions.cxx 
b/sw/source/core/access/accportions.cxx
index 8e1e2ff..5b2e0ac 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -141,40 +141,34 @@ void SwAccessiblePortionData::Special(
 
 // construct string with representation; either directly from
 // rText, or use resources for special case portions
-String sDisplay;
+OUString sDisplay;
 switch( nType )
 {
 case POR_POSTITS:
 case POR_FLYCNT:
 case POR_GRFNUM:
-sDisplay = rtl::OUString(sal_Unicode(0xfffc));
+sDisplay = OUString(sal_Unicode(0xfffc));
 
 break;
 case POR_NUMBER:
 {
-OUStringBuffer aTmpBuffer( rText.Len() + 1 );
-aTmpBuffer.append( rText );
-aTmpBuffer.append( sal_Unicode(' ') );
-sDisplay = aTmpBuffer.makeStringAndClear();
+sDisplay = OUString( rText ) +  ;
 break;
 }
 // #i111768# - apply patch from kstribley:
 // Include the control characters.
 case POR_CONTROLCHAR:
 {
-OUStringBuffer aTmpBuffer( rText.Len() + 1 );
-aTmpBuffer.append( rText );
-aTmpBuffer.append( pTxtNode-GetTxt()[nModelPosition] );
-sDisplay = aTmpBuffer.makeStringAndClear();
+sDisplay = OUString( rText ) + OUString( 
pTxtNode-GetTxt()[nModelPosition] );
 break;
 }
 default:
-sDisplay = rText;
+sDisplay = OUString( rText );
 break;
 }
 
 // ignore zero/zero portions (except for terminators)
-if( (nLength == 0)  (sDisplay.Len() == 0)  (nType != POR_TERMINATE) )
+if( (nLength == 0)  (sDisplay.getLength() == 0)  (nType != 
POR_TERMINATE) )
 return;
 
 // special treatment for zero length portion at the beginning:
@@ -194,7 +188,7 @@ void SwAccessiblePortionData::Special(
 aPortionAttrs.push_back( nAttr );
 
 // update buffer + nModelPosition
-aBuffer.append( OUString(sDisplay) );
+aBuffer.append( sDisplay );
 nModelPosition += nLength;
 
 // remember 'last' special portion (unless it's our own 'closing'
diff --git a/sw/source/core/access/acctable.cxx 
b/sw/source/core/access/acctable.cxx
index 1db6a38..d50c806 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -692,12 +692,7 @@ SwAccessibleTable::SwAccessibleTable(
 const_cast SwFrmFmt * ( pFrmFmt )-Add( this );
 const String rName = pFrmFmt-GetName();
 
-OUStringBuffer aBuffer( rName.Len() + 4 );
-aBuffer.append( OUString(rName) );
-aBuffer.append( static_castsal_Unicode( '-' ) );
-aBuffer.append( static_castsal_Int32( pTabFrm-GetPhyPageNum() ) );
-
-SetName( aBuffer.makeStringAndClear() );
+SetName( OUString( rName ) + - + OUString::number( 
pTabFrm-GetPhyPageNum() ) );
 
 OUString sArg1( static_cast const SwTabFrm * ( GetFrm() )
 -GetFmt()-GetName() );
@@ -728,12 +723,9 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem *pNew
 OUString sOldName( GetName() );
 
 const String rNewTabName = pFrmFmt-GetName();
-OUStringBuffer aBuffer( rNewTabName.Len() + 4 );
-aBuffer.append( OUString(rNewTabName) );
-aBuffer.append( static_castsal_Unicode( '-' ) );
-aBuffer.append( static_castsal_Int32( pTabFrm-GetPhyPageNum() ) 
);
 
-SetName( 

[ANN] LibreOffice 4.0.1 RC1 test builds available

[Fridrich Strba]

Hi *,

for the upcoming new version 4.0.1, the RC1 builds now start to be
available on pre-releases. This build is slated to be first release
candidate build on the way towards 4.0.1, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#4.0.1_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try  report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 4.0.0 release is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-1-release-4.0.1.1.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

... | --- | ...

People with an *android* device are encouraged to smoke-test the updated
Impress Remote App, available here

 
http://dev-builds.libreoffice.org/pre-releases/sdremote-1.0.3/playstore/ImpressRemote.apk

NOTE: This package will replace your already-installed version. For how
to use it, see:

 https://wiki.documentfoundation.org/Development/Impress/RemoteHowTo

... | --- | ...

Thanks a lot for your help,
Fridrich
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About -std=c++98 by default in CXXFLAGS

[Gábor Stefanik]

On Thu, Feb 21, 2013 at 1:13 PM, julien2412 serval2...@yahoo.fr wrote:
 Hello,

 Since all compilers aren't ready for C++11, would it be relevant to include
 by default -std=c++98 in CXXFLAGS ?
 The goal is, for beginners like me, to avoid submitting things like
 https://gerrit.libreoffice.org/2302 :-)

 Julien

-std=c++03?




 --
 View this message in context: 
 http://nabble.documentfoundation.org/About-std-c-98-by-default-in-CXXFLAGS-tp4039130.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



-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About -std=c++98 by default in CXXFLAGS

[Lubos Lunak]

On Thursday 21 of February 2013, julien2412 wrote:
 Hello,

 Since all compilers aren't ready for C++11, would it be relevant to include
 by default -std=c++98 in CXXFLAGS ?
 The goal is, for beginners like me, to avoid submitting things like
 https://gerrit.libreoffice.org/2302 :-)

 It is intentional that some C++11 features are used if available, in order to 
provide various benefits (SAL_OVERRIDE for example).

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source sfx2/inc sfx2/Library_sfx.mk sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk sw/inc sw/Library_swui.mk sw/source sw/UI_swriter.mk xmloff/source

[Noel Power]

 sc/inc/document.hxx  |4 +
 sc/inc/unonames.hxx  |2 
 sc/source/core/data/documen2.cxx |3 -
 sc/source/filter/xml/xmlfonte.cxx|   17 --
 sc/source/filter/xml/xmlimprt.cxx|6 ++
 sc/source/filter/xml/xmlimprt.hxx|1 
 sc/source/ui/docshell/docsh.cxx  |1 
 sc/source/ui/unoobj/confuno.cxx  |   15 +
 sfx2/Library_sfx.mk  |1 
 sfx2/UI_sfx.mk   |1 
 sfx2/inc/sfx2/dinfdlg.hxx|1 
 sfx2/source/dialog/dialog.hrc|1 
 sfx2/source/dialog/dialog.src|5 +
 sfx2/source/dialog/dinfdlg.cxx   |8 ++
 sfx2/source/dialog/documentfontsdialog.cxx   |   75 +++
 sfx2/source/inc/documentfontsdialog.hxx  |   44 +++
 sfx2/uiconfig/ui/documentfontspage.ui|   29 ++
 sw/Library_swui.mk   |1 
 sw/UI_swriter.mk |1 
 sw/inc/globals.hrc   |2 
 sw/source/ui/app/app.src |5 -
 sw/source/ui/app/docsh2.cxx  |2 
 sw/source/ui/dialog/documentfontsdialog.cxx  |   54 ---
 sw/source/ui/dialog/swdlgfact.cxx|4 -
 sw/source/ui/inc/documentfontsdialog.hxx |   44 ---
 sw/source/ui/uno/SwXDocumentSettings.cxx |1 
 xmloff/source/style/XMLFontStylesContext.cxx |1 
 27 files changed, 211 insertions(+), 118 deletions(-)

New commits:
commit db28ed792e08d3eef3e901eaedb255bdc66d1db1
Author: Noel Power noel.po...@suse.com
Date:   Thu Feb 21 10:39:10 2013 +

adapt writer to use centralised font dialog and fix some minor bugs

fixed incorrect return of EmbeddFonts property and also make sure that 
NotifyEmbeddedFontRead
is called on reload

Change-Id: I085f50ff88bbf73b5dcdb9630b6c5844430a47c2

diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 4731533..771ddfa 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
 sw/source/ui/dialog/abstract \
 sw/source/ui/dialog/addrdlg \
 sw/source/ui/dialog/ascfldlg \
-sw/source/ui/dialog/documentfontsdialog \
 sw/source/ui/dialog/docstdlg \
 sw/source/ui/dialog/macassgn \
 sw/source/ui/dialog/swdialmgr \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 86e75e2..d410de6 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columnpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
-   sw/uiconfig/swriter/ui/documentfontspage \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
sw/uiconfig/swriter/ui/exchangedatabases \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 8a2b81d..0653aaf 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -30,7 +30,6 @@
 #define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2)
 
 #define STR_DOC_STAT(RC_GLOBALS_BEGIN + 10)
-#define STR_DOC_FONTS   (RC_GLOBALS_BEGIN + 107)
 
 #define STR_PAGE(RC_GLOBALS_BEGIN + 14)
 #define STR_PRINTOPTUI  (RC_GLOBALS_BEGIN + 15)
@@ -139,7 +138,6 @@
 #define TP_COLUMN   (RC_GLOBALS_BEGIN +  13)
 
 #define TP_DOC_STAT (RC_GLOBALS_BEGIN +  15)
-#define TP_DOC_FONTS(RC_GLOBALS_BEGIN + 108)
 
 #define TP_HEADER_PAGE  (RC_GLOBALS_BEGIN +  16)
 #define TP_FOOTER_PAGE  (RC_GLOBALS_BEGIN +  17)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 9e1eff6..38f114f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -305,11 +305,6 @@ String STR_DOC_STAT
 Text [ en-US ] = Statistics ;
 };
 
-String STR_DOC_FONTS
-{
-Text [ en-US ] = Fonts ;
-};
-
  // 
  // Statusbar-titles
  // 
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index b13e53d..b306ded 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -141,7 +141,7 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
 {
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, SwAbstractDialogFactory fail!);
-pDlg-AddTabPage(TP_DOC_FONTS, 
SW_RESSTR(STR_DOC_FONTS),pFact-GetTabPageCreatorFunc( TP_DOC_FONTS ),0);
+pDlg-AddFontTabPage();
 pDlg-AddTabPage(TP_DOC_STAT, 
SW_RESSTR(STR_DOC_STAT),pFact-GetTabPageCreatorFunc( TP_DOC_STAT ),0);
 }
 }
diff --git a/sw/source/ui/dialog/documentfontsdialog.cxx 
b/sw/source/ui/dialog/documentfontsdialog.cxx

Re: Re: New feature in Calc: Stepped Lines graphs

[Eric Seynaeve]

On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote:
 In Gnumeric I see an interpolation with stepped lines. Is it that, what
 you want to get? If yes, then I would not implement them as new chart
 type in LO, but use the same way as in Gnumeric and make it a new kind
 of interpolation.

I looked it up and indeed, this shows what I want.
I have taken screenshots of how it looks in Gnumeric and in my code (so far). 
Also, I have saved the Gnumeric file as ODF. All of this is attached to the 
bug report for posterity ;-)

 There exists already a request for ODF1.3 to specify such interpolation.
 If LO will implement them too, it will become more likely, that they
 will be specified in ODF1.3.

Nice. Can I have a look at this proposal somewhere online or do you need to be 
an OASIS member ?

Thanks a lot for the information Regina.

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

Re: Re: New feature in Calc: Stepped Lines graphs

[Eric Seynaeve]

On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote:

 The specification is not written in a way, that some people image cool
 new features, but they look, what existing programs do. And those things
 which are common are standardized. Therefore LO has ODF1.2 extended
 and Gnumeric with foreign elements.

Regina, I looked at the xml in Gnumeric.

It indicates it as follows:
style:style ...
  style:chart-properties chart:interpolation=gnm:step-end.../
/style:style

I guess the 'gnm:step-end' is a foreign element/attribute. Should I implement 
something similar for LO ? If yes, what to use instead of gnm:. If no, can 
you point me in the right direction.

Thanks a lot.

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

license statement

[hamza abdelkebir]

All of my past  future contributions to LibreOffice may be licensed 
under the MPL/LGPLv3+ dual license
-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] String cleanup in filter

[Norbert Thiebaud (via Code Review)]

Hello LibreOffice gerrit bot,

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

https://gerrit.libreoffice.org/1970

to look at the new rebased patch set (#7).

Change subject: String cleanup in filter
..

String cleanup in filter

Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd
---
M filter/inc/filter/msfilter/svdfppt.hxx
M filter/source/msfilter/svdfppt.cxx
M sd/source/filter/ppt/pptin.cxx
M sd/source/filter/ppt/propread.cxx
M sd/source/filter/ppt/propread.hxx
5 files changed, 117 insertions(+), 117 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1970/7
-- 
To view, visit https://gerrit.libreoffice.org/1970
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br

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

Re: About -std=c++98 by default in CXXFLAGS

[Caolán McNamara]

On Thu, 2013-02-21 at 14:00 +0100, Lubos Lunak wrote:
  It is intentional that some C++11 features are used if available, in order 
 to 
 provide various benefits (SAL_OVERRIDE for example).

FWIW, another gotcha with --with-system-boost and at least some recent
versions of boost is that our uses of their boost::unordered_maps won't
compile without c++11 with gcc

C.

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

Re: New feature in Calc: Stepped Lines graphs

[Michael Stahl]

On 20/02/13 22:11, Eric Seynaeve wrote:
 On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote:

 The specification is not written in a way, that some people image cool
 new features, but they look, what existing programs do. And those things
 which are common are standardized. Therefore LO has ODF1.2 extended
 and Gnumeric with foreign elements.
 
 Regina, I looked at the xml in Gnumeric.
 
 It indicates it as follows:
 
 style:style ...
 style:chart-properties chart:interpolation=gnm:step-end.../
 /style:style
 
 I guess the 'gnm:step-end' is a foreign element/attribute. Should I
 implement something similar for LO ? If yes, what to use instead of
 gnm:. If no, can you point me in the right direction.

if what you implement has the same semantics as what Gnumeric does (and
i think that's your goal) then it does make sense to use the same
foreign elements.

you'd need to add a namespace declaration for the gnm prefix; look at
the xmlns:gnm=... attribute that must be somewhere in the file (likely
on the root element).  you can add namespaces in
xmloff/inc/xmloff/xmlnmspe.hxx and SchXMLExport::SchXMLExport() in
xmloff/source/chart/SchXMLExport.cxx.

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

REMINDER: Release 4.0.1.2 from libreoffice-4-0-1 branch

[Petr Mladek]

Hi,

please note that the commit deadline for 4.0.1.2, aka rc2, is
already on Monday, February 25, 2013. It will be used as LO-4.0.1
final if no blocker is reported.

IMPORTANT: There are not two weeks between rc1 and rc2 this time. It is
another side effect of the late schedule change when we used two weeks
between 4.0.0 betas and RCs. We were not able to shift the feature
freeze and final release.

This should be the last anomality. There should be always two weeks
between all betas and rcs from now on,
see https://wiki.documentfoundation.org/ReleasePlan.

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


Best Regards,
Petr



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

[PATCH] quiet external module build log unless failure

[Norbert Thiebaud (via Code Review)]

Hello LibreOffice gerrit bot, David Tardon, David Ostrovsky,

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

https://gerrit.libreoffice.org/2304

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

Change subject: quiet external module build log unless failure
..

quiet external module build log unless failure

ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
---
M apache-commons/ExternalProject_apache_commons_codec.mk
M apache-commons/ExternalProject_apache_commons_httpclient.mk
M apache-commons/ExternalProject_apache_commons_lang.mk
M apache-commons/ExternalProject_apache_commons_logging.mk
M beanshell/ExternalProject_beanshell.mk
M cairo/ExternalProject_cairo.mk
M cairo/ExternalProject_pixman.mk
M cppunit/ExternalProject_cppunit.mk
M curl/ExternalProject_curl.mk
M expat/ExternalProject_expat.mk
M fontconfig/ExternalProject_fontconfig.mk
M hsqldb/ExternalProject_hsqldb.mk
M hunspell/ExternalProject_hunspell.mk
M hyphen/ExternalProject_hyphen.mk
M icu/ExternalProject_icu.mk
M jfreereport/ExternalProject_jfreereport_flow_engine.mk
M jfreereport/ExternalProject_jfreereport_flute.mk
M jfreereport/ExternalProject_jfreereport_libbase.mk
M jfreereport/ExternalProject_jfreereport_libfonts.mk
M jfreereport/ExternalProject_jfreereport_libformula.mk
M jfreereport/ExternalProject_jfreereport_liblayout.mk
M jfreereport/ExternalProject_jfreereport_libloader.mk
M jfreereport/ExternalProject_jfreereport_librepository.mk
M jfreereport/ExternalProject_jfreereport_libserializer.mk
M jfreereport/ExternalProject_jfreereport_libxml.mk
M jfreereport/ExternalProject_jfreereport_sac.mk
M lcms2/ExternalProject_lcms2.mk
M libcdr/ExternalProject_libcdr.mk
M libexttextcat/ExternalProject_exttextcat.mk
M liblangtag/ExternalProject_langtag.mk
M libmspub/ExternalProject_libmspub.mk
M liborcus/ExternalProject_liborcus.mk
M libvisio/ExternalProject_libvisio.mk
M libwpd/ExternalProject_libwpd.mk
M libxml2/ExternalProject_xml2.mk
M libxmlsec/ExternalProject_xmlsec.mk
M libxslt/ExternalProject_xslt.mk
M lpsolve/ExternalProject_lpsolve.mk
M mythes/ExternalProject_mythes.mk
M nss/ExternalProject_nss.mk
M openldap/ExternalProject_openldap.mk
M openssl/ExternalProject_openssl.mk
M postgresql/ExternalProject_postgresql.mk
M python3/ExternalProject_python3.mk
M pyuno/CustomTarget_zipcore.mk
M redland/ExternalProject_raptor.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
M rhino/ExternalProject_rhino.mk
M solenv/gbuild/ExternalProject.mk
M solenv/gbuild/Helper.mk
M solenv/gbuild/gbuild.mk
M tomcat/ExternalProject_tomcat.mk
M xpdf/ExternalProject_xpdf.mk
54 files changed, 943 insertions(+), 919 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2304/4
-- 
To view, visit https://gerrit.libreoffice.org/2304
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

[Libreoffice-commits] .: src/lib

[Libreoffice Gerrit user]

 src/lib/VSD5Parser.cpp  |   33 ++---
 src/lib/VSD5Parser.h|3 +++
 src/lib/VSD6Parser.cpp  |   11 +++
 src/lib/VSD6Parser.h|1 +
 src/lib/VSDCollector.h  |2 +-
 src/lib/VSDContentCollector.cpp |3 ++-
 src/lib/VSDContentCollector.h   |2 +-
 src/lib/VSDDocumentStructure.h  |3 +++
 src/lib/VSDPages.cpp|5 +++--
 src/lib/VSDPages.h  |1 +
 src/lib/VSDParser.cpp   |   37 +++--
 src/lib/VSDParser.h |4 
 src/lib/VSDStylesCollector.cpp  |2 +-
 src/lib/VSDStylesCollector.h|2 +-
 src/lib/VSDXMLParserBase.cpp|5 -
 15 files changed, 89 insertions(+), 25 deletions(-)

New commits:
commit 9a4a8eb8e76755bd2aaa287f86a931f7f4030ccc
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 21 15:39:47 2013 +0100

Some initial work on the support of page names

diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 55351b1..9d7c164 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -162,44 +162,47 @@ void libvisio::VSD5Parser::readGeomList(WPXInputStream 
*input)
   handleChunkRecords(input);
 }
 
-void libvisio::VSD5Parser::readCharList(WPXInputStream *input)
+void libvisio::VSD5Parser::readList(WPXInputStream *input)
 {
-  VSD_DEBUG_MSG((VSD5Parser::readCharList\n));
   if (!m_isStencilStarted)
 m_collector-collectUnhandledChunk(m_header.id, m_header.level);
   handleChunkRecords(input);
 }
 
+void libvisio::VSD5Parser::readCharList(WPXInputStream *input)
+{
+  VSD_DEBUG_MSG((VSD5Parser::readCharList\n));
+  readList(input);
+}
+
 void libvisio::VSD5Parser::readParaList(WPXInputStream *input)
 {
   VSD_DEBUG_MSG((VSD5Parser::readParaList\n));
-  if (!m_isStencilStarted)
-m_collector-collectUnhandledChunk(m_header.id, m_header.level);
-  handleChunkRecords(input);
+  readList(input);
 }
 
 void libvisio::VSD5Parser::readShapeList(WPXInputStream *input)
 {
   VSD_DEBUG_MSG((VSD5Parser::readShapeList\n));
-  if (!m_isStencilStarted)
-m_collector-collectUnhandledChunk(m_header.id, m_header.level);
-  handleChunkRecords(input);
+  readList(input);
 }
 
 void libvisio::VSD5Parser::readPropList(WPXInputStream *input)
 {
   VSD_DEBUG_MSG((VSD5Parser::readPropList\n));
-  if (!m_isStencilStarted)
-m_collector-collectUnhandledChunk(m_header.id, m_header.level);
-  handleChunkRecords(input);
+  readList(input);
 }
 
 void libvisio::VSD5Parser::readFieldList(WPXInputStream *input)
 {
   VSD_DEBUG_MSG((VSD5Parser::readFieldList\n));
-  if (!m_isStencilStarted)
-m_collector-collectUnhandledChunk(m_header.id, m_header.level);
-  handleChunkRecords(input);
+  readList(input);
+}
+
+void libvisio::VSD5Parser::readNameList2(WPXInputStream *input)
+{
+  VSD_DEBUG_MSG((VSD5Parser::readNameList2\n));
+  readList(input);
 }
 
 void libvisio::VSD5Parser::readLine(WPXInputStream *input)
@@ -378,7 +381,7 @@ void libvisio::VSD5Parser::readShape(WPXInputStream *input)
 void libvisio::VSD5Parser::readPage(WPXInputStream *input)
 {
   unsigned backgroundPageID = getUInt(input);
-  m_collector-collectPage(m_header.id, m_header.level, backgroundPageID, 
m_isBackgroundPage);
+  m_collector-collectPage(m_header.id, m_header.level, backgroundPageID, 
m_isBackgroundPage, WPXString());
 }
 
 void libvisio::VSD5Parser::readTextBlock(WPXInputStream *input)
diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h
index ceb73d6..4430e1c 100644
--- a/src/lib/VSD5Parser.h
+++ b/src/lib/VSD5Parser.h
@@ -58,6 +58,7 @@ protected:
   virtual void readShapeList(WPXInputStream *input);
   virtual void readPropList(WPXInputStream *input);
   virtual void readFieldList(WPXInputStream *input);
+  virtual void readNameList2(WPXInputStream *input);
 
   virtual void readLine(WPXInputStream *input);
   virtual void readFillAndShadow(WPXInputStream *input);
@@ -79,6 +80,8 @@ private:
   VSD5Parser();
   VSD5Parser(const VSDParser );
   VSD5Parser operator=(const VSDParser );
+
+  void readList(WPXInputStream *input);
 };
 
 } // namespace libvisio
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index 645d569..a34862b 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -282,6 +282,17 @@ void libvisio::VSD6Parser::readName(WPXInputStream *input)
   }
 }
 
+void libvisio::VSD6Parser::readName2(WPXInputStream *input)
+{
+  unsigned char character = 0;
+  ::WPXBinaryData name;
+  getInt(input); // skip a dword that seems to be always 1
+  while ((character = readU8(input)))
+name.append(character);
+  name.append(character);
+  m_names[m_header.id] = VSDName(name, libvisio::VSD_TEXT_ANSI);
+}
+
 void libvisio::VSD6Parser::readTextField(WPXInputStream *input)
 {
   unsigned long initialPosition = input-tell();
diff --git a/src/lib/VSD6Parser.h b/src/lib/VSD6Parser.h
index 6550324..dd7663b 100644
--- a/src/lib/VSD6Parser.h
+++ b/src/lib/VSD6Parser.h
@@ -54,6 +54,7 @@ 

Re: New feature in Calc: Stepped Lines graphs

[Regina Henschel]

Hi Michael, hi Eric,

Michael Stahl schrieb:

On 20/02/13 22:11, Eric Seynaeve wrote:

On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote:



The specification is not written in a way, that some people image cool
new features, but they look, what existing programs do. And those things
which are common are standardized. Therefore LO has ODF1.2 extended
and Gnumeric with foreign elements.


Regina, I looked at the xml in Gnumeric.

It indicates it as follows:

style:style ...
style:chart-properties chart:interpolation=gnm:step-end.../
/style:style

I guess the 'gnm:step-end' is a foreign element/attribute. Should I
implement something similar for LO ? If yes, what to use instead of
gnm:. If no, can you point me in the right direction.


if what you implement has the same semantics as what Gnumeric does (and
i think that's your goal) then it does make sense to use the same
foreign elements.

you'd need to add a namespace declaration for the gnm prefix; look at
the xmlns:gnm=... attribute that must be somewhere in the file (likely
on the root element).  you can add namespaces in
xmloff/inc/xmloff/xmlnmspe.hxx and SchXMLExport::SchXMLExport() in
xmloff/source/chart/SchXMLExport.cxx.



I'm not sure whether the namespace it necessary for an attribute 
_value_. Currently the attribute chart:interpolation allows only the 
values none, cubic-spline and b-spline. Gnumeric does not introduce a 
new attribute or element, but a new value for the attribute.


I'm not sure whether the way Gnumeric does it, is grammatically correct. 
Perhaps it is necessary to make an own attribute 
LOchart:interpolation, which then allows more values. Thorsten might 
know it, and you should ask him.


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

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 17495126cc138e45a0f8f8ec390eb35eb06dec25
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 21 14:45:00 2013 +

Updated core
Project: help  7a607b7a563b85f5c0b884e8c32c4791c14cd66f

diff --git a/helpcontent2 b/helpcontent2
index bf70fe5..7a607b7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bf70fe53f234c712ff047607b186a4687acf8675
+Subproject commit 7a607b7a563b85f5c0b884e8c32c4791c14cd66f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst   |   18 -
 source/text/shared/01/02230402.xhp |   49 ++---
 2 files changed, 25 insertions(+), 42 deletions(-)

New commits:
commit 7a607b7a563b85f5c0b884e8c32c4791c14cd66f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 21 14:45:00 2013 +

update help ids for redline properties tabpage .ui conversion

Change-Id: I83e9a8ddcc5a2c489edc0a5ec033c2a5323766e5

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2ba7ce5..e4dd7c2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3071,24 +3071,6 @@ HID_REDLINE_CTRL,53226,
 HID_REDLINE_OPT,53217,
 HID_REDLINING_DLG,34044,
 HID_REDLINING_EDIT,34045,
-HID_REDLINING_FILTER_BTN_REF,34021,
-HID_REDLINING_FILTER_CB_ACTION,34043,
-HID_REDLINING_FILTER_CB_AUTOR,34016,
-HID_REDLINING_FILTER_CB_COMMENT,34061,
-HID_REDLINING_FILTER_CB_DATE,34008,
-HID_REDLINING_FILTER_CB_RANGE,34018,
-HID_REDLINING_FILTER_DF_DATE,34010,
-HID_REDLINING_FILTER_DF_DATE2,34013,
-HID_REDLINING_FILTER_ED_COMMENT,34062,
-HID_REDLINING_FILTER_ED_RANGE,34019,
-HID_REDLINING_FILTER_IB_CLOCK,34012,
-HID_REDLINING_FILTER_IB_CLOCK2,34015,
-HID_REDLINING_FILTER_LB_ACTION,34020,
-HID_REDLINING_FILTER_LB_AUTOR,34017,
-HID_REDLINING_FILTER_LB_DATE,34009,
-HID_REDLINING_FILTER_PAGE,34007,
-HID_REDLINING_FILTER_TF_DATE,34011,
-HID_REDLINING_FILTER_TF_DATE2,34014,
 HID_REDLINING_NEXT,34047,
 HID_REDLINING_PREV,34046,
 HID_REDLINING_TABCONTROL,34048,
diff --git a/source/text/shared/01/02230402.xhp 
b/source/text/shared/01/02230402.xhp
index 8e4d436..a54e984 100644
--- a/source/text/shared/01/02230402.xhp
+++ b/source/text/shared/01/02230402.xhp
@@ -32,20 +32,21 @@
 section id=filter
 paragraph role=heading id=hd_id3153323 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/01/02230402.xhp 
name=FilterFilter/link/paragraph
 paragraph role=paragraph id=par_id3147088 xml-lang=en-US l10n=U 
oldref=2Set the criteria for filtering the list of changes on the link 
href=text/shared/01/02230401.xhp name=ListemphList/emph/link 
tab./paragraph
+bookmark xml-lang=en-US 
branch=hid/svx/ui/redlinefilterpage/RedlineFilterPage id=bm_id3149399 
localize=false/
 /section
 section id=howtoget
   embed href=text/shared/00/0402.xhp#rotliniefilter/
 /section
 section id=calc
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_CB_DATE 
id=bm_id3149398 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_LB_DATE 
id=bm_id3147653 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_DF_DATE 
id=bm_id3156113 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_TF_DATE 
id=bm_id3148992 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_DF_DATE2 
id=bm_id3155450 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_TF_DATE2 
id=bm_id3149795 localize=false/paragraph role=heading id=hd_id3150355 
xml-lang=en-US level=2 l10n=U oldref=3Date/paragraph
-paragraph role=paragraph id=par_id3147573 xml-lang=en-US l10n=U 
oldref=4ahelp hid=HID_REDLINING_FILTER_TF_DATE2Filters the list of 
changes according to the date and the time that you specify./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_IB_CLOCK 
id=bm_id3155179 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_REDLINING_FILTER_IB_CLOCK2 
id=bm_id3156330 localize=false/paragraph role=heading id=hd_id3154811 
xml-lang=en-US level=3 l10n=U oldref=17Set Date/Time/paragraph
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/date 
id=bm_id3149398 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/datecond 
id=bm_id3147653 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/startdate 
id=bm_id3156113 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/starttime 
id=bm_id3148992 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/enddate 
id=bm_id3155450 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/endtime 
id=bm_id3149795 localize=false/paragraph role=heading id=hd_id3150355 
xml-lang=en-US level=2 l10n=U oldref=3Date/paragraph
+paragraph role=paragraph id=par_id3147573 xml-lang=en-US l10n=U 
oldref=4ahelp hid=svx/ui/redlinefilterpage/endtimeFilters the list of 
changes according to the date and the time that you specify./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/startclock 
id=bm_id3155179 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/redlinefilterpage/endclock 
id=bm_id3156330 localize=false/paragraph role=heading id=hd_id3154811 
xml-lang=en-US level=3 l10n=U oldref=17Set Date/Time/paragraph
 table id=tbl_id3156192
 tablerow
 tablecell colspan= rowspan=
@@ -54,19 +55,19 @@
/image/paragraph
 /tablecell
 tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3143270 xml-lang=en-US 

[Libreoffice-commits] core.git: 2 commits - sfx2/uiconfig svx/inc

[Caolán McNamara]

 sfx2/uiconfig/ui/documentfontspage.ui |7 +++
 sfx2/uiconfig/ui/documentinfopage.ui  |1 +
 svx/inc/helpid.hrc|   17 -
 3 files changed, 4 insertions(+), 21 deletions(-)

New commits:
commit 93b850b2a3db792468f5e70272b22fb76aff474f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 21 14:44:24 2013 +

remove unused hids

Change-Id: I02343ca6fe9d0c642cd8ebf4723582c7c25889fb

diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index b4a2737..afd9484 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -153,23 +153,6 @@
 #define HID_POPUP_LINE
SVX_HID_POPUP_LINE
 #define HID_POPUP_LINEEND 
SVX_HID_POPUP_LINEEND
 #define HID_POPUP_LINEEND_CTRL
SVX_HID_POPUP_LINEEND_CTRL
-#define HID_REDLINING_FILTER_BTN_REF  
SVX_HID_REDLINING_FILTER_BTN_REF
-#define HID_REDLINING_FILTER_CB_ACTION
SVX_HID_REDLINING_FILTER_CB_ACTION
-#define HID_REDLINING_FILTER_CB_AUTOR 
SVX_HID_REDLINING_FILTER_CB_AUTOR
-#define HID_REDLINING_FILTER_CB_COMMENT   
SVX_HID_REDLINING_FILTER_CB_COMMENT
-#define HID_REDLINING_FILTER_CB_DATE  
SVX_HID_REDLINING_FILTER_CB_DATE
-#define HID_REDLINING_FILTER_CB_RANGE 
SVX_HID_REDLINING_FILTER_CB_RANGE
-#define HID_REDLINING_FILTER_DF_DATE  
SVX_HID_REDLINING_FILTER_DF_DATE
-#define HID_REDLINING_FILTER_DF_DATE2 
SVX_HID_REDLINING_FILTER_DF_DATE2
-#define HID_REDLINING_FILTER_ED_COMMENT   
SVX_HID_REDLINING_FILTER_ED_COMMENT
-#define HID_REDLINING_FILTER_ED_RANGE 
SVX_HID_REDLINING_FILTER_ED_RANGE
-#define HID_REDLINING_FILTER_IB_CLOCK 
SVX_HID_REDLINING_FILTER_IB_CLOCK
-#define HID_REDLINING_FILTER_IB_CLOCK2
SVX_HID_REDLINING_FILTER_IB_CLOCK2
-#define HID_REDLINING_FILTER_LB_ACTION
SVX_HID_REDLINING_FILTER_LB_ACTION
-#define HID_REDLINING_FILTER_LB_AUTOR 
SVX_HID_REDLINING_FILTER_LB_AUTOR
-#define HID_REDLINING_FILTER_LB_DATE  
SVX_HID_REDLINING_FILTER_LB_DATE
-#define HID_REDLINING_FILTER_TF_DATE  
SVX_HID_REDLINING_FILTER_TF_DATE
-#define HID_REDLINING_FILTER_TF_DATE2 
SVX_HID_REDLINING_FILTER_TF_DATE2
 #define HID_REDLINING_TABCONTROL  
SVX_HID_REDLINING_TABCONTROL
 #define HID_REDLINING_VIEW_DG_VIEW
SVX_HID_REDLINING_VIEW_DG_VIEW
 #define HID_REDLINING_VIEW_DG_VIEW_HEADER 
SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER
commit 128910b6c338cc78822d405e2dc03acc02bd48d8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 21 14:33:13 2013 +

HIG, consistent border width for properties page

Change-Id: Iacaa53c167230d40bd7e68216ff9deb97c528063

diff --git a/sfx2/uiconfig/ui/documentfontspage.ui 
b/sfx2/uiconfig/ui/documentfontspage.ui
index 0003f47..89888e2 100644
--- a/sfx2/uiconfig/ui/documentfontspage.ui
+++ b/sfx2/uiconfig/ui/documentfontspage.ui
@@ -4,16 +4,15 @@
   object class=GtkGrid id=DocumentFontsPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=row_spacing12/property
-property name=column_spacing18/property
+property name=border_width6/property
+property name=row_spacing6/property
+property name=column_spacing12/property
 child
   object class=GtkCheckButton id=embedFonts
 property name=label translatable=yes_Embed fonts in the 
document/property
-property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 72514654..eeccbd0 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -5,6 +5,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
+property name=border_width6/property
 property name=row_spacing6/property
 property name=column_spacing18/property
 child
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 extras/source/autotext/lang/tr/crdbus50.bau |binary
 extras/source/autotext/lang/tr/template.bau |binary
 2 files changed

New commits:
commit c4a00457a873cc6b72e7b1dd70ca16db56a0aac8
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 21 15:16:24 2013 +0100

convert Turkish AutoText files from old binary to zipped XML

I wonder when the support of old binary format was discontinued, but
at least in LibreOffice 3.6 it did not work. I converted the files with
OpenOffice.org 1.0.3.
t Please enter the commit message for your changes. Lines starting

Change-Id: Ie68371b613ab0464eefe909d083dbb8567623a2b

diff --git a/extras/source/autotext/lang/tr/crdbus50.bau 
b/extras/source/autotext/lang/tr/crdbus50.bau
index cd8ca31..a9eb8dc 100644
Binary files a/extras/source/autotext/lang/tr/crdbus50.bau and 
b/extras/source/autotext/lang/tr/crdbus50.bau differ
diff --git a/extras/source/autotext/lang/tr/template.bau 
b/extras/source/autotext/lang/tr/template.bau
index 60d51dc..b1b2b63 100644
Binary files a/extras/source/autotext/lang/tr/template.bau and 
b/extras/source/autotext/lang/tr/template.bau differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New feature in Calc: Stepped Lines graphs

[Regina Henschel]

Hi Eric,

Eric Seynaeve schrieb:

On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote:

  In Gnumeric I see an interpolation with stepped lines. Is it that, what

  you want to get? If yes, then I would not implement them as new chart

  type in LO, but use the same way as in Gnumeric and make it a new kind

  of interpolation.

I looked it up and indeed, this shows what I want.

I have taken screenshots of how it looks in Gnumeric and in my code (so
far). Also, I have saved the Gnumeric file as ODF. All of this is
attached to the bug report for posterity ;-)

  There exists already a request for ODF1.3 to specify such interpolation.

  If LO will implement them too, it will become more likely, that they

  will be specified in ODF1.3.

Nice. Can I have a look at this proposal somewhere online or do you need
to be an OASIS member ?


You can browse the OASIS issue tracker at 
https://tools.oasis-open.org/issues/browse/office and search the comment 
mailing list https://lists.oasis-open.org/archives/office-comment/.


Here especially https://tools.oasis-open.org/issues/browse/OFFICE-3662

But it is not actually discussed, AFAIK.

Kind regards
Regina








Thanks a lot for the information Regina.

Eric



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



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

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

[Luboš Luňák]

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

New commits:
commit 68b207d08bf0c0197a7309cc58da8b8af6727398
Author: Luboš Luňák l.lu...@suse.cz
Date:   Thu Feb 21 16:04:33 2013 +0100

fix build

Change-Id: I7b0e5776771d0da41b422fe235598710f7175357

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 513c195..eb186c7 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -175,7 +175,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster 
/*rBC*/,
 {
 (void)r;
 #if OSL_DEBUG_LEVEL  0
-  OSL_FAIL( Runtime exception caught while notifying shape.:\n + 
OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US) );
+  OSL_FAIL( OString(Runtime exception caught while notifying 
shape.:\n + OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)).getStr());
 #endif
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sw/source/ui/docvw/SidebarWin.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bf61cf8d76e20d444e8617f560e4f44899f4120b
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Wed Feb 20 17:55:08 2013 +0100

Missing break in switch sidebarwin.cxx

Change-Id: Ia195511369c315cf865fed321edc1ace2c82443b
Reviewed-on: https://gerrit.libreoffice.org/2299
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index 0d128ee..467d310 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -933,6 +933,7 @@ void SwSidebarWin::ExecuteCommand(sal_uInt16 nSlot)
 aItems[1] = 0;
 mrView.GetViewFrame()-GetBindings().Execute( nSlot, aItems, 0, 
SFX_CALLMODE_ASYNCHRON );
 }
+break;
 default:
 mrView.GetViewFrame()-GetBindings().Execute( nSlot );
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cppu/source/uno/lbmap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 925e14220ef51ec31604d94ab02d8ae3f37b7d43
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 21 16:50:01 2013 +0100

osl_atomic_increment/decrement are macros

Change-Id: Ib2d61e436d625ac89defe718d4cc1d866d538397

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index e6892d4..eea8fe8 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -205,7 +205,7 @@ static void SAL_CALL mediate_free( uno_Mapping * pMapping )
 static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
 SAL_THROW(())
 {
-if (1 == ::osl_atomic_increment(
+if (1 == osl_atomic_increment(
  static_cast uno_Mediate_Mapping * ( pMapping )-nRef ))
 {
 uno_registerMapping(
@@ -219,7 +219,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * 
pMapping )
 static void SAL_CALL mediate_release( uno_Mapping * pMapping )
 SAL_THROW(())
 {
-if (! ::osl_atomic_decrement(
+if (! osl_atomic_decrement(
  static_cast uno_Mediate_Mapping * ( pMapping )-nRef ))
 {
 uno_revokeMapping( pMapping );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák]

 sc/source/filter/xml/xmlwrap.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 712b33cdbbad997db327115145110fbdee09f2f8
Author: Luboš Luňák l.lu...@suse.cz
Date:   Thu Feb 21 16:47:38 2013 +0100

pass the storage to the XML import filter

The Calc case of 73a24e709396e4dd906b8cfbd7719e51f29dd3a7 .

Change-Id: If280dab5bac7fa7719840ebba51bdca61b9d8c2d

diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 4c9e2ab..01e3a2c 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -354,6 +354,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, 
ErrCode nError)
 { MAP_LEN( ScriptConfiguration ), 0, 
::getCppuType((uno::Referencecontainer::XNameAccess *)0), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { MAP_LEN( OrganizerMode ), 0, ::getBooleanCppuType(),
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN( SourceStorage ), 0, embed::XStorage::static_type(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 
 { NULL, 0, 0, NULL, 0, 0 }
 };
@@ -420,6 +421,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, 
ErrCode nError)
 xInfoSet-setPropertyValue(sOrganizerMode, uno::makeAny(sal_True));
 }
 
+xInfoSet-setPropertyValue( SourceStorage, uno::Any( xStorage ) );
+
 sal_Bool bOasis = ( SotStorage::GetVersion( xStorage )  
SOFFICE_FILEFORMAT_60 );
 
 // #i103539#: always read meta.xml for generator
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New feature in Calc: Stepped Lines graphs

[Thorsten Behrens]

Eric Seynaeve wrote:
 Regina, I looked at the xml in Gnumeric.
 
 It indicates it as follows:
 style:style ...
   style:chart-properties chart:interpolation=gnm:step-end.../
 /style:style
 
 I guess the 'gnm:step-end' is a foreign element/attribute. Should I
 implement something similar for LO ? If yes, what to use instead of
 gnm:. If no, can you point me in the right direction.
 
Hey Eric,

first off, great stuff - looking forward to have this land! :)

To your question, step-start, step-end, step-center-x, and
step-center-y (without any prefix) are added as permissible values to
ODF1.3 (thanks to Andreas Guelzow of Gnumeric fame), so I would simply
go and use those. I would assume Gnumeric reads, or soonish will read,
those. If it is little effort, of course it would be friendly to read
those gnm: values too and map accordingly.

HTH,

-- Thorsten


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

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Andras, Joel, Thorsten, Stephan, Michael S, Markus,
  Michael M, Bjoern, Petr, Cedric, Norbert, Astron, Lionel

* Completed Action Items
+ push updated branding for 4.0.1 RC1; send TDF branded
  versions out to ESC list (Astron)
+ get LotusLive / CMIS fixes in (need review) (Michael)
+ gerrit messaging politeness improvements (Norbert)
+ 32bit and 64bit RHEL5 tinderboxen setup (Caolan)
+ create/request mail alias for certification (Bjoern)
+ poke marketing wrt. announcing dis-continuation of 3.5.x (Petr)
+ check RHEL5 dbus-glib / bluez bits for bluetooth (Caolan)

* Pending Action Items
+ tweak default assignee / mail alias to include 'un-assigned@' (Joel)
+ ping Marc wrt. creatign a page with certified consultants in
  alphabetical order with rates etc. (Joel)
+ poke docs team wrt. writing off-line help for impress-remote 
(Thorsten)
+ Bugzilla attachments not set to autodetect (Bjoern)
+ sent to Tollef - who is deadly busy just now.
**  + Update gsoc ideas page
  https://wiki.documentfoundation.org/Development/Gsoc/Ideas (all)
+ everybody should update their their tasks and add new ones
+ full-word selection / editing ergonomics cf. UX-advise
  https://bugs.freedesktop.org/show_bug.cgi?id=46517
+ pending input from Caolan / Cedric / Michael S
+ disable Rhino / Beanshell unless in experimental mode (Michael M)
+ minimal triage for good mentors for proposed easy hacks (Bjoern)
+ Ubuntu font licensing questions, clarify at Canonical (Bjoern)
+ helping out with code-pointers for UI bugs (Kendy)
+ reviewed them with Mirek in person, pointers pending
+ 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-February/001817.html
+ on-line update tweaks (Kendy)
= upgrade everything to 3.6.5
= upgrade all 3.*.0 - 4.0.0

* Release Engineering update (Petr)
+ 4.0.1 rc1 status
+ builds are available / heading to mirrors
+ lots of issues fixed.
+ deadline for rc2 is Monday ...
+ 3.6.6 rc1 commit deadline 1 month out: Monday Mar 18

* UX input (Astron)
+ new icon set discussion ongoing
+ new icon for impress remote under discussion
AI: + look at gradient / clipart issues (Michael)
+ kendy on FTO wrt. UX easy hacks.

* GSOC 2013 (Cedric)
+ April 8th deadline
+ Please update the great ideas page at that date:
+ https://wiki.documentfoundation.org/Development/Gsoc/Ideas

* Coverity reports (Markus)
+ we have a nice report to work through; register:
  http://scan.coverity.com/user_register.html
  project: LibreOffice
+ and send your account details to Markus / Norbert.
+ already fixed a lot of issues, but plenty more to go
+ Markus up-loads builds regularly
+ false positives can be flagged, please update the
  tool with issue status (Norbert)

* Automated crash on import test results (Markus)
+ found a nasty toolchain bug on SLES11 (thanks Stephan)
+ issues with libunordflo loading in dbgutil builds
AI: + look into it before publishing updated stats (Michael S)
+ 1 day for writer files, 16 hours for calc files,
  adding impress files:  2.5 days
+ WIP to integrate this with Jenkins  graphing (Norbert)

* Proposal to rework packaging, now that gbuild is ~done (Bjoern)
+ push to the list for discussion
+ kills solver (and links directly in WORKDIR)
+ kills solenv/bin/modules, and much of scp2
+ concerns about platform-dependent / windows MSI hierarchies  
extensions
  proposal/WiP:
 https://gerrit.libreoffice.org/#/c/2298/
+ Tor is doing a complementary re-work for Mac pkg structure

* progress on ns Date / timestamp issue (Lionel)
AI: + continue discussion  come to a conclusion (Stephan/Lionel/Thorsten)

* Certification Program (Stephan/Kendy/Bjoern)
+ purpose of it ? (Joel)
+ encourage users to pay for support from certified (active,
  contributing) developers  companies.
+ next step - send lots of beautiful invitation letters.

* Hard Hacks:
+ http://wiki.documentfoundation.org/HardHacks
  fdo#37580 - Assign layout malfunction and crash on slide with formula
  fdo#59259 - With some master pages, freezes when try to print
  fdo#59932 - FILEOPEN: Text boxes with bulleted lists containing 
wrapped text ...
  fdo#48039 - Cross-references disrupted in Master Document
  fdo#40594 - FILEOPEN .docx (MSO2010) does not show CHART object

* QA update (Joel)
+ list of unconfirmed 4.0 bugs is going up - currently 150

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

[Stephan Bergmann]

 stoc/source/invocation_adapterfactory/iafactory.cxx |4 ++--
 stoc/source/security/access_controller.cxx  |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ed316fc677eded381bb7d90783f54834eb6df078
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 21 17:01:38 2013 +0100

osl_atomic_increment/decrement are macros

Change-Id: I3a294c5c800597f3b17395e1e02944f5279e3753

diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx 
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 5e49a5e..b0380c3 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -191,7 +191,7 @@ inline AdapterImpl::~AdapterImpl()
 inline void AdapterImpl::acquire()
 SAL_THROW(())
 {
-::osl_atomic_increment( m_nRef );
+osl_atomic_increment( m_nRef );
 }
 
//__
 inline void AdapterImpl::release()
@@ -200,7 +200,7 @@ inline void AdapterImpl::release()
 bool delete_this = false;
 {
 MutexGuard guard( m_pFactory-m_mutex );
-if (! ::osl_atomic_decrement( m_nRef ))
+if (! osl_atomic_decrement( m_nRef ))
 {
 t_ptr_map::iterator iFind(
 m_pFactory-m_receiver2adapters.find( m_key ) );
diff --git a/stoc/source/security/access_controller.cxx 
b/stoc/source/security/access_controller.cxx
index 987d6ec..c774793 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -300,13 +300,13 @@ acc_CurrentContext::~acc_CurrentContext()
 void acc_CurrentContext::acquire()
 throw ()
 {
-::osl_atomic_increment( m_refcount );
+osl_atomic_increment( m_refcount );
 }
 
//__
 void acc_CurrentContext::release()
 throw ()
 {
-if (! ::osl_atomic_decrement( m_refcount ))
+if (! osl_atomic_decrement( m_refcount ))
 {
 delete this;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New feature in Calc: Stepped Lines graphs

[Thorsten Behrens]

Regina Henschel wrote:
 I'm not sure whether the way Gnumeric does it, is grammatically
 correct. Perhaps it is necessary to make an own attribute
 LOchart:interpolation, which then allows more values. Thorsten
 might know it, and you should ask him.

Prefixes in attribute values are meaningless on an xml level
(http://www.rpbourret.com/xml/NamespacesFAQ.htm#names_5), though of
course it serves a documentation purpose. For sheer schema validity,
one would indeed have to add a new, foreign-namespace attribute with
whatever values one needs. But that appears really excessive, and is
more due to inflexibility/lack of expressiveness on the rng level
rather than anything else.

At any rate, the point is moot, since the additional values got
accepted into ODF1.3 already, so I would not have any problem calling
such a document valid ODF1.2 extended. ;)

Cheers,

-- Thorsten


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

[PATCH] translation of german message in dtrans/source/cnttype/wbench/testcnttype.cxx

[Urs Fässler]

Hello,
patch with a translation of the German messages in the test program
dtrans/source/cnttype/wbench/testcnttype.cxx.

Regards
Urs

From 70527240a96872b0035b62e8dca77f9f05666b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Thu, 21 Feb 2013 16:43:22 +0100
Subject: [PATCH] Translation of messages in test program

Change-Id: I8588f5bad12561b891956cde44daeb4c81f815c3
---
 dtrans/source/cnttype/wbench/testcnttype.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index 61a91e6..e7fe844 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -116,7 +116,7 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector string  v
 {
 try
 {
-fprintf( fstream, Gelesen: %s\n, iter-c_str( ) );
+fprintf( fstream, Read: %s\n, iter-c_str( ) );
 
 Reference XMimeContentType  xMCntTyp = cnttypeFactory-createMimeContentType( OUString::createFromAscii( iter-c_str( ) ) );
 
@@ -134,15 +134,15 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector string  v
 }
 catch( IllegalArgumentException ex )
 {
-fwprintf( fstream, OUString(Fehlerhafter Content-Type gelesen!!!\n\n) );
+fwprintf( fstream, OUString(Read incorrect content type!\n\n) );
 }
 catch( NoSuchElementException )
 {
-fwprintf( fstream, OUString(Parameterwert nicht vorhanden\n) );
+fwprintf( fstream, OUString(Value of parameter not available\n) );
 }
 catch( ... )
 {
-fwprintf( fstream, OUString(Unbekannter Fehler!!!\n\n) );
+fwprintf( fstream, OUString(Unknown error!\n\n) );
 }
 
 fwprintf( fstream, OUString(\n#\n\n) );
-- 
1.7.10.4

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

[PATCH] Database: Add Limit in Query Desing View

[via Code Review]

Hello LibreOffice gerrit bot, Eike Rathke,

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

https://gerrit.libreoffice.org/1994

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

Change subject: Database: Add Limit in Query Desing View
..

Database: Add Limit in Query Desing View

Levels of implementation
 - Add a new toolbar item to ui (designobjectbar.xml)
 - Make a control for this element( LimitBox: derived from NumericBox)
 - Make an own controller for this control (LimitBoxController) and
   register it
 - Add new feature to the general\central controller (OQueryController)
   and construct a communication channel between the two controller
 - Modify the view switching (SQL-Design) methods to use\set limit
   value (QueryDesignView.cxx)

Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690
---
M dbaccess/Library_dbu.mk
M dbaccess/inc/dbaccess_slotid.hrc
M dbaccess/source/ui/inc/dbu_qry.hrc
M dbaccess/source/ui/inc/querycontroller.hxx
M dbaccess/source/ui/misc/uiservices.cxx
M dbaccess/source/ui/querydesign/QueryDesignView.cxx
A dbaccess/source/ui/querydesign/limitboxcontroller.cxx
A dbaccess/source/ui/querydesign/limitboxcontroller.hxx
M dbaccess/source/ui/querydesign/query.src
M dbaccess/source/ui/querydesign/querycontroller.cxx
M dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
M dbaccess/util/dbu.component
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
14 files changed, 488 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/1994/4
-- 
To view, visit https://gerrit.libreoffice.org/1994
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Zolnai Tamás zolnaitamas2...@gmail.com

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Fridrich Strba fridrich.st...@bluewin.ch changed:

   What|Removed |Added

Summary|LibreOffice 3.7/4.0 most|LibreOffice 4.0 most
   |annoying bugs   |annoying bugs

-- 
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: New feature in Calc: Stepped Lines graphs

[Thorsten Behrens]

I wrote:
 To your question, step-start, step-end, step-center-x, and
 step-center-y (without any prefix) are added as permissible values to
 ODF1.3 (thanks to Andreas Guelzow of Gnumeric fame), so I would simply
 go and use those. I would assume Gnumeric reads, or soonish will read,
 those. If it is little effort, of course it would be friendly to read
 those gnm: values too and map accordingly.
 
This is more a note to self than to you, Eric - once this is in, we
should document it on
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes

Also, it would be good to conditionalize exporting the new attribute
value along these lines:
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#ODF_version_choice_-_Code
 

Cheers,

-- Thorsten


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

Re: New feature in Calc: Stepped Lines graphs

[Regina Henschel]

Hi Thorsten,

Thorsten Behrens schrieb:
[..]


At any rate, the point is moot, since the additional values got
accepted into ODF1.3 already,[..]


Where do I find that information?

Kind regards
Regina

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

[PATCH] Translation of German (test) string

[Urs Fässler]

Hello,
I translated a German string in
dtrans/source/win32/workbench/test_wincb.cxx. I hope it does not break
any test or so, but I did not found the string Fahrrad any other file.

Regards
Urs

From 76582d1a21b226a00584c553fe324dc90c19bf9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Thu, 21 Feb 2013 17:32:40 +0100
Subject: [PATCH] Translation of German (test) string

Change-Id: Ibcc4fc86497a186eec7e508d58c36dde4a3d3129
---
 dtrans/source/win32/workbench/test_wincb.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 9839af5..b32a56f 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -147,7 +147,7 @@ private:
 
 CTransferable::CTransferable( ) :
 m_FlavorList( 1 ),
-m_Data( OUString(Ich habe mir ein neues Fahrrad gekauft!) )
+m_Data( OUString(I bought a new bike!) )
 {
 DataFlavor df;
 
-- 
1.7.10.4

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

[Libreoffice-commits] core.git: 3 commits - extras/source svx/AllLangResTarget_svx.mk svx/inc svx/source svx/uiconfig svx/UI_svx.mk sw/source

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml  |3 
 svx/AllLangResTarget_svx.mk  |1 
 svx/UI_svx.mk|1 
 svx/inc/helpid.hrc   |9 -
 svx/inc/svx/ctredlin.hxx |   30 +---
 svx/inc/svx/svxids.hrc   |1 
 svx/source/dialog/ctredlin.cxx   |  169 --
 svx/source/dialog/ctredlin.hrc   |   22 --
 svx/source/dialog/ctredlin.src   |   99 -
 svx/uiconfig/ui/redlinecontrol.ui|  173 ---
 svx/uiconfig/ui/redlineviewpage.ui   |  202 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   12 -
 12 files changed, 283 insertions(+), 439 deletions(-)

New commits:
commit 38302b308559b8e34916a07ea3a160085c596c2e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 21 15:54:57 2013 +

split up redline dialog and adapt redline view code

Change-Id: Ib185eacbd0b4123ec947d116076358794bf42d46

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index c4f66e6..4e139e1 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
 svx/source/core/graphichelper.src \
 svx/source/dialog/bmpmask.src \
 svx/source/dialog/contdlg.src \
-svx/source/dialog/ctredlin.src \
 svx/source/dialog/dlgctrl.src \
 svx/source/dialog/docrecovery.src \
 svx/source/dialog/fontwork.src \
diff --git a/svx/UI_svx.mk b/svx/UI_svx.mk
index df3d0b4..38945e8 100644
--- a/svx/UI_svx.mk
+++ b/svx/UI_svx.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UI_add_uifiles,svx,\
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
svx/uiconfig/ui/redlinefilterpage \
+   svx/uiconfig/ui/redlineviewpage \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index afd9484..dab6dc8 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -154,15 +154,6 @@
 #define HID_POPUP_LINEEND 
SVX_HID_POPUP_LINEEND
 #define HID_POPUP_LINEEND_CTRL
SVX_HID_POPUP_LINEEND_CTRL
 #define HID_REDLINING_TABCONTROL  
SVX_HID_REDLINING_TABCONTROL
-#define HID_REDLINING_VIEW_DG_VIEW
SVX_HID_REDLINING_VIEW_DG_VIEW
-#define HID_REDLINING_VIEW_DG_VIEW_HEADER 
SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER
-#define HID_REDLINING_VIEW_DG_VIEW_TABLE  
SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE
-#define HID_REDLINING_VIEW_PAGE   
SVX_HID_REDLINING_VIEW_PAGE
-#define HID_REDLINING_VIEW_PB_ACCEPT  
SVX_HID_REDLINING_VIEW_PB_ACCEPT
-#define HID_REDLINING_VIEW_PB_ACCEPTALL   
SVX_HID_REDLINING_VIEW_PB_ACCEPTALL
-#define HID_REDLINING_VIEW_PB_REJECT  
SVX_HID_REDLINING_VIEW_PB_REJECT
-#define HID_REDLINING_VIEW_PB_REJECTALL   
SVX_HID_REDLINING_VIEW_PB_REJECTALL
-#define HID_REDLINING_VIEW_PB_UNDO
SVX_HID_REDLINING_VIEW_PB_UNDO
 #define HID_STYLE_LISTBOX 
SVX_HID_STYLE_LISTBOX
 #define HID_SVXTBX_UNDO_REDO_CTRL 
SVX_HID_SVXTBX_UNDO_REDO_CTRL
 #define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE 
SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 2ce91fc..d6d5f7b 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -304,30 +304,18 @@ private:
 LinkRejectAllClickLk;
 LinkUndoClickLk;
 
-SvxSimpleTableContainer m_aViewDataContainer;
-SvxRedlinTable  aViewData;
-PushButton  PbAccept;
-PushButton  PbReject;
-PushButton  PbAcceptAll;
-PushButton  PbRejectAll;
-PushButton  PbUndo;
-String  aTitle1;
-String  aTitle2;
-String  aTitle3;
-String  aTitle4;
-String  aTitle5;
-longnDistance;
-SizeaMinSize;
+SvxRedlinTable* m_pViewData;
+PushButton* m_pAccept;
+PushButton* m_pReject;
+PushButton* m_pAcceptAll;
+PushButton* m_pRejectAll;
+PushButton* m_pUndo;
 
 DECL_LINK( PbClickHdl, PushButton* );
 
-
-protected:
-
-voidResize();
-
 public:
-SvxTPView( Window * pParent);
+SvxTPView(Window * pParent);
+~SvxTPView();
 
 voidInsertWriterHeader();
 voidInsertCalcHeader();
@@ -349,8 +337,6 @@ public:
 voidHideUndo()  {ShowUndo(sal_False);}
 sal_BoolIsUndoVisible();
 
-SizeGetMinSizePixel();
-
 voidSetAcceptClickHdl( const Link rLink ) { 

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

[Cédric Bosdonnat]

 oox/inc/oox/vml/vmltextbox.hxx   |1 +
 oox/source/vml/vmltextbox.cxx|8 
 oox/source/vml/vmltextboxcontext.cxx |   11 +++
 3 files changed, 20 insertions(+)

New commits:
commit 3d46b39491af97ba360fb92182501e6b399f4f56
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Feb 21 17:34:16 2013 +0100

n#779642: Import vertical layout mode from VML elements.

diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 1dc30ab..f234b00 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -86,6 +86,7 @@ public:
 /// Text distance from the border (inset attribute of v:textbox), valid 
only if set.
 bool borderDistanceSet;
 int borderDistanceLeft, borderDistanceTop, borderDistanceRight, 
borderDistanceBottom;
+OUString maLayoutFlow;
 
 private:
 typedef ::std::vector TextPortionModel  PortionVector;
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index f3c4102..65b8f34 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -21,7 +21,9 @@
 
 #include rtl/ustrbuf.hxx
 #include com/sun/star/awt/FontWeight.hpp
+#include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/text/XTextAppend.hpp
+#include com/sun/star/text/WritingMode.hpp
 
 namespace oox {
 namespace vml {
@@ -88,6 +90,12 @@ void TextBox::convert(uno::Referencedrawing::XShape 
xShape) const
 *pValues++ = *i;
 xTextAppend-appendTextPortion(aIt-maText, aPropSeq);
 }
+
+if ( maLayoutFlow == vertical )
+{
+uno::Referencebeans::XPropertySet xProperties(xShape, 
uno::UNO_QUERY);
+xProperties-setPropertyValue( TextWritingMode, uno::makeAny( 
text::WritingMode_TB_RL ) );
+}
 }
 
 } // namespace vml
diff --git a/oox/source/vml/vmltextboxcontext.cxx 
b/oox/source/vml/vmltextboxcontext.cxx
index 9d1c4ee..ca124bc 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -178,6 +178,17 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper 
rParent, TextBox rTextBo
 value.isEmpty() ? 0.05in : value, 0, false, false );
 rTextBox.borderDistanceSet = true;
 }
+
+OUString sStyle = rAttribs.getString( XML_style, OUString() );
+sal_Int32 nIndex = 0;
+while( nIndex = 0 )
+{
+OUString aName, aValue;
+if( ConversionHelper::separatePair( aName, aValue, sStyle.getToken( 0, 
';', nIndex ), ':' ) )
+{
+if( aName == layout-flow )  rTextBox.maLayoutFlow = aValue;
+}
+}
 }
 
 ContextHandlerRef TextBoxContext::onCreateContext( sal_Int32 nElement, const 
AttributeList rAttribs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

[Michael Meeks]

Hi Lubos,

On Mon, 2013-02-18 at 15:01 +0100, Lubos Lunak wrote:
  Heh; so do not merge is the equivalent of do not submit but much
  clearer and friendlier, fits inside the text limit.
 
  Huh? Friendlier? Clearer??? It says pretty much the same.

It's hard for me to unwind the overlapping meanings here; do you mean:
it was not worth changing it ? (to which I disagree), or that it is not
sufficiently friendier ? (which could of course be improved), or ?

  All I'm saying is that 'do not merge' is vague enough to not say what it in 
 fact does or where the line between -1 and -2 is, and 'I disagree with the 
 change, needs discussion first' or similar is clearer there and still 
 reasonably short.

So can you propose a better string ? how about this one:

block merging for now

Which is brief, open-ended, uses merge not submit and describes the
function of -2 perhaps better to both reviewer and reviewee.

Or is there a better suggestion ?

ATB,

Michael.

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

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/inc oox/source

[Cédric Bosdonnat]

 oox/inc/oox/vml/vmltextbox.hxx   |1 +
 oox/source/vml/vmltextbox.cxx|8 
 oox/source/vml/vmltextboxcontext.cxx |   11 +++
 3 files changed, 20 insertions(+)

New commits:
commit 94108f529a11062eb2749b5141752c884d106464
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Feb 21 17:34:16 2013 +0100

n#779642: Import vertical layout mode from VML elements.
(cherry picked from commit 3d46b39491af97ba360fb92182501e6b399f4f56)

diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 93b06b5..427bb79 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -95,6 +95,7 @@ public:
 /// Text distance from the border (inset attribute of v:textbox), valid 
only if set.
 bool borderDistanceSet;
 int borderDistanceLeft, borderDistanceTop, borderDistanceRight, 
borderDistanceBottom;
+OUString maLayoutFlow;
 
 private:
 typedef ::std::vector TextPortionModel  PortionVector;
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 965cdfc..f2baebd 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -30,7 +30,9 @@
 
 #include rtl/ustrbuf.hxx
 #include com/sun/star/awt/FontWeight.hpp
+#include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/text/XTextAppend.hpp
+#include com/sun/star/text/WritingMode.hpp
 
 namespace oox {
 namespace vml {
@@ -105,6 +107,12 @@ void TextBox::convert(uno::Referencedrawing::XShape 
xShape) const
 *pValues++ = *i;
 xTextAppend-appendTextPortion(aIt-maText, aPropSeq);
 }
+
+if ( maLayoutFlow == vertical )
+{
+uno::Referencebeans::XPropertySet xProperties(xShape, 
uno::UNO_QUERY);
+xProperties-setPropertyValue( TextWritingMode, uno::makeAny( 
text::WritingMode_TB_RL ) );
+}
 }
 
 } // namespace vml
diff --git a/oox/source/vml/vmltextboxcontext.cxx 
b/oox/source/vml/vmltextboxcontext.cxx
index a808f43..108b9f9 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -188,6 +188,17 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper 
rParent, TextBox rTextBo
 value.isEmpty() ? 0.05in : value, 0, false, false );
 rTextBox.borderDistanceSet = true;
 }
+
+OUString sStyle = rAttribs.getString( XML_style, OUString() );
+sal_Int32 nIndex = 0;
+while( nIndex = 0 )
+{
+OUString aName, aValue;
+if( ConversionHelper::separatePair( aName, aValue, sStyle.getToken( 0, 
';', nIndex ), ':' ) )
+{
+if( aName == layout-flow )  rTextBox.maLayoutFlow = aValue;
+}
+}
 }
 
 ContextHandlerRef TextBoxContext::onCreateContext( sal_Int32 nElement, const 
AttributeList rAttribs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New feature in Calc: Stepped Lines graphs

[Michael Stahl]

On 21/02/13 15:43, Regina Henschel wrote:
 Michael Stahl schrieb:
 On 20/02/13 22:11, Eric Seynaeve wrote:

 style:style ...
 style:chart-properties chart:interpolation=gnm:step-end.../
 /style:style

 I guess the 'gnm:step-end' is a foreign element/attribute. Should I
 implement something similar for LO ? If yes, what to use instead of
 gnm:. If no, can you point me in the right direction.

 if what you implement has the same semantics as what Gnumeric does (and
 i think that's your goal) then it does make sense to use the same
 foreign elements.

 you'd need to add a namespace declaration for the gnm prefix; look at
 the xmlns:gnm=... attribute that must be somewhere in the file (likely
 on the root element).  you can add namespaces in
 xmloff/inc/xmloff/xmlnmspe.hxx and SchXMLExport::SchXMLExport() in
 xmloff/source/chart/SchXMLExport.cxx.
 
 
 I'm not sure whether the namespace it necessary for an attribute 
 _value_. Currently the attribute chart:interpolation allows only the 
 values none, cubic-spline and b-spline. Gnumeric does not introduce a 
 new attribute or element, but a new value for the attribute.

oops, i should have read more carefully - i completely missed that it's
a value that is prefixed :)

of course since Thorsten says it's already in ODF 1.3 it's best to just
use the values specified in that draft.


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

Re: [Libreoffice-qa] minutes of ESC call ...

[Lubos Lunak]

On Thursday 21 of February 2013, Michael Meeks wrote:
 Hi Lubos,

 On Mon, 2013-02-18 at 15:01 +0100, Lubos Lunak wrote:
 Heh; so do not merge is the equivalent of do not submit but much
   clearer and friendlier, fits inside the text limit.
 
   Huh? Friendlier? Clearer??? It says pretty much the same.

   It's hard for me to unwind the overlapping meanings here; do you mean:
 it was not worth changing it ? (to which I disagree), or that it is not
 sufficiently friendier ? (which could of course be improved), or ?

 I was refering to the one sentence quoted above, claiming that in do not 
merge and do not submit one is clearer, friendlier, or even different at 
all (given that gerrit seems to use submit for what I would call merge).

   All I'm saying is that 'do not merge' is vague enough to not say what it
  in fact does or where the line between -1 and -2 is, and 'I disagree with
  the change, needs discussion first' or similar is clearer there and still
  reasonably short.

   So can you propose a better string ? how about this one:

   block merging for now

   Which is brief, open-ended, uses merge not submit and describes the
 function of -2 perhaps better to both reviewer and reviewee.

 This is again vague enough to apply to -1 as well (-1 is also block merging 
for now). I did propose already one string I think is better, but if you 
want to put it this way, then it should be e.g. block merging until 
objections are cleared or so.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Meeks]

 tools/source/memtools/multisel.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 93363ff6ba8198e83417eb805b9342e8711b8c09
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Feb 21 17:20:00 2013 +

fix snafu that crept in with 5da5cd60acb7a18878300da7f4b0acb0dbad1888

Change-Id: I391a415e0f4bf3813637191ef04c0b5f72a2c470

diff --git a/tools/source/memtools/multisel.cxx 
b/tools/source/memtools/multisel.cxx
index 429c608..b079e17 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -597,9 +597,8 @@ void MultiSelection::SetTotalRange( const Range rTotRange )
 
 // re-calculate selection count
 nSelCount = 0;
-for ( size_t i = 0, n = aSels.size(); i  n; ++ i ) {
-nSelCount += pRange-Len();
-}
+for ( size_t i = 0, n = aSels.size(); i  n; ++ i )
+nSelCount += aSels[i]-Len();
 
 bCurValid = sal_False;
 nCurIndex = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source reportdesign/source sc/source sw/inc sw/source vcl/generic vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source writerfilter/inc writerf

[Luboš Luňák]

 dbaccess/source/filter/xml/xmlExport.cxx  |3 
 reportdesign/source/filter/xml/xmlExport.cxx  |3 
 sc/source/filter/xml/xmlfonte.cxx |6 -
 sw/inc/pch/precompiled_msword.hxx |2 
 sw/source/filter/ww8/docxattributeoutput.cxx  |   21 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx  |5 -
 sw/source/filter/ww8/wrtw8sty.cxx |2 
 sw/source/filter/xml/xmlfonte.cxx |4 
 vcl/Library_vcl.mk|2 
 vcl/Package_inc.mk|2 
 vcl/generic/fontmanager/fontmanager.cxx   |2 
 vcl/inc/vcl/embeddedfontshelper.hxx   |   58 
 vcl/inc/vcl/temporaryfonts.hxx|   54 ---
 vcl/source/app/svmain.cxx |6 -
 vcl/source/gdi/embeddedfontshelper.cxx|  104 ++
 vcl/source/gdi/temporaryfonts.cxx |   56 ---
 writerfilter/inc/pch/precompiled_writerfilter.hxx |2 
 writerfilter/source/dmapper/FontTable.cxx |6 -
 xmloff/inc/pch/precompiled_xo.hxx |2 
 xmloff/inc/xmloff/XMLFontAutoStylePool.hxx|9 +
 xmloff/source/style/XMLFontAutoStylePool.cxx  |   45 +
 xmloff/source/style/XMLFontStylesContext.cxx  |8 -
 xmloff/source/style/xmlnume.cxx   |8 -
 xmloff/source/text/txtexppr.cxx   |   11 --
 24 files changed, 240 insertions(+), 181 deletions(-)

New commits:
commit 596bd0f61f8cfc957410148ae221c62331067bdd
Author: Luboš Luňák l.lu...@suse.cz
Date:   Thu Feb 21 13:43:44 2013 +0100

embed also system fonts when embedding fonts in a document

Without this, only fonts that had come embedded with the document
were embedded when saving, which meant that it was impossible
to create new documents that would have any fonts embedded.

Change-Id: I3b4e87b1b3ca5ae1ccfe29d9b571b0262c568dcf

diff --git a/sw/inc/pch/precompiled_msword.hxx 
b/sw/inc/pch/precompiled_msword.hxx
index acacb8b..e05919f 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -252,7 +252,7 @@
 #include vcl/outdev.hxx
 #include vcl/salbtype.hxx
 #include vcl/svapp.hxx
-#include vcl/temporaryfonts.hxx
+#include vcl/embeddedfontshelper.hxx
 #include vcl/vclenum.hxx
 #include vcl/virdev.hxx
 #include vcl/wmf.hxx
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8a6e8bb..b7e211f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -98,7 +98,7 @@
 #include txtinet.hxx
 
 #include osl/file.hxx
-#include vcl/temporaryfonts.hxx
+#include vcl/embeddedfontshelper.hxx
 
 #include com/sun/star/i18n/ScriptType.hpp
 #include com/sun/star/chart2/XChartDocument.hpp
@@ -3055,14 +3055,14 @@ void DocxAttributeOutput::FontPitchType( FontPitch 
ePitch ) const
 FSEND );
 }
 
-void DocxAttributeOutput::EmbedFont( const OUString name )
+void DocxAttributeOutput::EmbedFont( const OUString name, FontFamily family, 
FontPitch pitch, rtl_TextEncoding encoding )
 {
 if( !m_rExport.pDoc-get( IDocumentSettingAccess::EMBED_FONTS ))
 return; // no font embedding with this document
-EmbedFontStyle( name, XML_embedRegular,  );
-EmbedFontStyle( name, XML_embedBold, b );
-EmbedFontStyle( name, XML_embedItalic, i );
-EmbedFontStyle( name, XML_embedBoldItalic, bi );
+EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE, 
WEIGHT_NORMAL, pitch, encoding );
+EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD, 
pitch, encoding );
+EmbedFontStyle( name, XML_embedItalic, family, ITALIC_NORMAL, 
WEIGHT_NORMAL, pitch, encoding );
+EmbedFontStyle( name, XML_embedBoldItalic, family, ITALIC_NORMAL, 
WEIGHT_BOLD, pitch, encoding );
 }
 
 static inline char toHexChar( int value )
@@ -3070,11 +3070,12 @@ static inline char toHexChar( int value )
 return value = 10 ? value + 'A' - 10 : value + '0';
 }
 
-void DocxAttributeOutput::EmbedFontStyle( const OUString name, int tag, const 
char* style )
+void DocxAttributeOutput::EmbedFontStyle( const OUString name, int tag, 
FontFamily family, FontItalic italic,
+FontWeight weight, FontPitch pitch, rtl_TextEncoding encoding )
 {
-OUString fontUrl = TemporaryFonts::fileUrlForFont( name, style );
-// If a temporary font file exists for this font, assume it was embedded
-// and embed it again.
+OUString fontUrl = EmbeddedFontsHelper::fontFileUrl( name, family, italic, 
weight, pitch, encoding );
+if( fontUrl.isEmpty())
+return;
 // TODO IDocumentSettingAccess::EMBED_SYSTEM_FONTS
 osl::File file( fontUrl );
 if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 

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

[Michael Meeks]

 tools/source/memtools/multisel.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a4f226088faa5b8d9a688a765af0bb832843068b
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Feb 21 17:20:00 2013 +

fix snafu that crept in with 5da5cd60acb7a18878300da7f4b0acb0dbad1888

Change-Id: I391a415e0f4bf3813637191ef04c0b5f72a2c470

diff --git a/tools/source/memtools/multisel.cxx 
b/tools/source/memtools/multisel.cxx
index 429c608..b079e17 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -597,9 +597,8 @@ void MultiSelection::SetTotalRange( const Range rTotRange )
 
 // re-calculate selection count
 nSelCount = 0;
-for ( size_t i = 0, n = aSels.size(); i  n; ++ i ) {
-nSelCount += pRange-Len();
-}
+for ( size_t i = 0, n = aSels.size(); i  n; ++ i )
+nSelCount += aSels[i]-Len();
 
 bCurValid = sal_False;
 nCurIndex = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/AllLangResTarget_svx.mk svx/source

[Tomaž Vajngerl]

 svx/AllLangResTarget_svx.mk |1 
 svx/source/dialog/compressgraphicdialog.cxx |   47 +---
 svx/source/dialog/compressgraphicdialog.hrc |   21 
 svx/source/dialog/compressgraphicdialog.src |   34 
 4 files changed, 79 insertions(+), 24 deletions(-)

New commits:
commit 4e7949974f44e9b1c7b6bae5e8f78234ff860e45
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Thu Feb 21 18:39:22 2013 +0100

fdo#59793 Make compress graphic dialog strings translatable.

Change-Id: I8b42a6c047f95aa567f520db81699c83a115a6c7

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 4e139e1..18a7bbc 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
 svx/source/core/graphichelper.src \
 svx/source/dialog/bmpmask.src \
 svx/source/dialog/contdlg.src \
+svx/source/dialog/compressgraphicdialog.src \
 svx/source/dialog/dlgctrl.src \
 svx/source/dialog/docrecovery.src \
 svx/source/dialog/fontwork.src \
diff --git a/svx/source/dialog/compressgraphicdialog.cxx 
b/svx/source/dialog/compressgraphicdialog.cxx
index ff33a9d..4f86229 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -31,6 +31,8 @@
 #include com/sun/star/uno/Sequence.hxx
 #include com/sun/star/beans/XPropertySet.hpp
 
+#include compressgraphicdialog.hrc
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
@@ -104,27 +106,24 @@ void CompressGraphicsDialog::Update()
 Size aPixelSize = m_aGraphic.GetSizePixel();
 Size aOriginalSize100mm( pDummyVDev-PixelToLogic( 
m_aGraphic.GetSizePixel(), MAP_100TH_MM ) );
 
-String aBitmapSizeString;
-aBitmapSizeString += GetUnitString( aOriginalSize100mm.Width(), 
eFieldUnit, cSeparator );
-aBitmapSizeString += String(  x  ) ;
-aBitmapSizeString += GetUnitString( aOriginalSize100mm.Height(), 
eFieldUnit, cSeparator );
-aBitmapSizeString += String(  (  ) ;
-aBitmapSizeString += OUString::valueOf(aPixelSize.Width());
-aBitmapSizeString += String(  x  ) ;
-aBitmapSizeString += OUString::valueOf(aPixelSize.Height());
-aBitmapSizeString += String(  px ) ) ;
+String aBitmapSizeString = String(SVX_RES(STR_IMAGE_ORIGINAL_SIZE));
+OUString aWidthString  = GetUnitString( aOriginalSize100mm.Width(),  
eFieldUnit, cSeparator );
+OUString aHeightString = GetUnitString( aOriginalSize100mm.Height(), 
eFieldUnit, cSeparator );
+aBitmapSizeString.SearchAndReplaceAllAscii( $(WIDTH),  aWidthString );
+aBitmapSizeString.SearchAndReplaceAllAscii( $(HEIGHT), aHeightString );
+aBitmapSizeString.SearchAndReplaceAllAscii( $(WIDTH_IN_PX),  
OUString::valueOf(aPixelSize.Width()) );
+aBitmapSizeString.SearchAndReplaceAllAscii( $(HEIGHT_IN_PX), 
OUString::valueOf(aPixelSize.Height()) );
 m_pFixedText2-SetText(aBitmapSizeString);
 
-String aViewSizeString;
-
 int aValX = (int) (aPixelSize.Width() / GetViewWidthInch());
 
-aViewSizeString += GetUnitString( m_aViewSize100mm.Width(), eFieldUnit, 
cSeparator );
-aViewSizeString += String(  x  ) ;
-aViewSizeString += GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, 
cSeparator );
-aViewSizeString += (  at  ) ;
-aViewSizeString += OUString::number( aValX);
-aViewSizeString += (  DPI ) ;
+String aViewSizeString = String(SVX_RES(STR_IMAGE_VIEW_SIZE));
+
+aWidthString  = GetUnitString( m_aViewSize100mm.Width(),  eFieldUnit, 
cSeparator );
+aHeightString = GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, 
cSeparator );
+aViewSizeString.SearchAndReplaceAllAscii( $(WIDTH),  aWidthString );
+aViewSizeString.SearchAndReplaceAllAscii( $(HEIGHT), aHeightString );
+aViewSizeString.SearchAndReplaceAllAscii( $(DPI), OUString::number( 
aValX) );
 m_pFixedText3-SetText(aViewSizeString);
 
 SvMemoryStream aMemStream;
@@ -133,11 +132,10 @@ void CompressGraphicsDialog::Update()
 aMemStream.Seek( STREAM_SEEK_TO_END );
 sal_Int32 aNativeSize = aMemStream.Tell();
 
-String aNativeSizeString;
-aNativeSizeString += OUString::valueOf(aNativeSize / 1024);
-aNativeSizeString += String(  kiB ) ;
-
+String aNativeSizeString = String(SVX_RES(STR_IMAGE_CAPACITY));
+aNativeSizeString.SearchAndReplaceAllAscii( $(CAPACITY),  
OUString::valueOf(aNativeSize / 1024) );
 m_pFixedText5-SetText(aNativeSizeString);
+
 m_pFixedText6-SetText(String(??));
 }
 
@@ -279,9 +277,10 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl 
)
 
 if ( aSize  0 )
 {
-String aNewSizeString;
-aNewSizeString += OUString::valueOf(aSize / 1024);
-aNewSizeString += String(  kiB ) ;
+OUString aSizeAsString = OUString::valueOf(aSize / 1024);
+
+String aNewSizeString = String(SVX_RES(STR_IMAGE_CAPACITY));
+

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

[Michael Meeks]

 sc/source/ui/docshell/docsh.cxx |   21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 6b300173343e74531c516e24cd931e35d747b84d
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Feb 21 17:53:07 2013 +

parse html filter options more legibly.

Change-Id: I951d26df9c99f47b3e1415b96efaa050adf82892

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 08cfe00..917c88b 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -122,8 +122,6 @@ using namespace com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::lang::XMultiServiceFactory;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::boost::shared_ptr;
 using ::std::vector;
 
@@ -947,30 +945,31 @@ sal_Bool ScDocShell::LoadFrom( SfxMedium rMedium )
 static void lcl_parseHtmlFilterOption(const OUString rOption, LanguageType 
rLang, bool rDateConvert)
 {
 OUStringBuffer aBuf;
-OUString aTokens[2];
+std::vector OUString  aTokens;
 sal_Int32 n = rOption.getLength();
 const sal_Unicode* p = rOption.getStr();
-sal_Int32 nTokenId = 0;
 for (sal_Int32 i = 0; i  n; ++i)
 {
 const sal_Unicode c = p[i];
 if (c == sal_Unicode(' '))
 {
 if (aBuf.getLength())
-aTokens[nTokenId++] = aBuf.makeStringAndClear();
+aTokens.push_back( aBuf.makeStringAndClear() );
 }
 else
 aBuf.append(c);
-
-if (nTokenId = 2)
-break;
 }
 
 if (aBuf.getLength())
-aTokens[nTokenId] = aBuf.makeStringAndClear();
+aTokens.push_back( aBuf.makeStringAndClear() );
+
+rLang = LanguageType( 0 );
+rDateConvert = false;
 
-rLang = static_castLanguageType(aTokens[0].toInt32());
-rDateConvert = static_castbool(aTokens[1].toInt32());
+if (aTokens.size()  0)
+rLang = static_castLanguageType(aTokens[0].toInt32());
+if (aTokens.size()  1)
+rDateConvert = static_castbool(aTokens[1].toInt32());
 }
 
 sal_Bool ScDocShell::ConvertFrom( SfxMedium rMedium )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

help on macro (writing a testcase)

[Maxime de Roucy]

Hello

I am trying to write a test case for a my patch :
https://gerrit.libreoffice.org/#/c/2243/

Basically I have to test if the only picture of the document is in the
first or the second cell of the only table of the document (Writer).

As explained in this page : 
http://opengrok.libreoffice.org/xref/core/sw/qa/extras/
Before going to the C++ I am trying to write a macro doing my test.

I don't know much about macro. I use XrayTool but I can't figured out
how to do my test.
I tried to list the element of the cells but didn't find the picture in
it…

oTable = oDoc.getTextTables().getByIndex(0)
oCell = oTable.getCellByName(B1)
xray oCell
oElementEnum = oCell.createEnumeration()
xray oElementEnum.nextElement()
While oElementEnum.hasMoreElements()
  xray oElementEnum.nextElement()
Wend

Can someone could help me ?

Thank you in advance

-- 
Maxime de Roucy
Groupe LINAGORA - OSSA
✉ : 80 rue Roque de Fillol 92800 PUTEAUX
☎ : 01.46.96.63.44 ☏ : 06.42.00.49.09


signature.asc
Description: This is a digitally signed message part
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/core/tool/interpr2.cxx |7 +++
 sc/source/core/tool/interpr4.cxx |7 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit b9a51c0b1e000865921e0bd4b84827e6f6f12556
Author: Eike Rathke er...@redhat.com
Date:   Thu Feb 21 18:56:29 2013 +0100

assert can't happen

Change-Id: I896e29b04568b351517612a1ac161dca5717dfbc

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 7326497..9279c18 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2575,6 +2575,9 @@ void ScInterpreter::ScRoman()
 
 if( (nDigit % 5) == 4 )
 {
+// assert can't happen with nVal4000 precondition
+assert( ((nDigit == 4) ? (nIndex = 1) : (nIndex = 2)));
+
 sal_uInt16 nIndex2 = (nDigit == 4) ? nIndex - 1 : nIndex - 
2;
 sal_uInt16 nSteps = 0;
 while( (nSteps  nMode)  (nIndex  nMaxIndex) )
@@ -2593,7 +2596,11 @@ void ScInterpreter::ScRoman()
 else
 {
 if( nDigit  4 )
+{
+// assert can't happen with nVal4000 precondition
+assert( nIndex = 1 );
 aRoman += pChars[ nIndex - 1 ];
+}
 sal_Int32 nPad = nDigit % 5;
 if (nPad)
 {
commit 9287760846655c85a564c5b8b546770762121a43
Author: Eike Rathke er...@redhat.com
Date:   Thu Feb 21 18:37:55 2013 +0100

prevent out-of-bounds access for old binary non-UNO add-in function

Change-Id: I6bdce23059d7db337fff0d4eb215b2acdaf18c93

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 04cd1b58..e428749 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2545,13 +2545,16 @@ void ScInterpreter::ScExternal()
 FuncData* pFuncData = ScGlobal::GetFuncCollection()-findByName(aFuncName);
 if (pFuncData)
 {
-if (nParamCount = MAXFUNCPARAM  nParamCount == 
pFuncData-GetParamCount() - 1)
+// Old binary non-UNO add-in function.
+// NOTE: parameter count is 1-based with the 0th parameter being the
+// return value, included in pFuncDatat-GetParamCount()
+if (nParamCount  MAXFUNCPARAM  nParamCount == 
pFuncData-GetParamCount() - 1)
 {
 ParamType   eParamType[MAXFUNCPARAM];
 void*   ppParam[MAXFUNCPARAM];
 double  nVal[MAXFUNCPARAM];
 sal_Char*   pStr[MAXFUNCPARAM];
-sal_uInt8*   pCellArr[MAXFUNCPARAM];
+sal_uInt8*  pCellArr[MAXFUNCPARAM];
 short   i;
 
 for (i = 0; i  MAXFUNCPARAM; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

[Jean-Noël Rouvignac]

2013/2/21 Lubos Lunak l.lu...@suse.cz

 On Thursday 21 of February 2013, Michael Meeks wrote:
  Hi Lubos,
 
  On Mon, 2013-02-18 at 15:01 +0100, Lubos Lunak wrote:
All I'm saying is that 'do not merge' is vague enough to not say what
 it
   in fact does or where the line between -1 and -2 is, and 'I disagree
 with
   the change, needs discussion first' or similar is clearer there and
 still
   reasonably short.
 
So can you propose a better string ? how about this one:
 
block merging for now
 
Which is brief, open-ended, uses merge not submit and describes the
  function of -2 perhaps better to both reviewer and reviewee.

  This is again vague enough to apply to -1 as well (-1 is also block
 merging
 for now). I did propose already one string I think is better, but if you
 want to put it this way, then it should be e.g. block merging until
 objections are cleared or so.


How about Do not merge, let's discuss the approach or Do not merge,
let's discuss the design?
This is inviting and explains that the code won't be merge as without
discussing the design.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Depends on||61186

-- 
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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

--- Comment #204 from Joel Madero jmadero@gmail.com ---
Added Bug 61186 as our printer settings (file - printer settings) are
essentially a useless set of options until this is fixed

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

[PATCH] instsetoo_native: convert to gbuild

[David Ostrovsky (via Code Review)]

Hello LibreOffice gerrit bot, Matúš Kukan,

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

https://gerrit.libreoffice.org/2242

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

Change subject: instsetoo_native: convert to gbuild
..

instsetoo_native: convert to gbuild

Removes:
 * instsetoo_native/inc_openoffice/unix/*
 * instsetoo_native/util/update.xml
- gen_update_info.pl can be removed ?

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
---
M Makefile.in
A instsetoo_native/CustomTarget_install.mk
A instsetoo_native/Makefile
A instsetoo_native/Module_instsetoo_native.mk
M instsetoo_native/README
R instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
R instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
D instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
D instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
D instsetoo_native/inc_openoffice/unix/makefile.mk
D instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
D instsetoo_native/prj/build.lst
D instsetoo_native/prj/d.lst
D instsetoo_native/prj/dmake
D instsetoo_native/util/makefile.mk
D instsetoo_native/util/update.xml
M scp2/source/python/file_python.scp
17 files changed, 146 insertions(+), 567 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2242/2
-- 
To view, visit https://gerrit.libreoffice.org/2242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

Re: [Libreoffice-qa] minutes of ESC call ...

[Jack Leigh]

On 21/02/13 18:13, Jean-Noël Rouvignac wrote:

2013/2/21 Lubos Lunak l.lu...@suse.cz


On Thursday 21 of February 2013, Michael Meeks wrote:

Hi Lubos,

On Mon, 2013-02-18 at 15:01 +0100, Lubos Lunak wrote:

  All I'm saying is that 'do not merge' is vague enough to not say what

it

in fact does or where the line between -1 and -2 is, and 'I disagree

with

the change, needs discussion first' or similar is clearer there and

still

reasonably short.


   So can you propose a better string ? how about this one:

   block merging for now

   Which is brief, open-ended, uses merge not submit and describes the
function of -2 perhaps better to both reviewer and reviewee.


  This is again vague enough to apply to -1 as well (-1 is also block
merging
for now). I did propose already one string I think is better, but if you
want to put it this way, then it should be e.g. block merging until
objections are cleared or so.



How about Do not merge, let's discuss the approach or Do not merge,
let's discuss the design?
This is inviting and explains that the code won't be merge as without
discussing the design.


In this vein -1 is currently 'This need' and it should surely be 'This 
needs'.

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

[Libreoffice-commits] core.git: config_host.mk.in

[Norbert Thiebaud]

 config_host.mk.in |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b30d961ab590327ff18cfc12ee4eda396a5ebee6
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Feb 21 13:20:57 2013 -0600

orphaned variable in config_host.mk.in

Change-Id: I6a6fd3e1e749b9a7adebdc4bf615e9b523b427bd

diff --git a/config_host.mk.in b/config_host.mk.in
index 9ebf1c6..82d75e3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -159,7 +159,6 @@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
-export ENABLE_SCRIPTING_PYTHON=@ENABLE_SCRIPTING_PYTHON@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
 export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] quiet external module build log unless failure

[Norbert Thiebaud (via Code Review)]

Hello LibreOffice gerrit bot, David Tardon, David Ostrovsky,

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

https://gerrit.libreoffice.org/2304

to look at the new rebased patch set (#5).

Change subject: quiet external module build log unless failure
..

quiet external module build log unless failure

ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
---
M apache-commons/ExternalProject_apache_commons_codec.mk
M apache-commons/ExternalProject_apache_commons_httpclient.mk
M apache-commons/ExternalProject_apache_commons_lang.mk
M apache-commons/ExternalProject_apache_commons_logging.mk
M beanshell/ExternalProject_beanshell.mk
M cairo/ExternalProject_cairo.mk
M cairo/ExternalProject_pixman.mk
M cppunit/ExternalProject_cppunit.mk
M curl/ExternalProject_curl.mk
M expat/ExternalProject_expat.mk
M fontconfig/ExternalProject_fontconfig.mk
M hsqldb/ExternalProject_hsqldb.mk
M hunspell/ExternalProject_hunspell.mk
M hyphen/ExternalProject_hyphen.mk
M icu/ExternalProject_icu.mk
M jfreereport/ExternalProject_jfreereport_flow_engine.mk
M jfreereport/ExternalProject_jfreereport_flute.mk
M jfreereport/ExternalProject_jfreereport_libbase.mk
M jfreereport/ExternalProject_jfreereport_libfonts.mk
M jfreereport/ExternalProject_jfreereport_libformula.mk
M jfreereport/ExternalProject_jfreereport_liblayout.mk
M jfreereport/ExternalProject_jfreereport_libloader.mk
M jfreereport/ExternalProject_jfreereport_librepository.mk
M jfreereport/ExternalProject_jfreereport_libserializer.mk
M jfreereport/ExternalProject_jfreereport_libxml.mk
M jfreereport/ExternalProject_jfreereport_sac.mk
M lcms2/ExternalProject_lcms2.mk
M libcdr/ExternalProject_libcdr.mk
M libexttextcat/ExternalProject_exttextcat.mk
M liblangtag/ExternalProject_langtag.mk
M libmspub/ExternalProject_libmspub.mk
M liborcus/ExternalProject_liborcus.mk
M libvisio/ExternalProject_libvisio.mk
M libwpd/ExternalProject_libwpd.mk
M libxml2/ExternalProject_xml2.mk
M libxmlsec/ExternalProject_xmlsec.mk
M libxslt/ExternalProject_xslt.mk
M lpsolve/ExternalProject_lpsolve.mk
M mythes/ExternalProject_mythes.mk
M nss/ExternalProject_nss.mk
M openldap/ExternalProject_openldap.mk
M openssl/ExternalProject_openssl.mk
M postgresql/ExternalProject_postgresql.mk
M python3/ExternalProject_python3.mk
M pyuno/CustomTarget_zipcore.mk
M redland/ExternalProject_raptor.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
M rhino/ExternalProject_rhino.mk
M solenv/gbuild/ExternalProject.mk
M solenv/gbuild/Helper.mk
M solenv/gbuild/gbuild.mk
M tomcat/ExternalProject_tomcat.mk
M xpdf/ExternalProject_xpdf.mk
54 files changed, 943 insertions(+), 919 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2304/5
-- 
To view, visit https://gerrit.libreoffice.org/2304
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

Re: minutes of ESC call ...

[Michael Stahl]

On 21/02/13 17:00, Michael Meeks wrote:
   + full-word selection / editing ergonomics cf. UX-advise
 https://bugs.freedesktop.org/show_bug.cgi?id=46517
   + pending input from Caolan / Cedric / Michael S

so i have finally looked at this bug and added a comment, which
basically says meh. how the heck did this get on the ESC agenda?


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

[Libreoffice-commits] .: 2 commits - test-bugzilla-files/test-bugzilla-files.py

[Libreoffice Gerrit user]

 test-bugzilla-files/test-bugzilla-files.py |   46 +
 1 file changed, 28 insertions(+), 18 deletions(-)

New commits:
commit 5ab748ed8492bdab166706d175144100e338eb3f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Feb 21 21:00:24 2013 +0100

lets differentiate between DisposedException and UnkownPropertyException

diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index 32fa3c2..cd41795 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -281,10 +281,12 @@ def loadFromURL(xContext, url):
 if xListener:
 xGEB.removeDocumentEventListener(xListener)
 
-def handleCrash(file):
+def handleCrash(file, disposed):
 print(File:  + file +  crashed)
 crashLog = open(crashlog.txt, a)
-crashLog.write('Crash:' + file + '\n')
+crashLog.write('Crash:' + file + ' ')
+if disposed == 1:
+crashLog.write('through disposed\n')
 crashLog.close()
 #crashed_files.append(file)
 # add here the remaining handling code for crashed files
@@ -315,8 +317,8 @@ class LoadFileTest:
 self.state.timeoutFiles.append(self.file)
 else:
 t.cancel()
-handleCrash(self.file)
-self.state.badFiles.append(self.file)
+handleCrash(self.file, 0)
+self.state.badPropertyFiles.append(self.file)
 connection.tearDown()
 connection.setUp()
 except pyuno.getClass(com.sun.star.lang.DisposedException):
@@ -326,8 +328,8 @@ class LoadFileTest:
 self.state.timeoutFiles.append(self.file)
 else:
 t.cancel()
-handleCrash(self.file)
-self.state.badFiles.append(self.file)
+handleCrash(self.file, 1)
+self.state.badDisposedFiles.append(self.file)
 connection.tearDown()
 connection.setUp()
 finally:
@@ -338,12 +340,12 @@ class LoadFileTest:
 xDoc.close(True)
 except 
pyuno.getClass(com.sun.star.beans.UnknownPropertyException):
 print(caught UnknownPropertyException while closing)
-self.state.badFiles.append(self.file)
+self.state.badPropertyFiles.append(self.file)
 connection.tearDown()
 connection.setUp()
 except pyuno.getClass(com.sun.star.lang.DisposedException):
 print(caught DisposedException while closing)
-self.state.badFiles.append(self.file)
+self.state.badDisposedFiles.append(self.file)
 connection.tearDown()
 connection.setUp()
 print(...done with:  + self.file)
@@ -351,7 +353,8 @@ class LoadFileTest:
 class State:
 def __init__(self):
 self.goodFiles = []
-self.badFiles = []
+self.badDisposedFiles = []
+self.badPropertyFiles = []
 self.timeoutFiles = []
 
 
@@ -363,13 +366,20 @@ def writeReport(state, startTime):
 goodFiles.write(file)
 goodFiles.write(\n)
 goodFiles.close()
-badFiles = open(badFiles.log, w)
-badFiles.write(All files tested which crashed:\n)
-badFiles.write(Starttime:  + startTime.isoformat() + \n)
-for file in state.badFiles:
-badFiles.write(file)
-badFiles.write(\n)
-badFiles.close()
+badDisposedFiles = open(badDisposedFiles.log, w)
+badDisposedFiles.write(All files tested which crashed:\n)
+badDisposedFiles.write(Starttime:  + startTime.isoformat() + \n)
+for file in state.badDisposedFiles:
+badDisposedFiles.write(file)
+badDisposedFiles.write(\n)
+badDisposedFiles.close()
+badPropertyFiles = open(badPropertyFiles.log, w)
+badPropertyFiles.write(All files tested which crashed:\n)
+badPropertyFiles.write(Starttime:  + startTime.isoformat() + \n)
+for file in state.badPropertyFiles:
+badPropertyFiles.write(file)
+badPropertyFiles.write(\n)
+badPropertyFiles.close()
 timeoutFiles = open(timeoutFiles.log, w)
 timeoutFiles.write(All files tested which timed out:\n)
 timeoutFiles.write(Starttime:  + startTime.isoformat() + \n)
commit 04c423912ebc63ba2923e91a9580bf526fc490e1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Feb 19 03:42:44 2013 +0100

remove unused parameter

diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index 7a12dc2..32fa3c2 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -245,7 +245,7 @@ def mkPropertyValue(name, value):
 
 ### tests ###
 
-def loadFromURL(xContext, url, connection):
+def loadFromURL(xContext, url):
 xDesktop = xContext.ServiceManager.createInstanceWithContext(
 

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

[Michael Stahl]

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

New commits:
commit e052f55236e2cdd4ebe6a126b570415b5a1b4ea5
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 21 21:11:54 2013 +0100

spurious warning C4701: potentially uninitialized local variable

Change-Id: I37f96df0ca6003bd811f156448e6b4990daa

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 5f58eb0..99edb81 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1110,7 +1110,7 @@ void SwAutoFormat::DeleteAktPara( bool bStart, bool bEnd )
 // Loesche Blanks am Ende vom akt. und am Anfang vom naechsten
 aDelPam.DeleteMark();
 aDelPam.GetPoint()-nNode = aNdIdx;
-xub_StrLen nPos;
+xub_StrLen nPos(0);
 if( bStart  0 != ( nPos = GetLeadingBlanks( pAktTxtNd-GetTxt() )))
 {
 aDelPam.GetPoint()-nContent.Assign( pAktTxtNd, 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: help on macro (writing a testcase)

[Noel Power]

On 21/02/13 17:58, Maxime de Roucy wrote:

Hello

[...]

http://opengrok.libreoffice.org/xref/core/sw/qa/extras/
Before going to the C++ I am trying to write a macro doing my test.

I don't know much about macro. I use XrayTool but I can't figured out
how to do my test.
I tried to list the element of the cells but didn't find the picture in
it…

[...]

Can someone could help me ?

it's not the cell you want to look at but the picture/shape/graphic, it 
will have an associated anchor, it is the anchor which

controls where it is located, try

Dim Anchor as Object
Dim Shape as Object
Dim Table as Object

Set Shape = ThisComponent.Drawpage(0) ' first shape on page
Set Anchor = Shape.Anchor
Set Table = Anchor.TextTable

MsgBox Shape.Name   is located as cell   Anchor.Cell.CellName   in 
Table   Table.Name



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

[Libreoffice-commits] core.git: connectivity/source dbaccess/source idlc/source pyuno/source sal/qa sfx2/source starmath/source xmloff/source

[Julien Nabet]

 connectivity/source/drivers/postgresql/pq_xbase.cxx |2 +-
 dbaccess/source/ui/inc/TableController.hxx  |2 +-
 idlc/source/astexpression.cxx   |2 +-
 idlc/source/errorhandler.cxx|2 +-
 pyuno/source/module/pyuno_module.cxx|2 +-
 sal/qa/buildall.pl  |2 +-
 sfx2/source/config/evntconf.cxx |2 +-
 starmath/source/toolbox.cxx |6 +++---
 xmloff/source/text/txtflde.cxx  |   16 
 xmloff/source/text/txtfldi.cxx  |2 +-
 xmloff/source/text/txtvfldi.cxx |2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit f68cd77923ed996c372e6814d615c6faf635626a
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Feb 21 21:49:44 2013 +0100

Fix type unkown - unknown

Change-Id: I8d55d5ae5ae38ae2b252859b5400e36301f19ef0

diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx 
b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 50c557e..fdbc114 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -121,7 +121,7 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public(
 if( -1 == nHandle  )
 {
 rtl::OUStringBuffer buf(128);
-buf.appendAscii( Unkown property ' );
+buf.appendAscii( Unknown property ' );
 buf.append( name );
 buf.appendAscii( ' in  );
 buf.append( m_implName );
diff --git a/dbaccess/source/ui/inc/TableController.hxx 
b/dbaccess/source/ui/inc/TableController.hxx
index cebe6b7..b5eda7c 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -49,7 +49,7 @@ namespace dbaui
 ::rtl::OUString m_sName;// table for update data
 ::rtl::OUString m_sAutoIncrementValue;  // the autoincrement value set 
in the datasource
 String  m_sTypeNames;   // these type names are the 
ones out of the resource file
-TOTypeInfoSPm_pTypeInfo;// fall back when type is 
unkown because database driver has a failure
+TOTypeInfoSPm_pTypeInfo;// fall back when type is 
unknown because database driver has a failure
 
 sal_Boolm_bAllowAutoIncrementValue; // no : 1 NO BIT , is true 
when the datasource has a AutoIncrementValue property in their info property
 sal_Boolm_bNew  : 1;// is true when we create a 
new table
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index b28cfed..61f2d7f 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -1277,7 +1277,7 @@ const sal_Char* SAL_CALL exprTypeToString(ExprType t)
 return none;
 }
 
-return (unkown);
+return (unknown);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 447e8c3..464ff37 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -168,7 +168,7 @@ static const sal_Char* warningCodeToMessage(WarningCode 
wCode)
 case WIDL_WRONG_NAMING_CONV:
 return type or identifier doesn't fulfill the UNO naming convention: 
;
 }
-return unkown warning;
+return unknown warning;
 }
 
 static const sal_Char* parseStateToMessage(ParseState state)
diff --git a/pyuno/source/module/pyuno_module.cxx 
b/pyuno/source/module/pyuno_module.cxx
index 1638aba..f823104 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -396,7 +396,7 @@ static PyObject *createUnoStructHelper(
 OStringBuffer buf;
 buf.append( UNO struct  );
 buf.append( PyStr_AsString(structName) );
-buf.append(  is unkown );
+buf.append(  is unknown );
 PyErr_SetString (PyExc_RuntimeError, buf.getStr());
 }
 }
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 6726571..20f4dfa 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -141,7 +141,7 @@ sub initEnvironment()
   $g_sTempDir = $ENV{TMP}  ? $ENV{TMP}${FS} : 
${FS}tmp${FS};
   last SWITCH;
   }
-  print STDERR buildall.pl: unkown platform\n;
+  print STDERR buildall.pl: unknown platform\n;
   exit(1);
   }
 }
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index c2b09fa..74b5f79 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -257,7 +257,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, 
rtl::OUString aEventName, const
 }
 }
 else {
-DBG_WARNING( PropagateEvents_Impl: Got unkown 

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

[Tor Lillqvist]

 vcl/generic/glyphs/gcach_ftyp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d784611e2e89f03e88bf35b97be87c0132aa5c0
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 21 23:17:24 2013 +0200

FT_GlyphSlot_Embolden() and FT_GlyphSlot_Oblique() return void

Change-Id: I40e0edeeda7158c6209b3eda124587e2da4df8d1

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 1cb2d87..be2a173 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -512,8 +512,8 @@ FreetypeManager::FreetypeManager()
 pFTNewSize  = (FT_Error(*)(FT_Face,FT_Size*))(sal_IntPtr)dlsym( 
RTLD_DEFAULT, FT_New_Size );
 pFTActivateSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_Activate_Size );
 pFTDoneSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_Done_Size );
-pFTEmbolden = (FT_Error(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( 
RTLD_DEFAULT, FT_GlyphSlot_Embolden );
-pFTOblique  = (FT_Error(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( 
RTLD_DEFAULT, FT_GlyphSlot_Oblique );
+pFTEmbolden = (void(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_GlyphSlot_Embolden );
+pFTOblique  = (void(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_GlyphSlot_Oblique );
 
 bEnableSizeFT = (pFTNewSize!=NULL)  (pFTActivateSize!=NULL)  
(pFTDoneSize!=NULL);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/generic/glyphs/gcach_ftyp.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit dbcd4e5fac5e48753d6cfa5c80ff3d4ce12a1894
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 21 23:20:21 2013 +0200

pFTOblique is unused

Change-Id: I20c70299e6e91883dd5ee45b09268f543fd5e1c8

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index be2a173..df24b76 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -132,7 +132,6 @@ static FT_Error (*pFTNewSize)(FT_Face,FT_Size*);
 static FT_Error (*pFTActivateSize)(FT_Size);
 static FT_Error (*pFTDoneSize)(FT_Size);
 void (*pFTEmbolden)(FT_GlyphSlot);
-void (*pFTOblique)(FT_GlyphSlot);
 static bool bEnableSizeFT = false;
 
 struct EqStr{ bool operator()(const char* a, const char* b) const { return 
!strcmp(a,b); } };
@@ -496,7 +495,6 @@ FreetypeManager::FreetypeManager()
 pFTActivateSize = FT_Activate_Size;
 pFTDoneSize = FT_Done_Size;
 pFTEmbolden = FT_GlyphSlot_Embolden;
-pFTOblique = FT_GlyphSlot_Oblique;
 nFTVERSION = FTVERSION;
 #else
 #ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
@@ -513,7 +511,6 @@ FreetypeManager::FreetypeManager()
 pFTActivateSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_Activate_Size );
 pFTDoneSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_Done_Size );
 pFTEmbolden = (void(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_GlyphSlot_Embolden );
-pFTOblique  = (void(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( RTLD_DEFAULT, 
FT_GlyphSlot_Oblique );
 
 bEnableSizeFT = (pFTNewSize!=NULL)  (pFTActivateSize!=NULL)  
(pFTDoneSize!=NULL);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] quiet external module build log unless failure

[Norbert Thiebaud (via Code Review)]

Hello LibreOffice gerrit bot, David Tardon, David Ostrovsky,

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

https://gerrit.libreoffice.org/2304

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

Change subject: quiet external module build log unless failure
..

quiet external module build log unless failure

ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
---
M apache-commons/ExternalProject_apache_commons_codec.mk
M apache-commons/ExternalProject_apache_commons_httpclient.mk
M apache-commons/ExternalProject_apache_commons_lang.mk
M apache-commons/ExternalProject_apache_commons_logging.mk
M beanshell/ExternalProject_beanshell.mk
M cairo/ExternalProject_cairo.mk
M cairo/ExternalProject_pixman.mk
M cppunit/ExternalProject_cppunit.mk
M curl/ExternalProject_curl.mk
M expat/ExternalProject_expat.mk
M fontconfig/ExternalProject_fontconfig.mk
M hsqldb/ExternalProject_hsqldb.mk
M hunspell/ExternalProject_hunspell.mk
M hyphen/ExternalProject_hyphen.mk
M icu/ExternalProject_icu.mk
M jfreereport/ExternalProject_jfreereport_flow_engine.mk
M jfreereport/ExternalProject_jfreereport_flute.mk
M jfreereport/ExternalProject_jfreereport_libbase.mk
M jfreereport/ExternalProject_jfreereport_libfonts.mk
M jfreereport/ExternalProject_jfreereport_libformula.mk
M jfreereport/ExternalProject_jfreereport_liblayout.mk
M jfreereport/ExternalProject_jfreereport_libloader.mk
M jfreereport/ExternalProject_jfreereport_librepository.mk
M jfreereport/ExternalProject_jfreereport_libserializer.mk
M jfreereport/ExternalProject_jfreereport_libxml.mk
M jfreereport/ExternalProject_jfreereport_sac.mk
M lcms2/ExternalProject_lcms2.mk
M libcdr/ExternalProject_libcdr.mk
M libexttextcat/ExternalProject_exttextcat.mk
M liblangtag/ExternalProject_langtag.mk
M libmspub/ExternalProject_libmspub.mk
M liborcus/ExternalProject_liborcus.mk
M libvisio/ExternalProject_libvisio.mk
M libwpd/ExternalProject_libwpd.mk
M libxml2/ExternalProject_xml2.mk
M libxmlsec/ExternalProject_xmlsec.mk
M libxslt/ExternalProject_xslt.mk
M lpsolve/ExternalProject_lpsolve.mk
M mythes/ExternalProject_mythes.mk
M nss/ExternalProject_nss.mk
M openldap/ExternalProject_openldap.mk
M openssl/ExternalProject_openssl.mk
M postgresql/ExternalProject_postgresql.mk
M python3/ExternalProject_python3.mk
M pyuno/CustomTarget_zipcore.mk
M redland/ExternalProject_raptor.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
M rhino/ExternalProject_rhino.mk
M solenv/gbuild/ExternalProject.mk
M solenv/gbuild/Helper.mk
M solenv/gbuild/gbuild.mk
M tomcat/ExternalProject_tomcat.mk
M xpdf/ExternalProject_xpdf.mk
54 files changed, 943 insertions(+), 919 deletions(-)


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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

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

[Tor Lillqvist]

 desktop/source/app/sofficemain.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a07dd698bf8044db1c13dbd81a5bc6e62225788c
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 21 23:31:26 2013 +0200

Remove leftover debugging printf

Change-Id: I90a75a3d2eed8929b21eef3f710aec37a9f9c5bd

diff --git a/desktop/source/app/sofficemain.cxx 
b/desktop/source/app/sofficemain.cxx
index 3af1474..327d9f3 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -76,7 +76,6 @@ extern C int DESKTOP_DLLPUBLIC soffice_main()
 return EXIT_SUCCESS;
 }
 #endif
-fprintf (stderr, enter svmain()\n);
 return SVMain();
 #if defined ANDROID
 } catch (const ::com::sun::star::uno::Exception e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] instsetoo_native: convert to gbuild

[David Ostrovsky (via Code Review)]

Hello LibreOffice gerrit bot, Matúš Kukan,

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

https://gerrit.libreoffice.org/2242

to look at the new rebased patch set (#3).

Change subject: instsetoo_native: convert to gbuild
..

instsetoo_native: convert to gbuild

Removes:
 * instsetoo_native/inc_openoffice/unix/*
 * instsetoo_native/util/update.xml
- gen_update_info.pl can be removed ?

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
---
M Makefile.in
A instsetoo_native/CustomTarget_install.mk
A instsetoo_native/Makefile
A instsetoo_native/Module_instsetoo_native.mk
M instsetoo_native/README
R instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
R instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
D instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
D instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
D instsetoo_native/inc_openoffice/unix/makefile.mk
D instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
D instsetoo_native/prj/build.lst
D instsetoo_native/prj/d.lst
D instsetoo_native/prj/dmake
D instsetoo_native/util/makefile.mk
D instsetoo_native/util/update.xml
M scp2/source/python/file_python.scp
17 files changed, 146 insertions(+), 567 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2242/3
-- 
To view, visit https://gerrit.libreoffice.org/2242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

[PATCH] convert odk to gbuild and add to tail_build

[Peter Foley (via Code Review)]

Hello LibreOffice gerrit bot, David Ostrovsky,

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

https://gerrit.libreoffice.org/2288

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

Change subject: convert odk to gbuild and add to tail_build
..

convert odk to gbuild and add to tail_build

Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
---
M Module_tail_build.mk
M Repository.mk
M RepositoryModule_ooo.mk
A odk/CustomTarget_autodoc.mk
A odk/CustomTarget_bin.mk
A odk/CustomTarget_check.mk
A odk/CustomTarget_classes.mk
A odk/CustomTarget_cli.mk
A odk/CustomTarget_doxygen.mk
A odk/CustomTarget_idl.mk
A odk/CustomTarget_include.mk
A odk/CustomTarget_javadoc.mk
A odk/CustomTarget_lib.mk
A odk/CustomTarget_odkcommon.mk
A odk/CustomTarget_settings.mk
A odk/CustomTarget_unowinreg.mk
A odk/Executable_unoapploader.mk
A odk/Library_unowinreg.mk
A odk/Makefile
A odk/Module_odk.mk
A odk/Zip_odkcommon.mk
A odk/Zip_odkexamples.mk
A odk/Zip_uno_loader_classes.mk
R odk/config/cfgWin.js
R odk/config/configure.pl
R odk/config/setsdkenv_unix
R odk/config/setsdkenv_unix.csh.in
R odk/config/setsdkenv_unix.sh.in
R odk/config/setsdkenv_windows.bat
R odk/config/setsdkenv_windows.template
R odk/config/setsdkname.bat
D odk/inc/makefile.mk
D odk/pack/checkbin/makefile.mk
D odk/pack/checkidl/makefile.mk
D odk/pack/checkinc/makefile.mk
D odk/pack/checkinc2/makefile.mk
D odk/pack/copying/makefile.mk
D odk/pack/gendocu/makefile.mk
D odk/pack/unzip_udk/deltree.txt
D odk/pack/unzip_udk/makefile.mk
M odk/prj/build.lst
M odk/prj/d.lst
D odk/prj/dmake
D odk/source/com/sun/star/lib/loader/makefile.mk
D odk/source/unoapploader/unx/makefile.mk
D odk/source/unoapploader/win/makefile.mk
D odk/source/unowinreg/win/makefile.mk
A odk/source/unowinreg/win/unowinreg.def
D odk/source/unowinreg/win/unowinreg.dxp
D odk/util/delzip
D odk/util/makefile.mk
D odk/util/makefile.pmk
D odk/util/odk_rules.pmk
M postprocess/prj/build.lst
M solenv/gbuild/Zip.mk
55 files changed, 979 insertions(+), 1,468 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/7
-- 
To view, visit https://gerrit.libreoffice.org/2288
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

[Libreoffice-commits] core.git: sw/inc sw/source vcl/generic vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source writerfilter/inc writerfilter/source xmloff/inc xmloff/source

[David Ostrovsky]

 sw/inc/pch/precompiled_msword.hxx |2 
 sw/source/filter/ww8/docxattributeoutput.cxx  |   21 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx  |5 -
 sw/source/filter/ww8/wrtw8sty.cxx |2 
 vcl/Library_vcl.mk|2 
 vcl/Package_inc.mk|2 
 vcl/generic/fontmanager/fontmanager.cxx   |2 
 vcl/inc/vcl/embeddedfontshelper.hxx   |   58 
 vcl/inc/vcl/temporaryfonts.hxx|   54 +++
 vcl/source/app/svmain.cxx |6 -
 vcl/source/gdi/embeddedfontshelper.cxx|  104 --
 vcl/source/gdi/temporaryfonts.cxx |   56 +++
 writerfilter/inc/pch/precompiled_writerfilter.hxx |2 
 writerfilter/source/dmapper/FontTable.cxx |6 -
 xmloff/inc/pch/precompiled_xo.hxx |2 
 xmloff/source/style/XMLFontAutoStylePool.cxx  |   13 --
 xmloff/source/style/XMLFontStylesContext.cxx  |8 -
 17 files changed, 142 insertions(+), 203 deletions(-)

New commits:
commit cad65120c6da901bf9fe33ab16ad22217efed0c0
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Feb 21 23:33:10 2013 +0100

Revert embed also system fonts when embedding fonts in a document

that's enouph breakage for now.

This reverts commit 596bd0f61f8cfc957410148ae221c62331067bdd.

Change-Id: I992f439a9a099e47115a30b3d745848f3af09e5e

diff --git a/sw/inc/pch/precompiled_msword.hxx 
b/sw/inc/pch/precompiled_msword.hxx
index e05919f..acacb8b 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -252,7 +252,7 @@
 #include vcl/outdev.hxx
 #include vcl/salbtype.hxx
 #include vcl/svapp.hxx
-#include vcl/embeddedfontshelper.hxx
+#include vcl/temporaryfonts.hxx
 #include vcl/vclenum.hxx
 #include vcl/virdev.hxx
 #include vcl/wmf.hxx
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b7e211f..8a6e8bb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -98,7 +98,7 @@
 #include txtinet.hxx
 
 #include osl/file.hxx
-#include vcl/embeddedfontshelper.hxx
+#include vcl/temporaryfonts.hxx
 
 #include com/sun/star/i18n/ScriptType.hpp
 #include com/sun/star/chart2/XChartDocument.hpp
@@ -3055,14 +3055,14 @@ void DocxAttributeOutput::FontPitchType( FontPitch 
ePitch ) const
 FSEND );
 }
 
-void DocxAttributeOutput::EmbedFont( const OUString name, FontFamily family, 
FontPitch pitch, rtl_TextEncoding encoding )
+void DocxAttributeOutput::EmbedFont( const OUString name )
 {
 if( !m_rExport.pDoc-get( IDocumentSettingAccess::EMBED_FONTS ))
 return; // no font embedding with this document
-EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE, 
WEIGHT_NORMAL, pitch, encoding );
-EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD, 
pitch, encoding );
-EmbedFontStyle( name, XML_embedItalic, family, ITALIC_NORMAL, 
WEIGHT_NORMAL, pitch, encoding );
-EmbedFontStyle( name, XML_embedBoldItalic, family, ITALIC_NORMAL, 
WEIGHT_BOLD, pitch, encoding );
+EmbedFontStyle( name, XML_embedRegular,  );
+EmbedFontStyle( name, XML_embedBold, b );
+EmbedFontStyle( name, XML_embedItalic, i );
+EmbedFontStyle( name, XML_embedBoldItalic, bi );
 }
 
 static inline char toHexChar( int value )
@@ -3070,12 +3070,11 @@ static inline char toHexChar( int value )
 return value = 10 ? value + 'A' - 10 : value + '0';
 }
 
-void DocxAttributeOutput::EmbedFontStyle( const OUString name, int tag, 
FontFamily family, FontItalic italic,
-FontWeight weight, FontPitch pitch, rtl_TextEncoding encoding )
+void DocxAttributeOutput::EmbedFontStyle( const OUString name, int tag, const 
char* style )
 {
-OUString fontUrl = EmbeddedFontsHelper::fontFileUrl( name, family, italic, 
weight, pitch, encoding );
-if( fontUrl.isEmpty())
-return;
+OUString fontUrl = TemporaryFonts::fileUrlForFont( name, style );
+// If a temporary font file exists for this font, assume it was embedded
+// and embed it again.
 // TODO IDocumentSettingAccess::EMBED_SYSTEM_FONTS
 osl::File file( fontUrl );
 if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 37a6d4e..af94b1f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -244,7 +244,7 @@ public:
 void FontPitchType( FontPitch ePitch ) const;
 
 /// Write out the font into the document, if it's an embedded font.
-void EmbedFont( const OUString name, FontFamily family, FontPitch pitch, 
rtl_TextEncoding encoding );
+void EmbedFont( const OUString name );
 
 /// Definition of a numbering instance.
 virtual 

[PATCH] convert odk to gbuild and add to tail_build

[David Ostrovsky (via Code Review)]

Hello LibreOffice gerrit bot,

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

https://gerrit.libreoffice.org/2288

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

Change subject: convert odk to gbuild and add to tail_build
..

convert odk to gbuild and add to tail_build

Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
---
M Module_tail_build.mk
M Repository.mk
M RepositoryModule_ooo.mk
A odk/CustomTarget_autodoc.mk
A odk/CustomTarget_bin.mk
A odk/CustomTarget_check.mk
A odk/CustomTarget_classes.mk
A odk/CustomTarget_cli.mk
A odk/CustomTarget_doxygen.mk
A odk/CustomTarget_idl.mk
A odk/CustomTarget_include.mk
A odk/CustomTarget_javadoc.mk
A odk/CustomTarget_lib.mk
A odk/CustomTarget_odkcommon.mk
A odk/CustomTarget_settings.mk
A odk/CustomTarget_unowinreg.mk
A odk/Executable_unoapploader.mk
A odk/Library_unowinreg.mk
A odk/Makefile
A odk/Module_odk.mk
A odk/Zip_odkcommon.mk
A odk/Zip_odkexamples.mk
A odk/Zip_uno_loader_classes.mk
R odk/config/cfgWin.js
R odk/config/configure.pl
R odk/config/setsdkenv_unix
R odk/config/setsdkenv_unix.csh.in
R odk/config/setsdkenv_unix.sh.in
R odk/config/setsdkenv_windows.bat
R odk/config/setsdkenv_windows.template
R odk/config/setsdkname.bat
D odk/inc/makefile.mk
D odk/pack/checkbin/makefile.mk
D odk/pack/checkidl/makefile.mk
D odk/pack/checkinc/makefile.mk
D odk/pack/checkinc2/makefile.mk
D odk/pack/copying/makefile.mk
D odk/pack/gendocu/makefile.mk
D odk/pack/unzip_udk/deltree.txt
D odk/pack/unzip_udk/makefile.mk
M odk/prj/build.lst
M odk/prj/d.lst
D odk/prj/dmake
D odk/source/com/sun/star/lib/loader/makefile.mk
D odk/source/unoapploader/unx/makefile.mk
D odk/source/unoapploader/win/makefile.mk
D odk/source/unowinreg/win/makefile.mk
A odk/source/unowinreg/win/unowinreg.def
D odk/source/unowinreg/win/unowinreg.dxp
D odk/util/delzip
D odk/util/makefile.mk
D odk/util/makefile.pmk
D odk/util/odk_rules.pmk
M postprocess/prj/build.lst
M solenv/gbuild/Zip.mk
55 files changed, 979 insertions(+), 1,468 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/8
-- 
To view, visit https://gerrit.libreoffice.org/2288
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
Gerrit-PatchSet: 8
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

[PATCH] instsetoo_native: convert to gbuild

[David Ostrovsky (via Code Review)]

Hello LibreOffice gerrit bot, Matúš Kukan,

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

https://gerrit.libreoffice.org/2242

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

Change subject: instsetoo_native: convert to gbuild
..

instsetoo_native: convert to gbuild

Removes:
 * instsetoo_native/inc_openoffice/unix/*
 * instsetoo_native/util/update.xml
- gen_update_info.pl can be removed ?

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
---
M Makefile.in
A instsetoo_native/CustomTarget_install.mk
A instsetoo_native/Makefile
A instsetoo_native/Module_instsetoo_native.mk
M instsetoo_native/README
R instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
R instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
D instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
D instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
D instsetoo_native/inc_openoffice/unix/makefile.mk
D instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
D instsetoo_native/prj/build.lst
D instsetoo_native/prj/d.lst
D instsetoo_native/prj/dmake
D instsetoo_native/util/makefile.mk
D instsetoo_native/util/update.xml
M scp2/source/python/file_python.scp
17 files changed, 146 insertions(+), 567 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2242/4
-- 
To view, visit https://gerrit.libreoffice.org/2242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

[PATCH] instsetoo_native: convert to gbuild

[David Ostrovsky (via Code Review)]

Hello LibreOffice gerrit bot, Matúš Kukan,

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

https://gerrit.libreoffice.org/2242

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

Change subject: instsetoo_native: convert to gbuild
..

instsetoo_native: convert to gbuild

Removes:
 * instsetoo_native/inc_openoffice/unix/*
 * instsetoo_native/util/update.xml
- gen_update_info.pl can be removed ?

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
---
M Makefile.in
A instsetoo_native/CustomTarget_install.mk
A instsetoo_native/Makefile
A instsetoo_native/Module_instsetoo_native.mk
M instsetoo_native/README
R instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
R instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
D instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
D instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
D instsetoo_native/inc_openoffice/unix/makefile.mk
D instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
D instsetoo_native/prj/build.lst
D instsetoo_native/prj/d.lst
D instsetoo_native/prj/dmake
D instsetoo_native/util/makefile.mk
D instsetoo_native/util/update.xml
M scp2/source/python/file_python.scp
17 files changed, 149 insertions(+), 567 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2242/5
-- 
To view, visit https://gerrit.libreoffice.org/2242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

[Libreoffice-commits] core.git: liblangtag/ExternalProject_langtag.mk libxmlsec/ExternalProject_xmlsec.mk libxslt/ExternalProject_xslt.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasq

[Michael Stahl]

 liblangtag/ExternalProject_langtag.mk |4 ++--
 libxmlsec/ExternalProject_xmlsec.mk   |2 +-
 libxslt/ExternalProject_xslt.mk   |5 +++--
 redland/ExternalProject_raptor.mk |4 ++--
 redland/ExternalProject_rasqal.mk |6 +++---
 redland/ExternalProject_redland.mk|8 
 6 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 0e72992d7492f36716e73068f9f93d9f25da9b02
Author: Michael Stahl mst...@redhat.com
Date:   Fri Feb 22 00:52:40 2013 +0100

libxslt, redland: properly quote rpath $ORIGIN

... so it can be passed from make to shell to configure to generated
Makefile to libtool to invoked gcc without loss of valuable dollars.

It is an open question to which extent this commit should be credited to
the designers of sh, autoconf, libtool, make, and/or Solaris ld.

Change-Id: I0709a49d7025dbfda4d9c0e7202ea932ec85e0cb

diff --git a/liblangtag/ExternalProject_langtag.mk 
b/liblangtag/ExternalProject_langtag.mk
index 81ec9a2..8f6f801 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -30,8 +30,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(filter 
MSC,$(COM)),LIBXML2_LIBS=$(OUTDIR)/lib/libxml2.lib,LIBXML2_LIBS=-L$(OUTDIR)/lib
 -lxml2),\
$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS=$(LIBXML_CFLAGS) 
LIBXML2_LIBS=$(LIBXML_LIBS))) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
-   $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS=-Wl,-z,origin 
-Wl,-rpath,$$ORIGIN:$$ORIGIN/../ure-link/lib) \
-   $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS=-Wl,-z,origin 
-Wl,-R,$$ORIGIN:$$ORIGIN/../ure-link/lib) \
+   $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS=-Wl,-z,origin 
-Wl,-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
+   $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS=-Wl,-z,origin 
-Wl,-R,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
$(if $(filter-out 
WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2) \
 $(MAKE) \
 touch $@
diff --git a/libxmlsec/ExternalProject_xmlsec.mk 
b/libxmlsec/ExternalProject_xmlsec.mk
index f603954..a0b182b 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(if $(filter NO,$(SYSTEM_NSS))$(filter 
MACOSX,$(OS)),--disable-pkgconfig) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(SYSBASE),CFLAGS=-I$(SYSBASE)/usr/include \
-   LDFLAGS=-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX 
FREEBSD,$(OS)),,-Wl,-z,origin 
-Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib'),\
+   LDFLAGS=-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX 
FREEBSD,$(OS)),,-Wl,-z,origin 
-Wl,-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\
$(if $(filter-out 
MACOSX,$(OS)),,LDFLAGS=-Wl,-dylib_file,@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib))
 \
 $(MAKE) \
 touch $@
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index b6aac21..b64eb93 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -43,8 +43,8 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 ./configure --without-crypto --without-python \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
-   LDFLAGS=$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)'ORIGIN:ORIGIN/../ure-link/lib' 
-Wl$(COMMA)-noinhibit-exec) \
-   $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib 
-L$(SYSBASE)/usr/lib -lpthread -ldl)) \
+   LDFLAGS=$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib 
-Wl$(COMMA)-noinhibit-exec) \
+   $(if $(SYSBASE),$(if $(filter SOLARIS 
LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
$(if $(SYSBASE),CPPFLAGS=-I$(SYSBASE)/usr/include) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS=-liconv) \
@@ -54,4 +54,5 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 $(MAKE) \
 touch $@
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_raptor.mk 
b/redland/ExternalProject_raptor.mk
index b67467c..7a778ff 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -40,8 +40,8 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
CFLAGS=$(if $(debug),-g,-O) $(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
$(if $(filter 

[PATCH] convert odk to gbuild and add to tail_build

[Peter Foley (via Code Review)]

Hello LibreOffice gerrit bot, David Ostrovsky,

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

https://gerrit.libreoffice.org/2288

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

Change subject: convert odk to gbuild and add to tail_build
..

convert odk to gbuild and add to tail_build

Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
---
M Module_tail_build.mk
M Repository.mk
M RepositoryModule_ooo.mk
A odk/CustomTarget_autodoc.mk
A odk/CustomTarget_bin.mk
A odk/CustomTarget_check.mk
A odk/CustomTarget_classes.mk
A odk/CustomTarget_cli.mk
A odk/CustomTarget_doxygen.mk
A odk/CustomTarget_idl.mk
A odk/CustomTarget_include.mk
A odk/CustomTarget_javadoc.mk
A odk/CustomTarget_lib.mk
A odk/CustomTarget_odkcommon.mk
A odk/CustomTarget_settings.mk
A odk/CustomTarget_unowinreg.mk
A odk/Executable_unoapploader.mk
A odk/Library_unowinreg.mk
A odk/Makefile
A odk/Module_odk.mk
A odk/Zip_odkcommon.mk
A odk/Zip_odkexamples.mk
A odk/Zip_uno_loader_classes.mk
R odk/config/cfgWin.js
R odk/config/configure.pl
R odk/config/setsdkenv_unix
R odk/config/setsdkenv_unix.csh.in
R odk/config/setsdkenv_unix.sh.in
R odk/config/setsdkenv_windows.bat
R odk/config/setsdkenv_windows.template
R odk/config/setsdkname.bat
D odk/inc/makefile.mk
D odk/pack/checkbin/makefile.mk
D odk/pack/checkidl/makefile.mk
D odk/pack/checkinc/makefile.mk
D odk/pack/checkinc2/makefile.mk
D odk/pack/copying/makefile.mk
D odk/pack/gendocu/makefile.mk
D odk/pack/unzip_udk/deltree.txt
D odk/pack/unzip_udk/makefile.mk
M odk/prj/build.lst
M odk/prj/d.lst
D odk/prj/dmake
D odk/source/com/sun/star/lib/loader/makefile.mk
D odk/source/unoapploader/unx/makefile.mk
D odk/source/unoapploader/win/makefile.mk
D odk/source/unowinreg/win/makefile.mk
A odk/source/unowinreg/win/unowinreg.def
D odk/source/unowinreg/win/unowinreg.dxp
D odk/util/delzip
D odk/util/makefile.mk
D odk/util/makefile.pmk
D odk/util/odk_rules.pmk
M postprocess/prj/build.lst
M solenv/gbuild/Zip.mk
55 files changed, 979 insertions(+), 1,468 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/9
-- 
To view, visit https://gerrit.libreoffice.org/2288
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
Gerrit-PatchSet: 9
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Peter Foley pefol...@verizon.net

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

Implementing alternate compatibility functions (such as 0^0 = ERROR)

[Andrew Douglas Pitonyak]

I was recently involved in a conversation related Calc and Excel 
compatibility. At issue is the fact that LO returns POWER(0,0) = 1 and 
Excel returns an error.


I have seen two primary means of dealing with this suggested. The first 
is to create a compatibility function for POWER(x,y) to match the 
behavior in Excel. My understanding of how this would work is as follows.


1. Create another function such as POWER.ALTERNATE(x,y) that behaves as 
desired.
2. When an Excel file is read, every instance of POWER is replaced with 
POWER.ALTERNATE.
3. When an Excel file is written, every instance of POWER.ALTERNATE is 
converted back to POWER.


I vaguely remember someone on list mentioning that they had implemented 
alternate Calc functions, but I do not remember the context.


This leaves a few questions in my mind.

(Q) Is a user able to use POWER.ALTERNATE inside of Calc?

(Q) When saved as an ODS file, certainly we don't want to write 
POWER.ALTERNATE because then it is using a nonstandard function that 
will not be used anywhere else and can only be read by AOO. In other 
words, I assume that we would always write POWER rather than 
POWER.ALTERNATE and the only way to retain the behavior is to save the 
file as an excel file or to mess with user defined attributes while 
writing the file.




The alternate suggestion was to add a compatibility mode. This has the 
advantage that it can be turned on and off at will so that Calc will 
simply behave that way. It also allows other functions to be changed to 
check the flag and behave accordingly. This also feels like a larger 
initial change and would require far more buy-in from the community to 
implement.


--
Andrew Pitonyak
My Macro Document: http://www.pitonyak.org/AndrewMacro.odt
Info:  http://www.pitonyak.org/oo.php

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

Re: Regression - LO Writer 4.0

[r_ouellette]

I confirm that fluidity is back also on win32 version (winxp at the office),
LO 4.0.1.1.

Raymond



--
View this message in context: 
http://nabble.documentfoundation.org/Regression-LO-Writer-4-0-tp4038481p4039356.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

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

[Markus Mohrhard]

 oox/source/vml/vmldrawing.cxx|3 ++-
 sc/source/ui/drawfunc/fupoor.cxx |   39 +--
 2 files changed, 3 insertions(+), 39 deletions(-)

New commits:
commit d48faab3d6a339f0c2ccba3aeb85d32dd45636f3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Feb 22 04:29:56 2013 +0100

some clean-up in the comments

Change-Id: I373d315ccfd5580efd5d4b860280ed29fc77b4e3

diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 46134e3..f6d3cd1 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -31,12 +31,6 @@
 #include vcl/svapp.hxx
 #include svx/sdrhittesthelper.hxx
 
-/*
-|*
-|* Konstruktor
-|*
-\/
-
 FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest rReq) :
 pView(pViewP),
@@ -56,27 +50,14 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, 
ScDrawView* pViewP,
 aDragTimer.SetTimeout(SELENG_DRAGDROP_TIMEOUT);
 }
 
-/*
-|*
-|* Destruktor
-|*
-\/
-
 FuPoor::~FuPoor()
 {
 aDragTimer.Stop();
 aScrollTimer.Stop();
 
-if (pDialog)
-delete pDialog;
+delete pDialog;
 }
 
-/*
-|*
-|* Function aktivieren
-|*
-\/
-
 void FuPoor::Activate()
 {
 if (pDialog)
@@ -85,12 +66,6 @@ void FuPoor::Activate()
 }
 }
 
-/*
-|*
-|* Function deaktivieren
-|*
-\/
-
 void FuPoor::Deactivate()
 {
 aDragTimer.Stop();
@@ -226,12 +201,6 @@ sal_uInt8 FuPoor::Command(const CommandEvent rCEvt)
 return pView-Command(rCEvt,pWindow);
 }
 
-/*
-|*
-|* Cut object to clipboard
-|*
-\/
-
 void FuPoor::DoCut()
 {
 if (pView)
@@ -254,12 +223,6 @@ void FuPoor::DoCopy()
 }
 }
 
-/*
-|*
-|* Paste object from clipboard
-|*
-\/
-
 void FuPoor::DoPaste()
 {
 if (pView)
commit a51f2248a6fe377a9306f4ed5c7db6ca26d0244c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Feb 22 04:28:42 2013 +0100

fix problem with \0 in string literal

Change-Id: If605c111a1d921e404c4aca12d28c558a6659987

diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 5293e1e..88282dd 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -56,7 +56,8 @@ namespace {
 OUString lclGetShapeId( sal_Int32 nShapeId )
 {
 // identifier consists of a literal NUL character, a lowercase 's', and 
the id
-return OUString( \0s ) + OUString::valueOf( nShapeId );
+sal_Unicode aStr[2] = { '\0', 's' };
+return OUString( aStr, 2 ) + OUString::valueOf( nShapeId );
 }
 
 /** Returns the numeric VML shape identifier from its textual representation. 
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits