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

[Norbert Thiebaud]

 vcl/quartz/CTRunData.cxx |2 
 vcl/quartz/CTRunData.hxx |2 
 vcl/quartz/ctlayout.cxx  |  270 ++-
 3 files changed, 61 insertions(+), 213 deletions(-)

New commits:
commit ab39f8c213bffa00f2b196c05a23ab3ccda8f901
Author: Norbert Thiebaud 
Date:   Fri Jul 3 13:35:45 2015 -0500

tdf#88941 Revert "vcl quartz: Add support back for DXArray tweaking"

This reverts commit 4a0cb642f18b674f37db8e9bd30942740df08e4c.
MacOSx only (more exactly CoreText only)
The handling of DXArray was buggy and need to be re-worked
so this revert to the previous case where DXArray are esssentially
ignored at the char level and only kept at the fragment size level
and used to redistribute space in a fragment

This create some issue too but on more esoteric case than
the one noticed in tdf#88941

Change-Id: Icb33d0600267c3136f3a6b15de8ecd739898ce04
Reviewed-on: https://gerrit.libreoffice.org/16747
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/vcl/quartz/CTRunData.cxx b/vcl/quartz/CTRunData.cxx
index 930f6d17..7ef3891 100644
--- a/vcl/quartz/CTRunData.cxx
+++ b/vcl/quartz/CTRunData.cxx
@@ -17,7 +17,6 @@ CTRunData::CTRunData( CTRunRef pRun, int start)
 : ownership_flags(0)
 , m_StartPos(start)
 , m_pRun(pRun)
-, m_pAdjPositions(NULL)
 {
 assert(pRun);
 
@@ -87,7 +86,6 @@ CTRunData::~CTRunData()
 {
 delete [] m_pPositions;
 }
-delete [] m_pAdjPositions;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index 9151467..3201acf 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -32,7 +32,7 @@ public:
 const CGPoint* m_pPositions;
 const CGSize*  m_pAdvances;
 const CFIndex* m_pStringIndices;
-CGPoint* m_pAdjPositions;
+
 CTRunData(CTRunRef pRun, int start);
~CTRunData();
 };
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 82d9c64..20dca01 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -57,7 +57,6 @@ private:
 voiddrawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef 
ctline, const CoreTextStyle* const pStyle) const;
 CGPoint GetTextDrawPosition() const;
 boolCacheGlyphLayout() const;
-voidApplyDXArray( ImplLayoutArgs& rArgs);
 
 const CoreTextStyle* constmpTextStyle;
 
@@ -103,9 +102,7 @@ CTLayout::~CTLayout()
 CFRelease( mpCTLine );
 }
 if( mpAttrString )
-{
 CFRelease( mpAttrString );
-}
 }
 
 bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
@@ -116,7 +113,6 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
 // release an eventual older layout
 if( mpAttrString )
 CFRelease( mpAttrString );
-
 mpAttrString = NULL;
 if( mpCTLine )
 {
@@ -164,151 +160,91 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
 return true;
 }
 
-void CTLayout::ApplyDXArray(ImplLayoutArgs& rArgs)
+void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
-CacheGlyphLayout();
-
-for (boost::ptr_vector::iterator iter = m_vRunData.begin();
- iter != m_vRunData.end();
- ++iter)
+if( !mpCTLine)
 {
-CTRunStatus status = CTRunGetStatus(iter->m_pRun);
-delete[] iter->m_pAdjPositions;
-iter->m_pAdjPositions = new CGPoint[iter->m_nGlyphs];
+return;
+}
 
-SAL_INFO( "vcl.ct", "Apply DXArray Run status:"<< status);
 
-if(!(status & kCTRunStatusNonMonotonic))
-{
-/* simple 1 to 1 */
-SAL_INFO( "vcl.ct", "nb glyph in vrun:" << iter->m_nGlyphs);
-for(int i = 0 ; i < iter->m_nGlyphs; i++)
-{
-SAL_INFO( "vcl.ct", "StringIndices[ "<< i << " ] = " << 
iter->m_pStringIndices[i]);
-int j = iter->m_pStringIndices[i];
-if(j == 0)
-{
-iter->m_pAdjPositions[i].x = 0;
-SAL_INFO( "vcl.ct", "m_pAdjPostion[" << i << "] = 0.0");
-}
-else
-{
-iter->m_pAdjPositions[i].x = rArgs.mpDXArray[j - 1];
-SAL_INFO( "vcl.ct", "m_pAdjPostion[" << i << "] = 
rArgs.mpDXArray[ " << j - 1 << " ]= " << rArgs.mpDXArray[j -1]);
-}
-iter->m_pAdjPositions[i].y = iter->m_pPositions[i].y;
-}
-}
-else
-{
-SAL_INFO( "vcl.ct", "drop DXArray info");
-delete[] iter->m_pAdjPositions;
-iter->m_pAdjPositions = NULL;
-}
-}
-}
+int nPixelWidth = rArgs.mpDXArray ? rArgs.mpDXArray[ mnCharCount - 1 ] : 
rArgs.mnLayoutWidth;
+if( nPixelWidth <= 0)
+return;
 
-void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
-{
-if( !mpCTLine)
+// HACK: justification requests which change the width by just one pixel 

cpu loop in test on windows

[Norbert Thiebaud]

I was able to run a debug session on an observed cpu-ooping in a
cppunit test on windows (tb65)
It was not sa debug build but from the assembler  it seems to be
looping in the while loop of the code below:

void SfxOleSection::SaveProperty( SvStream& rStrm, SfxOlePropertyBase&
rProp, sal_Size& rnPropPosPos )
{
rStrm.Seek( STREAM_SEEK_TO_END );
sal_uInt32 nPropPos = static_cast< sal_uInt32 >( rStrm.Tell() -
mnStartPos );
// property data type
rStrm.WriteInt32( rProp.GetPropType() );
// write property contents
SaveObject( rStrm, rProp );
// align to 32-bit
while( (rStrm.Tell() & 3) != 0 )
rStrm.WriteUChar( 0 );

^
loop here

looks like WriteUChar call blind Write, does not check that Write
actually wrote anything
whch somehow it does not (although my assembler skill does not allow
me to figre out exactly which path it took to bails -- I mean in the
c++ code.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 34882] Special character favorites

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=34882

Steve Hart  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |libreoff...@stevehart.net
   |desktop.org |

--- Comment #12 from Steve Hart  ---
I'm starting to work on this. It's the first time I've worked on the
LibreOffice code, so I don't know how far I'll get, but I'll post updates on
how it's going.

-- 
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: RTF support

[tracey002]

> Just curious, why do you ask?
I want to know what RTF functionality LibreOffice Writer does and does 
not support. :-)

Since the 3 controls were labled as RTF Controls: I suspected that
they might be acutal/functional controls, but maybe with
typographical errors.

Many/Most of Microsoft's _RTF Specification Documents_ have numerous 
technical typographical errors:

mis-spelling control names in the examples
controls spelt one way in the body of the document and differently
in the index
controls in the main section but not in the index and controls in
the index and not in the main section

It does not appear that Microsoft was ever really serious about
_RTF Specification Documentation_.

I reported an RTF bug in 2011 and it seems to have been resolved some 
time in 2013

I downloaded the last/latest version (3.6.7.2) that I think will
work with Windows 2000 (since that is what I use).
Since I did not find RTF Technical Information in the LibreOffice
Help file I downloaded the archived source code.
I searched for files that contains "RTF" and found _*rtfkeywd.hxx*_
which also has the year of 2013 in the time/date stamp.
I compared the rtfkeywd.hxx entries with the index entries from RTF
Specification Documentation v1.9.1 and found differences.

Just FYI, Tracey


Miklos Vajna-4 [via Document Foundation Mail Archive] wrote:
> Hi,
>
> On Fri, Jul 03, 2015 at 07:59:01AM -0700, tracey002 <[hidden email] 
> > wrote:
> > Can someone please identify the following RTF Controls?
> >
> > \facpgsxn 162
> > \nextcset 249
> > \tql 371
> > After the control, the number is the line in the *rtfkeywd.hxx* file
> >
> > I assume the category "RTF Control" means the controls are native to 
> RTF,
> > but I can not find them in the documentation
>
> The last version of RTF specification is here:
>
> http://www.microsoft.com/en-US/Download/details.aspx?id=10725
>
> All the above 3 RTF control words are not part of the specification, so
> most probably some legacy OOo extension that we inherited in LO.
>
> As far as I see:
>
> - facpgsxn is not used for anything LO, could be removed
> - nextcset seems to be an alias for \ansi in the shared RTF filter
>   (not used by Writer, but used by Calc and Impress)
> - tql seems to be used for left-aligned tabs in the shared RTF filter
>   (not used by Writer, but used by Calc and Impress)
>
> Just curious, why do you ask? If possible, please don't depend on these
> control words, it happened already in the past that such custom RTF
> extension had been removed and replaced by something that is part of the
> RTF spec (at least on the export side).
>
> Regards,
>
> Miklos
>
> ___
> LibreOffice mailing list
> [hidden email] 
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
> *signature.asc* (188 bytes) Download Attachment 
> 
>
>
> 
> If you reply to this email, your message will be added to the 
> discussion below:
> http://nabble.documentfoundation.org/RTF-support-tp3114982p4153555.html
> To unsubscribe from RTF support, click here 
> .
> NAML 
> 
>  
>
> 
>
>
> No virus found in this incoming message.
> Checked by AVG - www.avg.com 
> Version: 9.0.935 / Virus Database: 4365.1.1/9649 - Release Date: 07/02/15 
> 20:02:00
>
>   



No virus found in this outgoing message.
Checked by AVG - www.avg.com
Version: 9.0.935 / Virus Database: 4365.1.1/9649 - Release Date: 07/02/15 
20:02:00




--
View this message in context: 
http://nabble.documentfoundation.org/RTF-support-tp3114982p4153587.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 sax/source

[Michael Stahl]

 oox/source/docprop/docprophandler.cxx |   25 +
 oox/source/docprop/docprophandler.hxx |1 
 sax/source/fastparser/fastparser.cxx  |6 -
 sax/source/tools/fastserializer.cxx   |  155 +-
 sax/source/tools/fastserializer.hxx   |9 +
 5 files changed, 190 insertions(+), 6 deletions(-)

New commits:
commit 3c45bfb0cabf206f6217f1de9eb5cfa12b78e46f
Author: Michael Stahl 
Date:   Fri Jul 3 23:49:08 2015 +0200

sax: FastSaxSerializer well-formed element test in presence of ...

... the maMarkStack, which causes the order of calls to
startFastElement()/endFastElement() to differ from the order of the tags
that are written into the output.

This is an attempt to improve the assertions, but if an assertion fails
it's generally not obvious where the problem actually is since the
unpredictable order may cause the problem to be detected and reported
much later than its root cause.

Let's see if this finds any new problems in export testing.

Change-Id: I97699cc8ef9b18ea9f4f221d5210134feecf0336

diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index 10e7ab3..a2ba5c15 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -196,7 +196,10 @@ namespace sax_fastparser {
 }
 
 #ifdef DBG_UTIL
-m_DebugStartedElements.push(Element);
+if (mbMarkStackEmpty)
+m_DebugStartedElements.push(Element);
+else
+maMarkStack.top()->m_DebugStartedElements.push_back(Element);
 #endif
 
 writeBytes(sOpeningBracket, N_CHARS(sOpeningBracket));
@@ -213,10 +216,30 @@ namespace sax_fastparser {
 void FastSaxSerializer::endFastElement( ::sal_Int32 Element )
 {
 #ifdef DBG_UTIL
-assert(!m_DebugStartedElements.empty());
 // Well-formedness constraint: Element Type Match
-assert(Element == m_DebugStartedElements.top());
-m_DebugStartedElements.pop();
+if (mbMarkStackEmpty)
+{
+assert(!m_DebugStartedElements.empty());
+assert(Element == m_DebugStartedElements.top());
+m_DebugStartedElements.pop();
+}
+else
+{
+if (dynamic_cast(maMarkStack.top().get()))
+{
+// Sort is always well-formed fragment
+assert(!maMarkStack.top()->m_DebugStartedElements.empty());
+}
+if (maMarkStack.top()->m_DebugStartedElements.empty())
+{
+maMarkStack.top()->m_DebugEndedElements.push_back(Element);
+}
+else
+{
+assert(Element == 
maMarkStack.top()->m_DebugStartedElements.back());
+maMarkStack.top()->m_DebugStartedElements.pop_back();
+}
+}
 #endif
 
 writeBytes(sOpeningBracketAndSlash, N_CHARS(sOpeningBracketAndSlash));
@@ -324,17 +347,98 @@ namespace sax_fastparser {
 mbMarkStackEmpty = false;
 }
 
+#ifdef DBG_UTIL
+static void lcl_DebugMergeAppend(
+std::deque & rLeftEndedElements,
+std::deque & rLeftStartedElements,
+std::deque & rRightEndedElements,
+std::deque & rRightStartedElements)
+{
+while (!rRightEndedElements.empty())
+{
+if (rLeftStartedElements.empty())
+{
+rLeftEndedElements.push_back(rRightEndedElements.front());
+}
+else
+{
+assert(rLeftStartedElements.back() == 
rRightEndedElements.front());
+rLeftStartedElements.pop_back();
+}
+rRightEndedElements.pop_front();
+}
+while (!rRightStartedElements.empty())
+{
+rLeftStartedElements.push_back(rRightStartedElements.front());
+rRightStartedElements.pop_front();
+}
+}
+
+static void lcl_DebugMergePrepend(
+std::deque & rLeftEndedElements,
+std::deque & rLeftStartedElements,
+std::deque & rRightEndedElements,
+std::deque & rRightStartedElements)
+{
+while (!rLeftStartedElements.empty())
+{
+if (rRightEndedElements.empty())
+{
+rRightStartedElements.push_front(rLeftStartedElements.back());
+}
+else
+{
+assert(rRightEndedElements.front() == 
rLeftStartedElements.back());
+rRightEndedElements.pop_front();
+}
+rLeftStartedElements.pop_back();
+}
+while (!rLeftEndedElements.empty())
+{
+rRightEndedElements.push_front(rLeftEndedElements.back());
+rLeftEndedElements.pop_back();
+}
+}
+#endif
+
 void FastSaxSerializer::mergeTopMarks( sax_fastparser::MergeMarksEnum 
eMergeType )
 {
 SAL_WARN_IF(mbMarkStackEmpty, "sax", "Empty mark

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr

[Matthias Freund]

 icon-themes/sifr/sw/res/doublepage_10x22.png |binary
 icon-themes/sifr/sw/res/emptypage_10x14.png  |binary
 icon-themes/sifr/sw/res/twopages_10x24.png   |binary
 3 files changed

New commits:
commit 1ce188a6f3afc69bf2bfeb11d62e287101398884
Author: Matthias Freund 
Date:   Tue Jun 30 18:32:43 2015 +0200

tdf#92425 - Correct the inactive pageindicators

The inactive pageindicators had the same grey like the active ones, I 
correct
this and changed the dark grey into light grey.

Change-Id: Iea810d466504ceb80750c45358a01f8b8d3c8b9e
Reviewed-on: https://gerrit.libreoffice.org/16621
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
Reviewed-on: https://gerrit.libreoffice.org/16750
Tested-by: Yousuf Philips 

diff --git a/icon-themes/sifr/sw/res/doublepage_10x22.png 
b/icon-themes/sifr/sw/res/doublepage_10x22.png
index 44d78c3..27630e3 100644
Binary files a/icon-themes/sifr/sw/res/doublepage_10x22.png and 
b/icon-themes/sifr/sw/res/doublepage_10x22.png differ
diff --git a/icon-themes/sifr/sw/res/emptypage_10x14.png 
b/icon-themes/sifr/sw/res/emptypage_10x14.png
index f56c229..3a781f3 100644
Binary files a/icon-themes/sifr/sw/res/emptypage_10x14.png and 
b/icon-themes/sifr/sw/res/emptypage_10x14.png differ
diff --git a/icon-themes/sifr/sw/res/twopages_10x24.png 
b/icon-themes/sifr/sw/res/twopages_10x24.png
index 55c1ea4..c32ee06 100644
Binary files a/icon-themes/sifr/sw/res/twopages_10x24.png and 
b/icon-themes/sifr/sw/res/twopages_10x24.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source

[Bjoern Michaelsen]

 sw/qa/core/uwriter.cxx |7 +++
 sw/source/core/doc/doc.cxx |4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit d78b81b379333bd471c670bc9f49304f1d6f030a
Author: Bjoern Michaelsen 
Date:   Fri Jul 3 22:08:49 2015 +0200

tdf#92308: Dont crash on "File > Send > Email Document"

- crashed due to out-of-range index with empty vector
- kill pruposeless manual index fiddling for good
- add trivial test

Change-Id: Ic224c70f432d2b26718e05aa5a2742461cfb7bec
Reviewed-on: https://gerrit.libreoffice.org/16749
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 966a2aa..6cea3ba 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -109,6 +109,7 @@ public:
 void testFormulas();
 void testIntrusiveRing();
 void testClientModify();
+void testTdf92308();
 
 CPPUNIT_TEST_SUITE(SwDocTest);
 
@@ -141,6 +142,7 @@ public:
 CPPUNIT_TEST(testFormulas);
 CPPUNIT_TEST(testIntrusiveRing);
 CPPUNIT_TEST(testClientModify);
+CPPUNIT_TEST(testTdf92308);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1565,6 +1567,11 @@ void SwDocTest::testClientModify()
 CPPUNIT_ASSERT_EQUAL(aClient2.m_nNotifyCount,1);
 }
 
+void SwDocTest::testTdf92308()
+{
+CPPUNIT_ASSERT_EQUAL(m_pDoc->HasInvisibleContent(), false);
+}
+
 void SwDocTest::setUp()
 {
 BootstrapFixture::setUp();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index f1880db..2b82850 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1453,10 +1453,8 @@ bool SwDoc::HasInvisibleContent() const
 }
 }
 
-const SwSectionFormats& rSectFormats = GetSections();
-for( SwSectionFormats::size_type n = rSectFormats.size()-1; n; --n )
+for(auto pSectFormat : GetSections())
 {
-SwSectionFormat* pSectFormat = rSectFormats[ n ];
 // don't add sections in Undo/Redo
 if( !pSectFormat->IsInNodesArr())
 continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

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

New commits:
commit c59726e696b7a507f0b5e752a52e3ea7773c230f
Author: Michael Meeks 
Date:   Fri Jul 3 15:50:38 2015 +0100

tdf#92392 - tolerate Window::SetText post dispose.

Change-Id: I458f8e8665373d3e5ab9ed20e39783f4d34ca128

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 10d9e39..407087c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3185,7 +3185,7 @@ void Window::SetCursor( vcl::Cursor* pCursor )
 
 void Window::SetText( const OUString& rStr )
 {
-if (rStr == mpWindowImpl->maText)
+if (!mpWindowImpl || rStr == mpWindowImpl->maText)
 return;
 
 OUString oldTitle( mpWindowImpl->maText );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sc/source/ui/inc/anyrefdg.hxx  |1 +
 sc/source/ui/miscdlgs/anyrefdg.cxx |   10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a8a9b4f8381c3935bab96a713c8237381ffc5c93
Author: Michael Meeks 
Date:   Fri Jul 3 16:37:06 2015 +0100

tdf#92392 - Dispose ScFormulaReferenceHelper properly.

Release the accelerator, and cleanup global references.

Change-Id: Id9931527f1b6d89067bc1e520e521ccfa6e28197
Reviewed-on: https://gerrit.libreoffice.org/16740
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index bb6dd5b..c059ea9 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -74,6 +74,7 @@ class ScFormulaReferenceHelper
 public:
 ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings);
 ~ScFormulaReferenceHelper();
+void dispose();
 
 voidShowSimpleReference(const OUString& rStr);
 voidShowFormulaReference(const OUString& rStr);
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 45f93b2..3fcc966 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -65,17 +65,24 @@ 
ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi
 
 ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
 {
+dispose();
+}
+
+void ScFormulaReferenceHelper::dispose()
+{
 if (bAccInserted)
 Application::RemoveAccel( pAccel.get() );
+bAccInserted = false;
 
 // common cleanup for ScAnyRefDlg and ScFormulaDlg is done here
-
 HideReference();
 enableInput( true );
 
 ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
 if ( pInputHdl )
 pInputHdl->ResetDelayTimer();   // stop the timer for disabling the 
input line
+
+pAccel.reset();
 }
 
 void ScFormulaReferenceHelper::enableInput( bool bEnable )
@@ -831,6 +838,7 @@ void ScRefHandler::disposeRefHandler()
 m_rWindow.clear();
 pActiveWin.clear();
 LeaveRefMode();
+m_aHelper.dispose();
 }
 
 bool ScRefHandler::LeaveRefMode()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/qa/core/uwriter.cxx  |7 +++
 sw/qa/python/check_table.py |8 
 sw/source/core/doc/doc.cxx  |4 +---
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 6cadfe0f07659235c6438c345d501eca89b411d5
Author: Bjoern Michaelsen 
Date:   Fri Jul 3 22:08:49 2015 +0200

tdf#92308: Dont crash on "File > Send > Email Document"

- crashed due to out-of-range index with empty vector
- kill pruposeless manual index fiddling for good
- add trivial test

Change-Id: Ic224c70f432d2b26718e05aa5a2742461cfb7bec

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index e312d5c..b74dbea 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -111,6 +111,7 @@ public:
 void testIntrusiveRing();
 void testClientModify();
 void test64kPageDescs();
+void testTdf92308();
 
 CPPUNIT_TEST_SUITE(SwDocTest);
 
@@ -144,6 +145,7 @@ public:
 CPPUNIT_TEST(testIntrusiveRing);
 CPPUNIT_TEST(testClientModify);
 CPPUNIT_TEST(test64kPageDescs);
+CPPUNIT_TEST(testTdf92308);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1615,6 +1617,11 @@ void SwDocTest::test64kPageDescs()
 CPPUNIT_ASSERT( nPos == 0 );
 }
 
+void SwDocTest::testTdf92308()
+{
+CPPUNIT_ASSERT_EQUAL(m_pDoc->HasInvisibleContent(), false);
+}
+
 void SwDocTest::setUp()
 {
 BootstrapFixture::setUp();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 75e1b32..61fe589 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1450,10 +1450,8 @@ bool SwDoc::HasInvisibleContent() const
 }
 }
 
-const SwSectionFormats& rSectFormats = GetSections();
-for( SwSectionFormats::size_type n = rSectFormats.size()-1; n; --n )
+for(auto pSectFormat : GetSections())
 {
-SwSectionFormat* pSectFormat = rSectFormats[ n ];
 // don't add sections in Undo/Redo
 if( !pSectFormat->IsInNodesArr())
 continue;
commit 53e7011084e6f03bf2e9dc6f8e1f45224707
Author: Bjoern Michaelsen 
Date:   Wed Jul 1 13:45:23 2015 +0200

be picky and check explicit implementation name

- the previous code tried to avoid breakage from changing an
  implementation detail
- this turns out to be harder than expected in a Python2/3 portable way
- also it would mean the intentional drive-by documentation of the
  expected implementation name will at least not bit rot now

Change-Id: I5972d0e79ef64abe30573182c5e23268e4830ade

diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 2996614..a5a8308 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -356,7 +356,7 @@ class CheckTable(unittest.TestCase):
 xTable.ChartRowAsLabel = False
 xTable.Data = ((1,2,3), (4,5,6), (7,8,9), (10,11,12))
 xRows = xTable.Rows
-self.assertIs(type(xRows.ImplementationName), type('SwXTableRows')) # 
not testing value, just type and coverage
+self.assertEquals(xRows.ImplementationName, 'SwXTableRows')
 self.assertTrue(xRows.supportsService('com.sun.star.text.TableRows'))
 self.assertFalse(xRows.supportsService('foo'))
 self.assertIn('com.sun.star.text.TableRows', 
xRows.SupportedServiceNames)
@@ -364,7 +364,7 @@ class CheckTable(unittest.TestCase):
 xRows.removeByIndex(1, 2)
 self.assertEqual( xTable.Data, ((1,2,3), (10,11,12)))
 xCols = xTable.Columns
-self.assertIs(type(xCols.ImplementationName), type('SwXTableColumns')) 
# not testing value, just type and coverage
+self.assertEquals(xCols.ImplementationName, 'SwXTableColumns')
 
self.assertTrue(xCols.supportsService('com.sun.star.text.TableColumns'))
 self.assertFalse(xCols.supportsService('foo'))
 self.assertIn('com.sun.star.text.TableColumns', 
xCols.SupportedServiceNames)
@@ -427,7 +427,7 @@ class CheckTable(unittest.TestCase):
 self.assertTrue(xTable.Name == 'Table1')
 self.assertIn('com.sun.star.text.GenericTextDocument', 
xDoc.SupportedServiceNames)
 xChartdataprovider = 
xDoc.createInstance('com.sun.star.chart2.data.DataProvider')
-self.assertIs(type(xChartdataprovider.ImplementationName), 
type('SwChartDataProvider')) # not testing value, just type and coverage
+self.assertEquals(xChartdataprovider.ImplementationName, 
'SwChartDataProvider')
 
self.assertTrue(xChartdataprovider.supportsService('com.sun.star.chart2.data.DataProvider'))
 self.assertFalse(xChartdataprovider.supportsService('foo'))
 self.assertIn('com.sun.star.chart2.data.DataProvider', 
xChartdataprovider.SupportedServiceNames)
@@ -440,7 +440,7 @@ class CheckTable(unittest.TestCase):
 expectedCellrange = ('A1:A2', 'B1:B2', 'C1:C2')
 for col in range(3):
 xSeq = xDataSource.DataSequences[col].Values
-self.assertIs(type(xSeq.ImplementationName), 
type('SwChartDataSequence')) # not

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/sifr

[Matthias Freund]

 icon-themes/sifr/cmd/lc_presentationcurrentslide.png |binary
 icon-themes/sifr/cmd/lc_resetattributes.png  |binary
 icon-themes/sifr/cmd/lc_slidemasterpage.png  |binary
 icon-themes/sifr/cmd/sc_resetattributes.png  |binary
 icon-themes/sifr/cmd/sc_slidemasterpage.png  |binary
 5 files changed

New commits:
commit 860f983e8982a66cfe2e896604c3dcc40a608f9c
Author: Matthias Freund 
Date:   Mon Jun 29 21:57:37 2015 +0200

tdf#75256 New sifr icons - slidemasterpage and resetattributes

and a little change in lc_presentationcurrentslide, the pauseplay sign was
not correctly aligned and blurried.

Change-Id: Ia657191f37e202a93476203c9097275835b281ac
Reviewed-on: https://gerrit.libreoffice.org/16597
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit ff06895b3e3a664c2238e358c02ae5b755e2ce06)
Reviewed-on: https://gerrit.libreoffice.org/16670
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/sifr/cmd/lc_presentationcurrentslide.png 
b/icon-themes/sifr/cmd/lc_presentationcurrentslide.png
index 5772daf..fa87bcd 100644
Binary files a/icon-themes/sifr/cmd/lc_presentationcurrentslide.png and 
b/icon-themes/sifr/cmd/lc_presentationcurrentslide.png differ
diff --git a/icon-themes/sifr/cmd/lc_resetattributes.png 
b/icon-themes/sifr/cmd/lc_resetattributes.png
new file mode 100644
index 000..e2a841e
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_resetattributes.png differ
diff --git a/icon-themes/sifr/cmd/lc_slidemasterpage.png 
b/icon-themes/sifr/cmd/lc_slidemasterpage.png
new file mode 100644
index 000..f1b9509
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_slidemasterpage.png differ
diff --git a/icon-themes/sifr/cmd/sc_resetattributes.png 
b/icon-themes/sifr/cmd/sc_resetattributes.png
new file mode 100644
index 000..dfaa26d
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_resetattributes.png differ
diff --git a/icon-themes/sifr/cmd/sc_slidemasterpage.png 
b/icon-themes/sifr/cmd/sc_slidemasterpage.png
new file mode 100644
index 000..80f5d0f
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_slidemasterpage.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/breeze

[andreask]

 icon-themes/breeze/cmd/lc_iconsetformatdialog.png |binary
 icon-themes/breeze/svx/res/markers.png|binary
 2 files changed

New commits:
commit 9265d96871d1beddf21916bfe15d7643ef7a8071
Author: andreask 
Date:   Wed Jul 1 01:03:29 2015 +0200

Breeze: update marker and insertformatdialogue

Change-Id: I76456d5e9a687ccf2f8b8cb9f64802de866206a8
Reviewed-on: https://gerrit.libreoffice.org/16635
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 9e4054f72185032a058544d64a09fe8384b56733)
Reviewed-on: https://gerrit.libreoffice.org/1
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/breeze/cmd/lc_iconsetformatdialog.png 
b/icon-themes/breeze/cmd/lc_iconsetformatdialog.png
index 1d8cefa..2403f3e 100644
Binary files a/icon-themes/breeze/cmd/lc_iconsetformatdialog.png and 
b/icon-themes/breeze/cmd/lc_iconsetformatdialog.png differ
diff --git a/icon-themes/breeze/svx/res/markers.png 
b/icon-themes/breeze/svx/res/markers.png
index 16b9877..95c67f3 100644
Binary files a/icon-themes/breeze/svx/res/markers.png and 
b/icon-themes/breeze/svx/res/markers.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 include/sfx2/thumbnailview.hxx|9 +
 include/sfx2/thumbnailviewitem.hxx|1 +
 sfx2/source/control/recentdocsview.cxx|1 +
 sfx2/source/control/templateabstractview.cxx  |2 +-
 sfx2/source/control/templatecontaineritem.cxx |   12 
 sfx2/source/control/templatedefaultview.cxx   |   21 +
 sfx2/source/control/templateviewitem.cxx  |8 ++--
 sfx2/source/control/thumbnailview.cxx |6 ++
 sfx2/source/control/thumbnailviewitem.cxx |6 +-
 9 files changed, 42 insertions(+), 24 deletions(-)

New commits:
commit 56c1103d6a83b46d5cacdc9d0e249d2959256f76
Author: Jan Holesovsky 
Date:   Tue Jun 30 17:53:49 2015 +0200

tdf#90452: Templates should adhere to the recent docs colors too.

Change-Id: I5df89581796eca4e48e0a305d4319e4674f8dd87
Reviewed-on: https://gerrit.libreoffice.org/16625
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 9000d32..bf0ea16 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -324,10 +324,11 @@ protected:
 bool mbIsTransientChildrenDisabled : 1;
 bool mbHasVisibleItems : 1;
 bool mbShowTooltips : 1;
-Color maFillColor;
-Color maTextColor;
-Color maHighlightColor;
-Color maHighlightTextColor;
+Color maFillColor;  ///< Background color of the thumbnail 
view widget.
+Color maTextColor;  ///< Text color.
+Color maHighlightColor; ///< Color of the highlight (background) 
of the hovered / selected item.
+Color maHighlightTextColor; ///< Color of the text for the higlighted 
item.
+double mfHighlightTransparence; ///< Transparence of the highlight.
 
 Link<> maItemStateHdl;
 ThumbnailItemAttributes* mpItemAttrs;
diff --git a/include/sfx2/thumbnailviewitem.hxx 
b/include/sfx2/thumbnailviewitem.hxx
index ab2194b..8929b8e 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -60,6 +60,7 @@ struct ThumbnailItemAttributes
 basegfx::BColor aTextColor;
 basegfx::BColor aHighlightColor;
 basegfx::BColor aHighlightTextColor;
+double fHighlightTransparence;
 basegfx::B2DVector aFontSize;
 drawinglayer::attribute::FontAttribute aFontAttr;
 };
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 471645e..69952e1 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -74,6 +74,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
 maTextColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get());
 maHighlightColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get());
 maHighlightTextColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get());
+mfHighlightTransparence = 0.25;
 }
 
 VCL_BUILDER_FACTORY(RecentDocsView)
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index dbd2379..11b985d 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -312,7 +312,7 @@ void TemplateAbstractView::Paint(vcl::RenderContext& 
rRenderContext, const Recta
 drawinglayer::primitive2d::Primitive2DSequence aSeq(1);
 aSeq[0] = drawinglayer::primitive2d::Primitive2DReference(
 new 
PolyPolygonColorPrimitive2D(B2DPolyPolygon(Polygon(aRect).getB2DPolygon()),
-BColor(1.0, 1.0, 1.0)));
+maFillColor.getBColor()));
 
 const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
 std::unique_ptr mpProcessor(
diff --git a/sfx2/source/control/templatecontaineritem.cxx 
b/sfx2/source/control/templatecontaineritem.cxx
index 16e05d1..b4f2f63 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace basegfx;
 using namespace basegfx::tools;
@@ -75,10 +74,7 @@ void TemplateContainerItem::Paint 
(drawinglayer::processor2d::BaseProcessor2D *p
 aFillColor = pAttrs->aHighlightColor;
 
 if (mbHover)
-{
-const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
-fTransparence = 
aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01;
-}
+fTransparence = pAttrs->fHighlightTransparence;
 
 aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new 
PolyPolygonSelectionPrimitive2D(

B2DPolyPolygon(Polygon(maDrawArea,5,5).getB2DPolygon()),
@@ -88,9 +84,9 @@ void TemplateContainerItem::Paint 
(drawinglayer::processor2d::BaseProcessor2D *p
true));
 

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

[Jan Holesovsky]

 sfx2/source/control/recentdocsview.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bb1ae405750be24ddbcccb9bb0baf0b12efe680e
Author: Jan Holesovsky 
Date:   Tue Jun 30 16:46:02 2015 +0200

tdf#90452: The correct color for the message when there's no recent file 
yet.

Change-Id: I5a990643903946ea339136fbc514ca8cb90fa34e
Reviewed-on: https://gerrit.libreoffice.org/16624
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 1ede436..471645e 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -267,8 +267,9 @@ void RecentDocsView::Paint(vcl::RenderContext& 
rRenderContext, const Rectangle &
 if (mItemList.size() == 0)
 {
 // No recent files to be shown yet. Show a welcome screen.
-rRenderContext.Push(PushFlags::FONT);
+rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
 SetMessageFont(rRenderContext);
+SetTextColor(maTextColor);
 
 long nTextHeight = rRenderContext.GetTextHeight();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sfx2/source/dialog/backingwindow.cxx |   14 
 sfx2/source/dialog/backingwindow.hxx |4 -
 sfx2/uiconfig/ui/startcenter.ui  |  104 +--
 3 files changed, 29 insertions(+), 93 deletions(-)

New commits:
commit abbccd9e1c0f5ec231bf8b53878ce1f043ef26e1
Author: Jan Holesovsky 
Date:   Tue Jun 30 16:28:27 2015 +0200

tdf#90452: Remove the frame around the Help and Extension buttons.

Change-Id: I86d2daec6dcbd6af3a8da1b8329417bae46c8079
Reviewed-on: https://gerrit.libreoffice.org/16623
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 5430c76..e58505b 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -143,10 +143,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 get(mpAllButtonsBox, "all_buttons_box");
 get(mpButtonsBox, "buttons_box");
 get(mpSmallButtonsBox, "small_buttons_box");
-get(mpThinBox1, "thin_box1");
-get(mpThinBox2, "thin_box2");
-get(mpHelpBox, "help_box");
-get(mpExtensionsBox, "extensions_box");
 
 get(mpAllRecentThumbnails, "all_recent");
 get(mpLocalView, "local_view");
@@ -233,10 +229,6 @@ void BackingWindow::dispose()
 mpAllButtonsBox.clear();
 mpButtonsBox.clear();
 mpSmallButtonsBox.clear();
-mpThinBox1.clear();
-mpThinBox2.clear();
-mpHelpBox.clear();
-mpExtensionsBox.clear();
 mpAllRecentThumbnails.clear();
 mpLocalView.clear();
 vcl::Window::dispose();
@@ -323,8 +315,6 @@ void BackingWindow::initControls()
 
 mpAllButtonsBox->SetBackground(aButtonsBackground);
 mpSmallButtonsBox->SetBackground(aButtonsBackground);
-mpHelpBox->SetBackground(aButtonsBackground);
-mpExtensionsBox->SetBackground(aButtonsBackground);
 
 // motif image under the buttons
 Wallpaper aWallpaper(get("motif")->GetImage().GetBitmapEx());
@@ -333,10 +323,6 @@ void BackingWindow::initControls()
 
 mpButtonsBox->SetBackground(aWallpaper);
 
-// thin white rectangle around the Help and Extensions buttons
-mpThinBox1->SetBackground(maButtonsTextColor);
-mpThinBox2->SetBackground(maButtonsTextColor);
-
 Resize();
 
 // compute the menubar height
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 8ef01fb..c2c1462 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -78,10 +78,6 @@ class BackingWindow : public vcl::Window, public 
VclBuilderContainer
 VclPtr mpAllButtonsBox;
 VclPtr mpButtonsBox;
 VclPtr mpSmallButtonsBox;
-VclPtr mpThinBox1;
-VclPtr mpThinBox2;
-VclPtr mpHelpBox;
-VclPtr mpExtensionsBox;
 
 VclPtr mpAllRecentThumbnails;
 VclPtr mpLocalView;
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 2362028..57b7198 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,8 +1,8 @@
 
-
+
 
   
-  
+  
   
 True
 False
@@ -353,53 +353,35 @@
   
 
 
+  
+True
+False
+  
+  
+False
+True
+1
+  
+
+
   
 True
 False
 6
 6
-6
 6
 6
 True
 
-  
+  
+gtk-help
 True
-False
-vertical
-
-  
-True
-False
-1
-1
-1
-1
-vertical
-
-  
-gtk-help
-True
-True
-True
-True
-none
-True
-True
-  
-  
-False
-True
-0
-  
-
-  
-  
-False
-True
-0
-  
-
+True
+True
+True
+none
+True
+True
   
   
 False
@@ -408,42 +390,14 @@
   
 
 
- 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2 officecfg/registry sfx2/source

[Jan Holesovsky]

 include/sfx2/thumbnailview.hxx |   11 --
 include/sfx2/thumbnailviewitem.hxx |2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   39 
 sfx2/source/control/recentdocsview.cxx |8 +
 sfx2/source/control/thumbnailview.cxx  |   57 +++--
 sfx2/source/control/thumbnailviewitem.cxx  |   24 ++---
 sfx2/source/dialog/backingwindow.cxx   |   19 ++--
 sfx2/source/dialog/backingwindow.hxx   |3 
 8 files changed, 91 insertions(+), 72 deletions(-)

New commits:
commit c3a36a6761c8edbeb5f3af236d2f54c3b6dc8072
Author: Jan Holesovsky 
Date:   Tue Jun 30 16:13:23 2015 +0200

tdf#90452: Implement the new design of the startcenter.

See the comment 45 in the bug for the agreed design.

Change-Id: I428f339df48f530f606525434a4a2be8a79acaab
Reviewed-on: https://gerrit.libreoffice.org/16622
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index b7375dd..9000d32 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -232,10 +232,6 @@ public:
 
 void ShowTooltips( bool bShowTooltips );
 
-Color GetColor() const { return maColor; }
-
-bool IsColor() const { return maColor.GetTransparency() == 0; }
-
 void filterItems (const boost::function 
&func);
 
 void sortItems (const boost::function maItemStateHdl;
 ThumbnailItemAttributes* mpItemAttrs;
diff --git a/include/sfx2/thumbnailviewitem.hxx 
b/include/sfx2/thumbnailviewitem.hxx
index 48238af..ab2194b 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -57,7 +57,9 @@ struct ThumbnailItemAttributes
 {
 sal_uInt32 nMaxTextLength;
 basegfx::BColor aFillColor;
+basegfx::BColor aTextColor;
 basegfx::BColor aHighlightColor;
+basegfx::BColor aHighlightTextColor;
 basegfx::B2DVector aFontSize;
 drawinglayer::attribute::FontAttribute aFontAttr;
 };
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 0bc0dc8..6f0dcb7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3570,11 +3570,46 @@
   0
 
 
-  
+  
   
 Specifies the background color of the start center.
   
-  7514196
+  14540253
+
+
+  
+  
+Specifies the text color of the buttons in the start 
center.
+  
+  3355443
+
+
+  
+  
+Specifies the background color of the thumbnail area in the 
start center.
+  
+  6710886
+
+
+  
+  
+Specifies the text color of the thumbnail area in the start 
center.
+  
+  15658734
+
+
+  
+  
+Specifies the background color of the highlight of a 
thumbnail in the start center.
+  
+  14540253
+
+
+  
+  
+Specifies the text color of the highlight of a thumbnail in 
the start center.
+  
+  3355443
 
   
 
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 0c0dad6..1ede436 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -67,6 +69,11 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
 SetStyle(GetStyle() | WB_VSCROLL);
 setItemMaxTextLength( mnItemMaxTextLength );
 setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight, 
mnItemPadding );
+
+maFillColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get());
+maTextColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get());
+maHighlightColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get());
+maHighlightTextColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get());
 }
 
 VCL_BUILDER_FACTORY(RecentDocsView)
@@ -297,7 +304,6 @@ void RecentDocsView::LoseFocus()
 ThumbnailView::LoseFocus();
 }
 
-
 void RecentDocsView::Clear()
 {
 Invalidate();
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 08675c0..b9f50d9 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/t

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf87460.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
 writerfilter/CppunitTest_writerfilter_misc.mk|1 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   12 ++--
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |4 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|8 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|3 ++-
 7 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit b21ed9a42321dd4b22b70bfc66b7d401f2d22cd4
Author: Miklos Vajna 
Date:   Tue Jun 23 09:03:10 2015 +0200

tdf#87460 DOCX import: fix missing endnote in floattable

Writer doesn't support foot or endnotes in TextFrames, so they are not
supported in OOXML floattables, either. In the past, floattables were
imported as normal tables, that's how this worked. Restore the old
situation till the core limitation is there, so we at least don't
regress.

(cherry picked from commit 2fe248f2b36d541c0d243a620c217058a50a9d5d)

Conflicts:
writerfilter/source/dmapper/DomainMapperTableHandler.hxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx

Change-Id: I4eb62617e3131176f7371e9ca69f11bc9e948a0b
Reviewed-on: https://gerrit.libreoffice.org/16690
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf87460.docx 
b/sw/qa/extras/ooxmlimport/data/tdf87460.docx
new file mode 100644
index 000..c443dbe
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf87460.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4a7a8bc..99417ce 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2590,6 +2590,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf8255, "tdf8255.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf87460, "tdf87460.docx")
+{
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xEndnotesSupplier(xTextDocument, 
uno::UNO_QUERY);
+uno::Reference xEndnotes = 
xEndnotesSupplier->getEndnotes();
+// This was 0: endnote was lost on import.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xEndnotes->getCount());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk 
b/writerfilter/CppunitTest_writerfilter_misc.mk
index 3f4fd80..f563c7a 100644
--- a/writerfilter/CppunitTest_writerfilter_misc.mk
+++ b/writerfilter/CppunitTest_writerfilter_misc.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_set_include,writerfilter_misc,\
 $$(INCLUDE) \
 -I$(SRCDIR)/writerfilter/inc \
 -I$(SRCDIR)/writerfilter/source \
+-I$(SRCDIR)/writerfilter/source/dmapper \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,writerfilter_misc,boost_headers))
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index c1487b4..468b38a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -55,7 +55,8 @@ 
DomainMapperTableHandler::DomainMapperTableHandler(TextReference_t const& xText,
 : m_xText(xText),
 m_rDMapper_Impl( rDMapper_Impl ),
 m_nCellIndex(0),
-m_nRowIndex(0)
+m_nRowIndex(0),
+m_bHadFootOrEndnote(false)
 {
 }
 
@@ -1078,7 +1079,8 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 }
 
 // If we have a table with a start and an end position, we should make 
it a floating one.
-if (xTable.is() && xStart.is() && xEnd.is())
+// Unless the table had a foot or endnote, as Writer doesn't support 
those in TextFrames.
+if (xTable.is() && xStart.is() && xEnd.is() && !m_bHadFootOrEndnote)
 {
 uno::Reference xTableProperties(xTable, 
uno::UNO_QUERY);
 bool bIsRelative = false;
@@ -1123,6 +1125,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 m_aTableProperties.reset();
 m_aCellProperties.clear();
 m_aRowProperties.clear();
+m_bHadFootOrEndnote = false;
 
 #ifdef DEBUG_WRITERFILTER
 dmapper_logger->endElement();
@@ -1203,6 +1206,11 @@ void DomainMapperTableHandler::endCell(const Handle_t & 
end)
 ++m_nCellIndex;
 }
 
+void DomainMapperTableHandler::setHadFootOrEndnote(bool bHadFootOrEndnote)
+{
+m_bHadFootOrEndnote = bHadFootOrEndnote;
+}
+
 }}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index f1fe804..18eb49a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapp

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst external/curl

[Michael Stahl]

 download.lst  |4 ++--
 external/curl/curl-7.26.0_win-proxy.patch |9 +++--
 external/curl/curl-msvc-schannel.patch.1  |4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit f5d7002acce458dc28cb1f02c244fb3888b2a7c0
Author: Michael Stahl 
Date:   Wed Jul 1 00:04:32 2015 +0200

curl: upgrade to release 7.43.0

Change-Id: Ic16111f21625fc510e79bba8122eaa60662f7a59
(cherry picked from commit 65327d615b64f487842e4c5d0ee7290f9c823a0f)
Reviewed-on: https://gerrit.libreoffice.org/16726
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 0896f3e..05d9007 100644
--- a/download.lst
+++ b/download.lst
@@ -28,8 +28,8 @@ export COLLADA2GLTF_TARBALL := 
4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
 export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
-export CURL_TARBALL := curl-7.36.0.tar.bz2
+export CURL_MD5SUM := 11bddbb452a8b766b932f859aaeeed39
+export CURL_TARBALL := curl-7.43.0.tar.bz2
 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
index 26c42f7..99402a4 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -117,14 +117,11 @@
char proxy_env[128];
  
no_proxy=curl_getenv("no_proxy");
-@@ -4189,9 +4265,9 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4189,6 +4265,7 @@ static char *detect_proxy(struct connectdata *conn)
  }
} /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified
 non-proxy */
 +#endif /* WIN32 */
-   if(no_proxy)
- free(no_proxy);
--
- #else /* !CURL_DISABLE_HTTP */
+   free(no_proxy);
  
-   (void)conn;
+ #else /* !CURL_DISABLE_HTTP */
diff --git a/external/curl/curl-msvc-schannel.patch.1 
b/external/curl/curl-msvc-schannel.patch.1
index 68af66d..1091a76 100644
--- a/external/curl/curl-msvc-schannel.patch.1
+++ b/external/curl/curl-msvc-schannel.patch.1
@@ -11,11 +11,11 @@ MSVC: use WNT native Schannel SSL/TLS implementation
  CFGSET = TRUE
  RESOURCE = $(DIROBJ)\libcurl.res
  !ENDIF
-@@ -411,7 +411,7 @@
+@@ -427,7 +427,7 @@
  TARGET = $(LIBCURL_DYN_LIB_DBG)
  DIROBJ = $(CFG)
  LNK= $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) 
/IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)
--CC = $(CCDEBUG) $(RTLIBD) 
+-CC = $(CCDEBUG) $(RTLIBD)
 +CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSWINSSL)
  CFGSET = TRUE
  RESOURCE = $(DIROBJ)\libcurl.res
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - canvas/source

[Christian Lohmaier]

 canvas/source/vcl/spritecanvas.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3228c66b0a10124d60f4671ab70fa42f97e7529
Author: Christian Lohmaier 
Date:   Thu Jul 2 19:35:43 2015 +0200

tdf#91574 fix presenter console not displayed

The bool simplification from 3ac5138cfc01c1795ae05963fa4e5a6c7d22f4de
accidentally changed the logic of the return statement

Change-Id: Id6075356184e340dc970d2e59d1fb1d1a173d0a7
Reviewed-on: https://gerrit.libreoffice.org/16748
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/canvas/source/vcl/spritecanvas.cxx 
b/canvas/source/vcl/spritecanvas.cxx
index bcfe42d..91e2103 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -145,7 +145,7 @@ namespace vclcanvas
 // avoid repaints on hidden window (hidden: not mapped to
 // screen). Return failure, since the screen really has _not_
 // been updated (caller should try again later)
-return !mbIsVisible && maCanvasHelper.updateScreen(bUpdateAll,
+return mbIsVisible && maCanvasHelper.updateScreen(bUpdateAll,
   
mbSurfaceDirty);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 canvas/source/vcl/spritecanvas.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f96b38ddda1759023e6021511d6d660abf98a54e
Author: Christian Lohmaier 
Date:   Thu Jul 2 19:35:43 2015 +0200

tdf#91574 fix presenter console not displayed

The bool simplification from 3ac5138cfc01c1795ae05963fa4e5a6c7d22f4de
accidentally changed the logic of the return statement

Change-Id: Id6075356184e340dc970d2e59d1fb1d1a173d0a7
Reviewed-on: https://gerrit.libreoffice.org/16724
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/canvas/source/vcl/spritecanvas.cxx 
b/canvas/source/vcl/spritecanvas.cxx
index bcfe42d..91e2103 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -145,7 +145,7 @@ namespace vclcanvas
 // avoid repaints on hidden window (hidden: not mapped to
 // screen). Return failure, since the screen really has _not_
 // been updated (caller should try again later)
-return !mbIsVisible && maCanvasHelper.updateScreen(bUpdateAll,
+return mbIsVisible && maCanvasHelper.updateScreen(bUpdateAll,
   
mbSurfaceDirty);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/sifr

[Matthias Freund]

 icon-themes/sifr/sw/res/doublepage_10x22.png |binary
 icon-themes/sifr/sw/res/emptypage_10x14.png  |binary
 icon-themes/sifr/sw/res/twopages_10x24.png   |binary
 3 files changed

New commits:
commit f223d5f0bd812de3e4724bb2cf5124c54a464e86
Author: Matthias Freund 
Date:   Tue Jun 30 18:32:43 2015 +0200

tdf#92425 - Correct the inactive pageindicators

The inactive pageindicators had the same grey like the active ones, I 
correct
this and changed the dark grey into light grey.

Change-Id: Iea810d466504ceb80750c45358a01f8b8d3c8b9e
Reviewed-on: https://gerrit.libreoffice.org/16621
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit c6483666232a231446190d5c256857db45c5e4cc)
Reviewed-on: https://gerrit.libreoffice.org/16735
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/sifr/sw/res/doublepage_10x22.png 
b/icon-themes/sifr/sw/res/doublepage_10x22.png
index ccdf656..27630e3 100644
Binary files a/icon-themes/sifr/sw/res/doublepage_10x22.png and 
b/icon-themes/sifr/sw/res/doublepage_10x22.png differ
diff --git a/icon-themes/sifr/sw/res/emptypage_10x14.png 
b/icon-themes/sifr/sw/res/emptypage_10x14.png
index aae3865..3a781f3 100644
Binary files a/icon-themes/sifr/sw/res/emptypage_10x14.png and 
b/icon-themes/sifr/sw/res/emptypage_10x14.png differ
diff --git a/icon-themes/sifr/sw/res/twopages_10x24.png 
b/icon-themes/sifr/sw/res/twopages_10x24.png
index 9aa128e..c32ee06 100644
Binary files a/icon-themes/sifr/sw/res/twopages_10x24.png and 
b/icon-themes/sifr/sw/res/twopages_10x24.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sfx2/source/control/unoctitm.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 7ee52080ba07b42addfbb2d038fcff711d0fb64c
Author: Jan Holesovsky 
Date:   Fri Jul 3 20:35:30 2015 +0200

tdf#92528: Saving of usage info can happen very late in the tear down.

Change-Id: Id545f3447472a8e6ee137a6630ee14b45a45d673
Reviewed-on: https://gerrit.libreoffice.org/16746
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1ab2b53..bba52c6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -598,11 +598,14 @@ class UsageInfo {
 
 typedef std::map UsageMap;
 
+/// Are we collecting the info?  We cache the value because the call to 
save can happen very late.
+bool mbIsCollecting;
+
 /// Command vs. how many times it was used
 UsageMap maUsage;
 
 public:
-UsageInfo()
+UsageInfo() : mbIsCollecting(false)
 {
 }
 
@@ -616,6 +619,9 @@ public:
 
 /// Save the usage data for the next session.
 void save();
+
+/// Modify the flag whether we are collecting.
+void setCollecting(bool bIsCollecting) { mbIsCollecting = bIsCollecting; }
 };
 
 void UsageInfo::increment(const OUString &rCommand)
@@ -630,7 +636,7 @@ void UsageInfo::increment(const OUString &rCommand)
 
 void UsageInfo::save()
 {
-if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+if (!mbIsCollecting)
 return;
 
 // TODO - do a real saving here, not only dump to the screen
@@ -647,7 +653,9 @@ class theUsageInfo : public rtl::Static {};
 /// Extracts information about the command + args, and stores that.
 void collectUsageInformation(const util::URL& rURL, const 
uno::Sequence& rArgs)
 {
-if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+bool bCollecting = 
officecfg::Office::Common::Misc::CollectUsageInformation::get();
+theUsageInfo::get().setCollecting(bCollecting);
+if (!bCollecting)
 return;
 
 OUStringBuffer aBuffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: HelpAuthoring.oxt: An easy way to edit help files

[Sophie Gautier]

Hi Kendy

Le 3 juil. 2015 20:16, "Jan Holesovsky"  a écrit :
>
> Hi Sophie,
>
> Sophie Gautier píše v Pá 03. 07. 2015 v 18:57 +0200:
>
> >
> > Maybe we should merge the page you asked me to write some times ago
> > https://wiki.documentfoundation.org/HelpContent

So what should I do with that page? Delete or merge?
> >
> > I've begin to write a simplified guide more complete than what I wrote
> > on the wiki
>
> Ah great - thanks! :-)

I'll work on it in August if there is some interest
>
> > There is also the two extra files that will help to locate the help
> > files to modify that we should decide where to put.
>
> No idea what they are for, can you explain?  The extension seems to work
> for me even without them, but I probably don't understand correctly how
> exactly are they supposed to be used.

The extensions doesn't need them. They were used by the help authors anb
have been available for l10n purpose.  As written in the wiki, one adds an
index of the help files named as they appear in the sources. The second one
add the tag IDs of the strings. These two files allow you to quickly locate
the files you want to work on as the help page displays the full path of
the file.
The ID let you know if it's an embedded paragraph, a link or a full text
and its type (section, text, title...), so the tag and the style you have
to use when writing with the .oxt/template
>
> > Also is the modified template on git?
>
> There is some template in the .oxt itself that Olivier modified I think,
> but best if you talk the details with him, he's done all the heavy
> lifting there :-)

Ok, the template I use works too, but I'll check with him.

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

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

[Jan Holesovsky]

 sfx2/source/control/unoctitm.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 94b38840f5e4072577a1e709cebadd746621aacc
Author: Jan Holesovsky 
Date:   Fri Jul 3 20:35:30 2015 +0200

tdf#92528: Saving of usage info can happen very late in the tear down.

Change-Id: Id545f3447472a8e6ee137a6630ee14b45a45d673

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 56a8207..c35dea9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -598,11 +598,14 @@ class UsageInfo {
 
 typedef std::map UsageMap;
 
+/// Are we collecting the info?  We cache the value because the call to 
save can happen very late.
+bool mbIsCollecting;
+
 /// Command vs. how many times it was used
 UsageMap maUsage;
 
 public:
-UsageInfo()
+UsageInfo() : mbIsCollecting(false)
 {
 }
 
@@ -616,6 +619,9 @@ public:
 
 /// Save the usage data for the next session.
 void save();
+
+/// Modify the flag whether we are collecting.
+void setCollecting(bool bIsCollecting) { mbIsCollecting = bIsCollecting; }
 };
 
 void UsageInfo::increment(const OUString &rCommand)
@@ -630,7 +636,7 @@ void UsageInfo::increment(const OUString &rCommand)
 
 void UsageInfo::save()
 {
-if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+if (!mbIsCollecting)
 return;
 
 // TODO - do a real saving here, not only dump to the screen
@@ -647,7 +653,9 @@ class theUsageInfo : public rtl::Static {};
 /// Extracts information about the command + args, and stores that.
 void collectUsageInformation(const util::URL& rURL, const 
uno::Sequence& rArgs)
 {
-if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+bool bCollecting = 
officecfg::Office::Common::Misc::CollectUsageInformation::get();
+theUsageInfo::get().setCollecting(bCollecting);
+if (!bCollecting)
 return;
 
 OUStringBuffer aBuffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: HelpAuthoring.oxt: An easy way to edit help files

[Jan Holesovsky]

Hi Sophie,

Sophie Gautier píše v Pá 03. 07. 2015 v 18:57 +0200:

> 
> Maybe we should merge the page you asked me to write some times ago
> https://wiki.documentfoundation.org/HelpContent
> 
> I've begin to write a simplified guide more complete than what I wrote
> on the wiki

Ah great - thanks! :-)

> There is also the two extra files that will help to locate the help
> files to modify that we should decide where to put.

No idea what they are for, can you explain?  The extension seems to work
for me even without them, but I probably don't understand correctly how
exactly are they supposed to be used.

> Also is the modified template on git?

There is some template in the .oxt itself that Olivier modified I think,
but best if you talk the details with him, he's done all the heavy
lifting there :-)

All the best,
Kendy


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

[GSoC] Improve user experience with CMIS – Weekly report #6

[Szymon Kłos]

My work this week:
* I integrated my dialog with FileDialogHelper. Now RemoteFilesDialog
could be executed using the same command like normal file picker,
filters are added depending on context.
* bug 84190 - user wasn't able to change password after failed
authorization.
* bug 83089 - Cannot select location in properties dialogue
* I added support of opening multiple files
* some small improvements

Now I'm working on async operations. In this dialog it could be useful
to cancel current action, because sometimes opening remote directory is
very slow (connection to the cmis.alfresco.com/cmisatom takes > 30s,
which is default timeout in async mode). User should have possibility to
stop this process, for example after selecting any service by mistake
without waiting. Timeout also shouldn't be too short, because it may be
insufficient (like 30s for alfresco example).

To do:
* async operations
* implement support of context bits
* open/save remote buttons on toolbars

Regards,
Szymon

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 3 commits - fpicker/source include/svtools svtools/source

[Szymon Kłos]

 fpicker/source/office/fpdialogbase.hxx   |  113 +++
 fpicker/source/office/iodlg.hxx  |   74 -
 include/svtools/RemoteFilesDialog.hxx|6 -
 svtools/source/dialogs/RemoteFilesDialog.cxx |   32 +--
 4 files changed, 137 insertions(+), 88 deletions(-)

New commits:
commit 51832130a8c0c71efc3253fb22e077a37def37ec
Author: Szymon Kłos 
Date:   Fri Jul 3 15:01:21 2015 +0200

Implemented GetPathList method, opening of the multiple files

Change-Id: I79eb5178dc9b740e6ebaa9e8069fc2a144d4627d

diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 29668ad..3c728cd 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -850,10 +850,17 @@ const OUString& RemoteFilesDialog::GetPath()
 
 std::vector RemoteFilesDialog::GetPathList() const
 {
-// TODO
-std::vector aPaths;
-aPaths.push_back(m_sPath);
-return aPaths;
+std::vector aList;
+sal_uLong nCount = m_pFileView->GetSelectionCount();
+SvTreeListEntry* pEntry = nCount ? m_pFileView->FirstSelected() : NULL;
+
+while( pEntry )
+{
+aList.push_back( SvtFileView::GetURL( pEntry ) );
+pEntry = m_pFileView->NextSelected( pEntry );
+}
+
+return aList;
 }
 
 bool RemoteFilesDialog::ContentIsFolder( const OUString& rURL )
commit d288210eb9dd2f77ffa01c392dea03b1b9ea8f03
Author: Szymon Kłos 
Date:   Fri Jul 3 14:52:14 2015 +0200

RemoteFilesDialog: blacklist

Change-Id: Ia8e87bdf4a5540a25dd1399090edfbf3af63a6da

diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 729a226..29668ad 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -15,6 +15,7 @@ class FolderTree : public SvTreeListBox
 private:
 Reference< XCommandEnvironment > m_xEnv;
 ::osl::Mutex m_aMutex;
+Sequence< OUString > m_aBlackList;
 
 public:
 FolderTree( vcl::Window* pParent, WinBits nBits )
@@ -46,10 +47,9 @@ public:
 if( pURL )
 {
 FolderDescriptor aFolder( *pURL );
-Sequence< OUString > aBlackList;
 
 EnumerationResult eResult =
-pContentEnumerator->enumerateFolderContentSync( aFolder, 
aBlackList );
+pContentEnumerator->enumerateFolderContentSync( aFolder, 
m_aBlackList );
 
 if ( SUCCESS == eResult )
 {
@@ -114,6 +114,11 @@ public:
 break;
 }
 }
+
+void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& 
rBlackList )
+{
+m_aBlackList = rBlackList;
+}
 };
 
 class FileViewContainer : public vcl::Window
@@ -493,11 +498,10 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString sURL )
 
 if( m_pFileView )
 {
-OUStringList BlackList;
 OUString sFilter = GetCurFilter();
 
 m_pFileView->EndInplaceEditing( false );
-eResult = m_pFileView->Initialize( sURL, sFilter, NULL, BlackList );
+eResult = m_pFileView->Initialize( sURL, sFilter, NULL, GetBlackList() 
);
 
 if( eResult == eSuccess )
 {
@@ -756,6 +760,7 @@ void RemoteFilesDialog::SetHasFilename( bool )
 void RemoteFilesDialog::SetBlackList( const ::com::sun::star::uno::Sequence< 
OUString >& rBlackList )
 {
 m_aBlackList = rBlackList;
+m_pTreeView->SetBlackList( rBlackList );
 }
 
 const ::com::sun::star::uno::Sequence< OUString >& 
RemoteFilesDialog::GetBlackList() const
commit 915bb98cdf302f6ec78b173e4ad966e43a98522f
Author: Szymon Kłos 
Date:   Fri Jul 3 14:35:18 2015 +0200

SvtFileDialog_Base in new file

Change-Id: I42189e9ca1c645104f8f5da381cbbb2098c8a0c2

diff --git a/fpicker/source/office/fpdialogbase.hxx 
b/fpicker/source/office/fpdialogbase.hxx
new file mode 100644
index 000..7812737
--- /dev/null
+++ b/fpicker/source/office/fpdialogbase.hxx
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INC

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

[László Németh]

 include/svx/charmap.hxx   |3 +++
 include/vcl/ctrl.hxx  |2 ++
 svx/source/dialog/charmap.cxx |   19 ++-
 vcl/source/control/ctrl.cxx   |   21 +++--
 4 files changed, 38 insertions(+), 7 deletions(-)

New commits:
commit b010e4074e5d5ee3a3905f1351f04efafe937c2a
Author: László Németh 
Date:   Fri Jul 3 18:50:05 2015 +0200

tdf#92241 fix crashes and rendering of symbol set previews

Change-Id: I43397f2b0caa31c334f87acf11fc96df2e051ad8

diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index d50382e..e56fe98 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -58,6 +58,7 @@ public:
 Link<>  GetPreSelectHdl() const { return aHighHdl; }
 voidSetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = 
rHdl; }
 static sal_uInt32& getSelectedChar();
+voidSetFont( const vcl::Font& rFont );
 
 svx::SvxShowCharSetItem*  ImplGetItem( int _nPos );
 int FirstInView() const;
@@ -108,12 +109,14 @@ private:
 sal_Int32   nSelectedIndex;
 
 FontCharMapPtr  mpFontCharMap;
+SizemaFontSize;
 VclPtr  aVscrollSB;
 
 bool mbRecalculateFont  : 1;
 bool mbUpdateForeground : 1;
 bool mbUpdateBackground : 1;
 
+
 private:
 voidDrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, 
int n2);
 voidInitSettings(vcl::RenderContext& rRenderContext);
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 6741a22..69a3569 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -41,6 +41,8 @@ protected:
 
 private:
 boolmbHasControlFocus;
+boolmbFont;
+boolmbForeground;
 Link<>  maGetFocusHdl;
 Link<>  maLoseFocusHdl;
 
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9d0c9a5..f5e9595 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -57,6 +57,7 @@ sal_uInt32& SvxShowCharSet::getSelectedChar()
 SvxShowCharSet::SvxShowCharSet(vcl::Window* pParent)
 : Control(pParent, WB_TABSTOP | WB_BORDER)
 , m_pAccessible(nullptr)
+, maFontSize(0, 0)
 , aVscrollSB( VclPtr::Create(this, WB_VERT) )
 , mbRecalculateFont(true)
 , mbUpdateForeground(true)
@@ -114,6 +115,7 @@ void SvxShowCharSet::StateChanged(StateChangedType nType)
 Invalidate();
 
 Control::StateChanged( nType );
+
 }
 
 
@@ -331,6 +333,12 @@ void SvxShowCharSet::Paint( vcl::RenderContext& 
rRenderContext, const Rectangle&
 DrawChars_Impl(rRenderContext, FirstInView(), LastInView());
 }
 
+void SvxShowCharSet::SetFont( const vcl::Font& rFont )
+{
+Control::SetFont(rFont);
+Invalidate();
+}
+
 void SvxShowCharSet::DeSelect()
 {
 Invalidate();
@@ -506,6 +514,14 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& 
rRenderContext)
 
 mbUpdateBackground = false;
 }
+
+vcl::Font aFont(rRenderContext.GetFont());
+aFont.SetWeight(WEIGHT_LIGHT);
+aFont.SetAlign(ALIGN_TOP);
+aFont.SetSize(maFontSize);
+aFont.SetTransparent(true);
+rRenderContext.SetFont(aFont);
+
 }
 
 
@@ -536,7 +552,8 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& 
rRenderContext)
 aFont.SetWeight(WEIGHT_LIGHT);
 aFont.SetAlign(ALIGN_TOP);
 int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT);
-aFont.SetSize(rRenderContext.PixelToLogic(Size(0, nFontHeight)));
+maFontSize = rRenderContext.PixelToLogic(Size(0, nFontHeight));
+aFont.SetSize(maFontSize);
 aFont.SetTransparent(true);
 rRenderContext.SetFont(aFont);
 rRenderContext.GetFontCharMap(mpFontCharMap);
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 0c40a34..21056db 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -36,6 +36,8 @@ using namespace vcl;
 void Control::ImplInitControlData()
 {
 mbHasControlFocus   = false;
+mbFont  = false;
+mbForeground= false;
 mpControlData   = new ImplControlData;
 }
 
@@ -417,16 +419,23 @@ void Control::ApplySettings(vcl::RenderContext& 
rRenderContext)
 {
 const StyleSettings& rStyleSettings = 
rRenderContext.GetSettings().GetStyleSettings();
 
-vcl::Font rFont(GetCanonicalFont(rStyleSettings));
-ApplyControlFont(rRenderContext, rFont);
-
-ApplyControlForeground(rRenderContext, 
GetCanonicalTextColor(rStyleSettings));
+if (mbFont)
+{
+vcl::Font rFont(GetCanonicalFont(rStyleSettings));
+ApplyControlFont(rRenderContext, rFont);
+}
 
-rRenderContext.SetTextFillColor();
+if (mbFont || mbForeground)
+{
+ApplyControlForeground(rRenderContext, 
GetCanonicalTextColor(rStyleSettings));
+rRenderContext.SetTextFillColor();
+}
 }
 
-void Control::ImplInitSettings(const bool, const bool)
+void Control

Re: HelpAuthoring.oxt: An easy way to edit help files

[Sophie Gautier]

Hi Kendy,

On Fri, Jul 3, 2015 at 5:39 PM, Jan Holesovsky  wrote:

> Hi,
>
> Olivier recently resurrected the HelpAuthoring.oxt extension that makes
> it much easier to edit help files, and I've pushed that to git now:
>
>
> http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/helpauthoring
>
> I don't want to announce it too widely yet, tough; it has a bug that
> from some reason, the new edits appear in bold when saved (they appear
> enclosed in  / ).
>

Maybe I can have a look during the week-end.

>
> Olivier, anybody - can you please have a look why that happens?  Cannot
> do myself ATM :-(
>
> Once this is fixed, I hope the editing of Help will get much easier, and
> we'll be able to get better coverage / higher quality Help even before
> we convert to some better editable format.  Some instructions how to use
> it:
>
> https://wiki.documentfoundation.org/Documentation/Help
>

Maybe we should merge the page you asked me to write some times ago
https://wiki.documentfoundation.org/HelpContent
I've begin to write a simplified guide more complete than what I wrote on
the wiki

There is also the two extra files that will help to locate the help files
to modify that we should decide where to put.
Also is the modified template on git?

>
> Olivier - if you can make it to the next ESC, that would be great :-)
> Thanks so much for making this happen!
>

Cheers
Sophie

>
>


-- 
Sophie Gautier 
GSM:+33683901545
IRC: sophi
Co-founder - Release coordinator
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 234 commits - basctl/source basegfx/source basic/source bin/find-german-comments bridges/source bridges/test chart2/source comph

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit 08ad2b1223f0b5b0791b2de134fc5067640f0bf2
Author: Pranav Kant 
Date:   Thu Jul 2 23:47:33 2015 +0530

lokdocview: Grab focus on mouse 'button-press-event'

Change-Id: I65187bbd2cc32d9278d8b3890a82b390858a

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 62f1e61..bf12ca0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -812,6 +812,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, 
GdkEventButton* pEvent)
(int)pEvent->x, (int)pEvent->y,
(int)pixelToTwip(pEvent->x, priv->m_fZoom),
(int)pixelToTwip(pEvent->y, priv->m_fZoom));
+gtk_widget_grab_focus(GTK_WIDGET(pDocView));
 
 if (pEvent->type == GDK_BUTTON_RELEASE)
 {
commit 4802bf32b84655f6e1d3389070c76371ede8fbce
Author: Justin Luth 
Date:   Wed Jun 24 23:02:57 2015 +0300

tdf#87348 enable docx exporting linked textboxes that LO can import

Exporting linked textboxes to docx format is in terrible condition.
Spacing, textboxes instead of frames, duplicate links and orphaned
shapes lying around, not to mention being being unlinked in MSWord...
This fix resolves this situation slightly: what LO saves can be
re-imported and re-saved without breaking the links - an incremental
improvement.

Change-Id: I8f0aef39eeed88a2b3dfc673a565fb1d8f4713b0
Reviewed-on: https://gerrit.libreoffice.org/16516
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx 
b/sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx
new file mode 100644
index 000..8f9eb97
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index ac7ba3c..6354f42 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -999,6 +999,70 @@ DECLARE_OOXMLEXPORT_TEST(testExportAdjustmentValue, 
"tdf91429.docx")
 
 
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd",
 "fmla", "val 5");
 }
+
+DECLARE_OOXMLEXPORT_TEST(testTDF87348, "tdf87348_linkedTextboxes.docx")
+{
+int followCount=0;
+int precedeCount=0;
+if( !parseDump("/root/page/body/txt/anchored/fly[1]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[1]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[2]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[2]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[3]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[3]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[4]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[4]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[5]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[5]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[6]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[6]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[7]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[7]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[8]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[8]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[9]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[9]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[10]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[10]/txt","precede").isEmpty() 
)
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[11]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[11]/txt","precede").isEmpty() 
)
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[12]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[12]/txt","precede").isEmpty() 
)
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[13]/txt","follow").isEmpty() )
+  followCount+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - desktop/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit fa9b3e8ac49cbf808f54b48a65530acf55a357f1
Author: Jan Holesovsky 
Date:   Fri Jul 3 18:14:31 2015 +0200

LOK: Don't try to absolutize URL's.

Based on a patch by Henry Castro.

Change-Id: Ia7aca20feb8f6095adf7dfe510ed78b1e9882740
Reviewed-on: https://gerrit.libreoffice.org/16743
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0299431..1457e0f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -161,13 +161,18 @@ static OUString getUString(const char* pString)
 return OStringToOUString(sString, RTL_TEXTENCODING_UTF8);
 }
 
-// Try to convert a relative URL to an absolute one
+/// Try to convert a relative URL to an absolute one, unless it already looks 
like an URL.
 static OUString getAbsoluteURL(const char* pURL)
 {
-OUString aURL( getUString( pURL ) );
+OUString aURL(getUString(pURL));
+
+// return unchanged if it likely is an URL already
+if (aURL.indexOf("://") > 0)
+return aURL;
+
 OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
 
-// FIXME: this would appear to kill non-file URLs.
+// convert relative paths to absolute ones
 osl_getProcessWorkingDir(&sWorkingDir.pData);
 osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
 osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, 
sAbsoluteDocUrl);
@@ -343,7 +348,7 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 
 SolarMutexGuard aGuard;
 
-OUString aURL = getAbsoluteURL(pURL);
+OUString aURL(getAbsoluteURL(pURL));
 
 pLib->maLastExceptionMsg.clear();
 
@@ -409,7 +414,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 OUString sFormat = getUString(pFormat);
-OUString aURL = getAbsoluteURL(sUrl);
+OUString aURL(getAbsoluteURL(sUrl));
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx   |   64 
 sw/source/filter/ww8/docxexport.cxx |8 +
 sw/source/filter/ww8/docxsdrexport.cxx  |   91 
 sw/source/filter/ww8/wrtw8nds.cxx   |   63 
 sw/source/filter/ww8/wrtww8.cxx |3 
 sw/source/filter/ww8/wrtww8.hxx |   12 +
 7 files changed, 213 insertions(+), 28 deletions(-)

New commits:
commit 4802bf32b84655f6e1d3389070c76371ede8fbce
Author: Justin Luth 
Date:   Wed Jun 24 23:02:57 2015 +0300

tdf#87348 enable docx exporting linked textboxes that LO can import

Exporting linked textboxes to docx format is in terrible condition.
Spacing, textboxes instead of frames, duplicate links and orphaned
shapes lying around, not to mention being being unlinked in MSWord...
This fix resolves this situation slightly: what LO saves can be
re-imported and re-saved without breaking the links - an incremental
improvement.

Change-Id: I8f0aef39eeed88a2b3dfc673a565fb1d8f4713b0
Reviewed-on: https://gerrit.libreoffice.org/16516
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx 
b/sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx
new file mode 100644
index 000..8f9eb97
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf87348_linkedTextboxes.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index ac7ba3c..6354f42 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -999,6 +999,70 @@ DECLARE_OOXMLEXPORT_TEST(testExportAdjustmentValue, 
"tdf91429.docx")
 
 
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd",
 "fmla", "val 5");
 }
+
+DECLARE_OOXMLEXPORT_TEST(testTDF87348, "tdf87348_linkedTextboxes.docx")
+{
+int followCount=0;
+int precedeCount=0;
+if( !parseDump("/root/page/body/txt/anchored/fly[1]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[1]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[2]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[2]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[3]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[3]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[4]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[4]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[5]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[5]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[6]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[6]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[7]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[7]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[8]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[8]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[9]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[9]/txt","precede").isEmpty() )
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[10]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[10]/txt","precede").isEmpty() 
)
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[11]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[11]/txt","precede").isEmpty() 
)
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[12]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[12]/txt","precede").isEmpty() 
)
+precedeCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[13]/txt","follow").isEmpty() )
+  followCount++;
+if( !parseDump("/root/page/body/txt/anchored/fly[13]/txt","precede").isEmpty() 
)
+precedeCount++;
+//there should be 4 chains/13 linked textboxes (set of 5, set of 3, set of 
3, set of 2)
+//that means 9 NEXT links and 9 PREV links.
+//however, 

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

[Jan Holesovsky]

 desktop/source/lib/init.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit e83cb37cf7546e8bc46d0d49b487dcd352b67093
Author: Jan Holesovsky 
Date:   Fri Jul 3 18:14:31 2015 +0200

LOK: Don't try to absolutize URL's.

Based on a patch by Henry Castro.

Change-Id: Ia7aca20feb8f6095adf7dfe510ed78b1e9882740

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ee47cd8..3a0ce67 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -161,13 +161,18 @@ static OUString getUString(const char* pString)
 return OStringToOUString(sString, RTL_TEXTENCODING_UTF8);
 }
 
-// Try to convert a relative URL to an absolute one
+/// Try to convert a relative URL to an absolute one, unless it already looks 
like an URL.
 static OUString getAbsoluteURL(const char* pURL)
 {
-OUString aURL( getUString( pURL ) );
+OUString aURL(getUString(pURL));
+
+// return unchanged if it likely is an URL already
+if (aURL.indexOf("://") > 0)
+return aURL;
+
 OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
 
-// FIXME: this would appear to kill non-file URLs.
+// convert relative paths to absolute ones
 osl_getProcessWorkingDir(&sWorkingDir.pData);
 osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
 osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, 
sAbsoluteDocUrl);
@@ -343,7 +348,7 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 
 SolarMutexGuard aGuard;
 
-OUString aURL = getAbsoluteURL(pURL);
+OUString aURL(getAbsoluteURL(pURL));
 
 pLib->maLastExceptionMsg.clear();
 
@@ -409,7 +414,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 OUString sFormat = getUString(pFormat);
-OUString aURL = getAbsoluteURL(sUrl);
+OUString aURL(getAbsoluteURL(sUrl));
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 3e75aa0f9275df05afdf1de3c00c51944245fe2c
Author: Jan Holesovsky 
Date:   Fri Jul 3 18:14:31 2015 +0200

LOK: Don't try to absolutize URL's.

Change-Id: Ia7aca20feb8f6095adf7dfe510ed78b1e9882740

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0299431..1457e0f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -161,13 +161,18 @@ static OUString getUString(const char* pString)
 return OStringToOUString(sString, RTL_TEXTENCODING_UTF8);
 }
 
-// Try to convert a relative URL to an absolute one
+/// Try to convert a relative URL to an absolute one, unless it already looks 
like an URL.
 static OUString getAbsoluteURL(const char* pURL)
 {
-OUString aURL( getUString( pURL ) );
+OUString aURL(getUString(pURL));
+
+// return unchanged if it likely is an URL already
+if (aURL.indexOf("://") > 0)
+return aURL;
+
 OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
 
-// FIXME: this would appear to kill non-file URLs.
+// convert relative paths to absolute ones
 osl_getProcessWorkingDir(&sWorkingDir.pData);
 osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
 osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, 
sAbsoluteDocUrl);
@@ -343,7 +348,7 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 
 SolarMutexGuard aGuard;
 
-OUString aURL = getAbsoluteURL(pURL);
+OUString aURL(getAbsoluteURL(pURL));
 
 pLib->maLastExceptionMsg.clear();
 
@@ -409,7 +414,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 OUString sFormat = getUString(pFormat);
-OUString aURL = getAbsoluteURL(sUrl);
+OUString aURL(getAbsoluteURL(sUrl));
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: RTF support

[Miklos Vajna]

Hi,

On Fri, Jul 03, 2015 at 07:59:01AM -0700, tracey002  wrote:
> Can someone please identify the following RTF Controls?
> 
> \facpgsxn 162 
> \nextcset 249
> \tql  371
> After the control, the number is the line in the *rtfkeywd.hxx* file
> 
> I assume the category "RTF Control" means the controls are native to RTF,
> but I can not find them in the documentation

The last version of RTF specification is here:

http://www.microsoft.com/en-US/Download/details.aspx?id=10725

All the above 3 RTF control words are not part of the specification, so
most probably some legacy OOo extension that we inherited in LO.

As far as I see:

- facpgsxn is not used for anything LO, could be removed
- nextcset seems to be an alias for \ansi in the shared RTF filter
  (not used by Writer, but used by Calc and Impress)
- tql seems to be used for left-aligned tabs in the shared RTF filter
  (not used by Writer, but used by Calc and Impress)

Just curious, why do you ask? If possible, please don't depend on these
control words, it happened already in the past that such custom RTF
extension had been removed and replaced by something that is part of the
RTF spec (at least on the export side).

Regards,

Miklos


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

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

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |   15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit c9175a1bd3249ad573ae6827bf19963a3ebe2fbc
Author: Miklos Vajna 
Date:   Fri Jul 3 17:52:44 2015 +0200

SwViewShell::ImplEndAction: avoid direct PaintDesktop()

With double-buffering enabled and typing quickly, one saw blinks in the
text sometimes. The reason was that PaintDesktop() painted directly
outside SwViewShell::Paint().

The problem is more visible with VCL_DOUBLEBUFFERING_AVOID_PAINT=1,
loading a simple document + pressing a key draw an unexpected white
rectangle.

Given that InvalidateWindows() already calls PaintDesktop() inside
Paint() implicitly (via SwViewShell::Paint()), fix the problem by just
avoiding the DLPrePaint2() + PaintDesktop() + DLPostPaint2() calls.

Change-Id: Ib8ce26a0bdd526bf85d362f0e865dd61d29f6d11

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0f27fc5..9462b8f 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -405,20 +405,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 }
 if ( bPaint )
 {
-// #i75172# begin DrawingLayer paint
-// need to do begin/end DrawingLayer preparation for 
each single rectangle of the
-// repaint region. I already tried to prepare only 
once for the whole Region. This
-// seems to work (and does technically) but fails with 
transparent objects. Since the
-// region given to BeginDarwLayers() defines the clip 
region for DrawingLayer paint,
-// transparent objects in the single rectangles will 
indeed be painted multiple times.
-DLPrePaint2(vcl::Region(aRect.SVRect()));
-
-if ( bPaintsFromSystem )
-PaintDesktop(*GetOut(), aRect);
-
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
-
-// #i75172# end DrawingLayer paint
-DLPostPaint2(true);
+InvalidateWindows(aRect.SVRect());
 }
 
 lcl_PaintTransparentFormControls(*this, aRect); // i#107365
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

HelpAuthoring.oxt: An easy way to edit help files

[Jan Holesovsky]

Hi,

Olivier recently resurrected the HelpAuthoring.oxt extension that makes
it much easier to edit help files, and I've pushed that to git now:

http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/helpauthoring

I don't want to announce it too widely yet, tough; it has a bug that
from some reason, the new edits appear in bold when saved (they appear
enclosed in  / ).

Olivier, anybody - can you please have a look why that happens?  Cannot
do myself ATM :-(

Once this is fixed, I hope the editing of Help will get much easier, and
we'll be able to get better coverage / higher quality Help even before
we convert to some better editable format.  Some instructions how to use
it:

https://wiki.documentfoundation.org/Documentation/Help

Olivier - if you can make it to the next ESC, that would be great :-)
Thanks so much for making this happen!

All the best,
Kendy

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx sd/source svx/source

[Caolán McNamara]

 include/svx/svdpagv.hxx   |5 
 sd/source/ui/func/fusel.cxx   |9 ---
 sd/source/ui/func/futext.cxx  |9 ---
 svx/source/svdraw/svdmrkv.cxx |   51 +++---
 4 files changed, 45 insertions(+), 29 deletions(-)

New commits:
commit 4189530530320a82adc785a4426735423a1188c1
Author: Caolán McNamara 
Date:   Fri Jul 3 15:53:00 2015 +0100

fix deselect of textbox on slides with images in underlying master

The original work of tdf#55430 tries to select an object under
another one on the second click, but these images are unselectable
so this fails. Red Hat has a whole new shiny bunch of templates which
have such images in their masters.

Check if the object is selectable before continuing

Change-Id: I182abaf50e8bb1084c5819dc9e1ffd8b386a9e93
(cherry picked from commit abbe4f9d64073d77c4be93b7c89c03d0651bacef)

diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 5369616..8bf305f 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -235,6 +235,11 @@ public:
 // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
 // gesperrt sein darf keiner.
 bool IsObjMarkable(SdrObject* pObj) const;
+// hmm, selectable is surely the same as markable, now that I
+// see this as I look for a place to put it. TO-DO,
+// merge these
+bool IsObjSelectable(SdrObject *pObj) const;
+
 
 // Betreten (Editieren) einer Objektgruppe. Anschliessend liegen alle
 // Memberobjekte der Gruppe im direkten Zugriff. Alle anderen Objekte
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 9c965f7..905ee88 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -684,9 +684,12 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
 **/
 if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, 
SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK))
 {
-mpView->UnmarkAllObj();
-mpView->MarkObj(pObj,pPV,false,false);
-return true;
+if (pPV->IsObjSelectable(pObj))
+{
+mpView->UnmarkAllObj();
+mpView->MarkObj(pObj,pPV,false,false);
+return true;
+}
 }
 /**
 * Toggle between selection and rotation
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index ac6fb71..b848762 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -656,9 +656,12 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
 **/
 if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, 
SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK))
 {
-mpView->UnmarkAllObj();
-mpView->MarkObj(pObj,pPV,false,false);
-return bReturn;
+if (pPV->IsObjSelectable(pObj))
+{
+mpView->UnmarkAllObj();
+mpView->MarkObj(pObj,pPV,false,false);
+return bReturn;
+}
 }
 }
 }
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 808f432..0eaaced 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1226,6 +1226,33 @@ void SdrMarkView::SetRef2(const Point& rPt)
 }
 }
 
+bool SdrPageView::IsObjSelectable(SdrObject *pObj) const
+{
+SdrLayerID nLay=pObj->GetLayer();
+bool bRaus=!pObj->IsInserted(); // Obj deleted?
+if (!pObj->Is3DObj()) {
+bRaus=bRaus || pObj->GetPage()!=GetPage();   // Obj suddenly in 
different Page or Group
+}
+bRaus=bRaus || GetLockedLayers().IsSet(nLay) ||  // Layer locked?
+   !GetVisibleLayers().IsSet(nLay);  // Layer invisible?
+
+if( !bRaus )
+bRaus = !pObj->IsVisible(); // invisible objects can not be selected
+
+if (!bRaus) {
+// Grouped objects can now be selected.
+// After EnterGroup the higher-level objects,
+// have to be deselected, though.
+const SdrObjList* pOOL=pObj->GetObjList();
+const SdrObjList* pVOL=GetObjList();
+while (pOOL!=NULL && pOOL!=pVOL) {
+pOOL=pOOL->GetUpList();
+}
+bRaus=pOOL!=pVOL;
+}
+return !bRaus;
+}
+
 void SdrMarkView::CheckMarked()
 {
 for (size_t nm=GetMarkedObjectCount(); nm>0;) {
@@ -1233,29 +1260,7 @@ void SdrMarkView::CheckMarked()
 SdrMark* pM=GetSdrMarkByIndex(nm);
 SdrObject* pObj=pM->GetMarkedSdrObj();
 SdrPageView* pPV=pM->GetPageView();
-

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

[Caolán McNamara]

 include/svx/svdpagv.hxx   |5 
 sd/source/ui/func/fusel.cxx   |9 ---
 sd/source/ui/func/futext.cxx  |9 ---
 svx/source/svdraw/svdmrkv.cxx |   51 +++---
 4 files changed, 45 insertions(+), 29 deletions(-)

New commits:
commit abbe4f9d64073d77c4be93b7c89c03d0651bacef
Author: Caolán McNamara 
Date:   Fri Jul 3 15:53:00 2015 +0100

fix deselect of textbox on slides with images in underlying master

The original work of tdf#55430 tries to select an object under
another one on the second click, but these images are unselectable
so this fails. Red Hat has a whole new shiny bunch of templates which
have such images in their masters.

Check if the object is selectable before continuing

Change-Id: I182abaf50e8bb1084c5819dc9e1ffd8b386a9e93

diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 5369616..8bf305f 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -235,6 +235,11 @@ public:
 // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
 // gesperrt sein darf keiner.
 bool IsObjMarkable(SdrObject* pObj) const;
+// hmm, selectable is surely the same as markable, now that I
+// see this as I look for a place to put it. TO-DO,
+// merge these
+bool IsObjSelectable(SdrObject *pObj) const;
+
 
 // Betreten (Editieren) einer Objektgruppe. Anschliessend liegen alle
 // Memberobjekte der Gruppe im direkten Zugriff. Alle anderen Objekte
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index dd63708..000ac60 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -684,9 +684,12 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
 **/
 if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, 
SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK))
 {
-mpView->UnmarkAllObj();
-mpView->MarkObj(pObj,pPV,false,false);
-return true;
+if (pPV->IsObjSelectable(pObj))
+{
+mpView->UnmarkAllObj();
+mpView->MarkObj(pObj,pPV,false,false);
+return true;
+}
 }
 /**
 * Toggle between selection and rotation
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index e308e2e..c3b4090 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -657,9 +657,12 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
 **/
 if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, 
SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK))
 {
-mpView->UnmarkAllObj();
-mpView->MarkObj(pObj,pPV,false,false);
-return bReturn;
+if (pPV->IsObjSelectable(pObj))
+{
+mpView->UnmarkAllObj();
+mpView->MarkObj(pObj,pPV,false,false);
+return bReturn;
+}
 }
 }
 }
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index f58f88b..d281507 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1226,6 +1226,33 @@ void SdrMarkView::SetRef2(const Point& rPt)
 }
 }
 
+bool SdrPageView::IsObjSelectable(SdrObject *pObj) const
+{
+SdrLayerID nLay=pObj->GetLayer();
+bool bRaus=!pObj->IsInserted(); // Obj deleted?
+if (!pObj->Is3DObj()) {
+bRaus=bRaus || pObj->GetPage()!=GetPage();   // Obj suddenly in 
different Page or Group
+}
+bRaus=bRaus || GetLockedLayers().IsSet(nLay) ||  // Layer locked?
+   !GetVisibleLayers().IsSet(nLay);  // Layer invisible?
+
+if( !bRaus )
+bRaus = !pObj->IsVisible(); // invisible objects can not be selected
+
+if (!bRaus) {
+// Grouped objects can now be selected.
+// After EnterGroup the higher-level objects,
+// have to be deselected, though.
+const SdrObjList* pOOL=pObj->GetObjList();
+const SdrObjList* pVOL=GetObjList();
+while (pOOL!=NULL && pOOL!=pVOL) {
+pOOL=pOOL->GetUpList();
+}
+bRaus=pOOL!=pVOL;
+}
+return !bRaus;
+}
+
 void SdrMarkView::CheckMarked()
 {
 for (size_t nm=GetMarkedObjectCount(); nm>0;) {
@@ -1233,29 +1260,7 @@ void SdrMarkView::CheckMarked()
 SdrMark* pM=GetSdrMarkByIndex(nm);
 SdrObject* pObj=pM->GetMarkedSdrObj();
 SdrPageView* pPV=pM->GetPageView();
-SdrLayerID nLay=pObj->GetLayer();
-bool bRaus=!pObj->IsInsert

[Libreoffice-commits] core.git: qadevOOo/tests

[Stephan Bergmann]

 qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java |   22 
+++---
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 2a583603dec40090289ddb5b4b70d800794cf57b
Author: Stephan Bergmann 
Date:   Fri Jul 3 16:57:50 2015 +0200

Make test code more robust

Change-Id: If3b58c02b289224938b1dfd8074f9802ea6d2474

diff --git 
a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java 
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
index a5d0740..2971669 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
@@ -77,7 +77,9 @@ public class _XAccessibleEventBroadcaster extends 
MultiMethodTest {
 if (nev instanceof com.sun.star.accessibility.XAccessible) {
 System.out.println("New: 
"+((XAccessible)nev).getAccessibleContext().getAccessibleName());
 }
-notifiedEvent = ev;
+synchronized (this) {
+notifiedEvent = ev;
+}
 }
 
 public void disposing(EventObject ev) {}
@@ -118,7 +120,11 @@ public class _XAccessibleEventBroadcaster extends 
MultiMethodTest {
 
 boolean works = true;
 
-if (list.notifiedEvent == null) {
+AccessibleEventObject ne;
+synchronized (list) {
+ne = list.notifiedEvent;
+}
+if (ne == null) {
 if (!isTransient) {
 log.println("listener wasn't called");
 works = false;
@@ -151,17 +157,23 @@ public class _XAccessibleEventBroadcaster extends 
MultiMethodTest {
 public void _removeEventListener() throws Exception {
 requiredMethod("addEventListener()");
 
-list.notifiedEvent = null;
-
 log.println("remove listener");
 oObj.removeAccessibleEventListener(list);
 
+synchronized (list) {
+list.notifiedEvent = null;
+}
+
 log.println("fire event");
 prod.fireEvent() ;
 
 waitForEventIdle();
 
-if (list.notifiedEvent == null) {
+AccessibleEventObject ne;
+synchronized (list) {
+ne = list.notifiedEvent;
+}
+if (ne == null) {
 log.println("listener wasn't called -- OK");
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basegfx sax/inc shell/inc shell/source stoc/source

[Michael Stahl]

 include/basegfx/color/bcolor.hxx  |   31 ++
 include/basegfx/matrix/b2dhommatrixtools.hxx  |1 
 include/basegfx/pixel/bpixel.hxx  |5 +
 include/basegfx/range/b1drange.hxx|   22 
 include/basegfx/range/b2ibox.hxx  |   57 
 include/basegfx/range/b2irange.hxx|   50 ++
 include/basegfx/range/b3drange.hxx|   65 ++
 include/basegfx/tuple/b2i64tuple.hxx  |   14 +++
 include/basegfx/tuple/b3ituple.hxx|   18 +++
 include/basegfx/vector/b3dvector.hxx  |   26 +
 sax/inc/xml2utf.hxx   |4 
 shell/inc/internal/i_xml_parser_event_handler.hxx |7 +
 shell/source/unix/sysshell/recently_used_file_handler.cxx |7 +
 stoc/source/corereflection/base.hxx   |6 +
 stoc/source/javavm/javavm.hxx |3 
 15 files changed, 316 insertions(+)

New commits:
commit a6f5770b46506a22eae0d641ad48f9b6d239
Author: Michael Stahl 
Date:   Fri Jul 3 16:53:45 2015 +0200

Revert "loplugin:unusedmethods sax,shell,stoc,basegfx"

The basegfx changes appear to break Windows builds.

This reverts commit 3b32c5898ff4e744d3f18b00421b433500426d74.

diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 4358e05..2bdd420 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -131,6 +131,15 @@ namespace basegfx
 return *this;
 }
 
+// blend to another color using luminance
+void blend(const BColor& rColor)
+{
+const double fLuminance(luminance());
+mfX = rColor.getRed() * fLuminance;
+mfY = rColor.getGreen() * fLuminance;
+mfZ = rColor.getBlue() * fLuminance;
+}
+
 // luminance
 double luminance() const
 {
@@ -155,6 +164,16 @@ namespace basegfx
 return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB);
 }
 
+double getMinimumDistance(const BColor& rColor) const
+{
+const double fDistR(getDistanceRed(rColor));
+const double fDistG(getDistanceGreen(rColor));
+const double fDistB(getDistanceBlue(rColor));
+
+double fRetval(fDistR < fDistG ? fDistR : fDistG);
+return (fRetval < fDistB ? fRetval : fDistB);
+}
+
 double getMaximumDistance(const BColor& rColor) const
 {
 const double fDistR(getDistanceRed(rColor));
@@ -187,6 +206,18 @@ namespace basegfx
 return static_cast( 
::basegfx::B3DTuple::getEmptyTuple() );
 }
 
+com::sun::star::uno::Sequence< double > colorToDoubleSequence(const 
com::sun::star::uno::Reference< com::sun::star::rendering::XGraphicDevice >& 
/*xGraphicDevice*/) const
+{
+com::sun::star::uno::Sequence< double > aRet(4);
+double* pRet = aRet.getArray();
+
+pRet[0] = mfX;
+pRet[1] = mfY;
+pRet[2] = mfZ;
+pRet[3] = 1.0;
+
+return aRet;
+}
 };
 } // end of namespace basegfx
 
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx 
b/include/basegfx/matrix/b2dhommatrixtools.hxx
index 41a17ec..b2aef89 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -218,6 +218,7 @@ namespace basegfx
 const B2DVector& getScale() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
maScale; }
 const B2DVector& getTranslate() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
maTranslate; }
 double getRotate() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
mfRotate; }
+double getShearX() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
mfShearX; }
 };
 } // end of namespace tools
 
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index fda6a79..cf5c7a3 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -95,16 +95,21 @@ namespace basegfx
 sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; }
 sal_uInt8 getBlue() const { return maPixelUnion.maRGBO.mnB; }
 sal_uInt8 getOpacity() const { return maPixelUnion.maRGBO.mnO; }
+sal_uInt32 getRedGreenBlueOpacity() const { return 
maPixelUnion.maCombinedRGBO.mnValue; }
 
 // data access write
 void setRed(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnR = nNew; }
 void setGreen(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnG = nNew; }
 void se

Re: RTF support

[tracey002]

Can someone please identify the following RTF Controls?

\facpgsxn   162 
\nextcset   249
\tql371
After the control, the number is the line in the *rtfkeywd.hxx* file

I assume the category "RTF Control" means the controls are native to RTF,
but I can not find them in the documentation
Please advise.
Thanks, Tracey
I am running LibreOffice v3.6.7.2 on Windows2K




--
View this message in context: 
http://nabble.documentfoundation.org/RTF-support-tp3114982p4153551.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: icon-themes/tango

[Adolfo Jayme Barrientos]

 icon-themes/tango/framework/res/recent-documents.png |binary
 1 file changed

New commits:
commit 5bc343cc723f993ed112cf5c700e3f397527d671
Author: Adolfo Jayme Barrientos 
Date:   Fri Jul 3 09:53:29 2015 -0500

Start Center: Better icon for Recent Files

Change-Id: I99a87da22d877bc1386552a8978b0bf5e8e7f51f

diff --git a/icon-themes/tango/framework/res/recent-documents.png 
b/icon-themes/tango/framework/res/recent-documents.png
index 93fddb8..eb7d222 100644
Binary files a/icon-themes/tango/framework/res/recent-documents.png and 
b/icon-themes/tango/framework/res/recent-documents.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sdext/source

[Stephan Bergmann]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 4ca9473d824fe37c2a63d48917cbaee79f5811e1
Author: Stephan Bergmann 
Date:   Wed Jul 1 09:20:18 2015 +0200

Work around const-ness issues in the GooString API

cf.  "Revert the removal of cast 
to
build on old poppler"

Change-Id: I75184cec64b4f32e0cf9adedeb84c8591be4fc73
(cherry picked from commit b51ba9e383243e8248d6da1b71a5b06d841d165b)
Reviewed-on: https://gerrit.libreoffice.org/16643
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index f4fa810..b5dd4e4 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -103,13 +103,13 @@ namespace pdfi
 isUnderline(rSrc.isUnderline),
 size(rSrc.size)
 {
-familyName.append(const_cast(&rSrc.familyName));
+familyName.append(&rSrc.getFamilyName());
 }
 
 FontAttributes& operator=( const FontAttributes& rSrc )
 {
 familyName.clear();
-familyName.append(const_cast(&rSrc.familyName));
+familyName.append(&rSrc.getFamilyName());
 
 isEmbedded  = rSrc.isEmbedded;
 isBold  = rSrc.isBold;
@@ -122,8 +122,7 @@ namespace pdfi
 
 bool operator==(const FontAttributes& rFont) const
 {
-return familyName.cmp(
-const_cast(&rFont.familyName))==0 &&
+return getFamilyName().cmp(&rFont.getFamilyName())==0 &&
 isEmbedded == rFont.isEmbedded &&
 isBold == rFont.isBold &&
 isItalic == rFont.isItalic &&
@@ -137,6 +136,11 @@ namespace pdfi
 boolisItalic;
 boolisUnderline;
 double  size;
+
+private:
+// Work around const-ness issues in the GooString API:
+GooString & getFamilyName() const
+{ return const_cast(familyName); }
 };
 
 class PDFOutDev : public OutputDev
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Juergen Funk]

 vcl/unx/kde4/KDE4FilePicker.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7fa28a17f658c2bd15a359a5153e77667b925a20
Author: Juergen Funk 
Date:   Fri Jun 26 15:45:00 2015 +0200

tdf#92353 FileSave: Not confirmed for overwrite a file (unix)

The setConfimOverwrite function must be set after setOperationMode function

Change-Id: Id5ab54be502e9c96eba3d7ab600b5e06e241c8fd
Reviewed-on: https://gerrit.libreoffice.org/16517
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
Reviewed-on: https://gerrit.libreoffice.org/16649
Tested-by: Katarina Behrens 

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index ac21f81..4615bd4 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -129,7 +129,6 @@ KDE4FilePicker::KDE4FilePicker( const 
uno::Reference& )
 #endif
 
 setMultiSelectionMode( false );
-_dialog->setConfirmOverwrite( true );
 
 // XExecutableDialog functions
 connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
@@ -737,6 +736,7 @@ void SAL_CALL KDE4FilePicker::initialize( const 
uno::Sequence &args )
 break;
 case KFileDialog::Saving:
 resId = STR_FPICKER_SAVE;
+_dialog->setConfirmOverwrite( true );
 break;
 default:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 4 commits - helpauthoring/Addons.xcu helpauthoring/description.xml helpauthoring/filter helpauthoring/Filter.xcu helpauthoring/help helpauthoring/HelpAuthoring hel

[Jan Holesovsky]

 helpauthoring/Addons.xcu | 
 216 +
 helpauthoring/Filter.xcu | 
  34 
 helpauthoring/HelpAuthoring/Comment.xba  | 
  72 
 helpauthoring/HelpAuthoring/Embed.xba| 
 344 +
 helpauthoring/HelpAuthoring/Find.xba | 
 166 
 helpauthoring/HelpAuthoring/HID.xba  | 
 130 
 helpauthoring/HelpAuthoring/Helpers.xba  | 
1104 +
 helpauthoring/HelpAuthoring/IND.xba  | 
 178 
 helpauthoring/HelpAuthoring/Link.xba | 
 100 
 helpauthoring/HelpAuthoring/Meta.xba | 
 196 +
 helpauthoring/HelpAuthoring/Module1.xba  | 
  23 
 helpauthoring/HelpAuthoring/OtherElements.xba| 
 514 ++
 helpauthoring/HelpAuthoring/Switch.xba   | 
 335 +
 helpauthoring/HelpAuthoring/TOC.xba  | 
 153 
 helpauthoring/HelpAuthoring/Table.xba| 
  35 
 helpauthoring/HelpAuthoring/Validate.xba | 
 722 +++
 helpauthoring/HelpAuthoring/_Main.xba| 
 213 +
 helpauthoring/HelpAuthoring/dialog.xlb   | 
  20 
 helpauthoring/HelpAuthoring/dlgCase.xdl  | 
  39 
 helpauthoring/HelpAuthoring/dlgComment.xdl   | 
  30 
 helpauthoring/HelpAuthoring/dlgConfigure.xdl | 
  29 
 helpauthoring/HelpAuthoring/dlgEmbed.xdl | 
  52 
 helpauthoring/HelpAuthoring/dlgFind.xdl  | 
  30 
 helpauthoring/HelpAuthoring/dlgHID.xdl   | 
  31 
 helpauthoring/HelpAuthoring/dlgIND.xdl   | 
  48 
 helpauthoring/HelpAuthoring/dlgLink.xdl  | 
  32 
 helpauthoring/HelpAuthoring/dlgMeta.xdl  | 
  44 
 helpauthoring/HelpAuthoring/dlgObjProp.xdl   | 
  34 
 helpauthoring/HelpAuthoring/dlgRepeatFind.xdl| 
  30 
 helpauthoring/HelpAuthoring/dlgSwitch.xdl| 
  31 
 helpauthoring/HelpAuthoring/dlgTOC.xdl   | 
  43 
 helpauthoring/HelpAuthoring/dlgTable.xdl | 
  32 
 helpauthoring/HelpAuthoring/dlgWarn.xdl  | 
  32 
 helpauthoring/HelpAuthoring/dlg_BrowseEmbed.xdl  | 
  43 
 helpauthoring/HelpAuthoring/script.xlb   | 
  18 
 helpauthoring/META-INF/manifest.xml  | 
  26 
 helpauthoring/Paths.xcu  | 
  35 
 helpauthoring/Type.xcu   | 
  34 
 helpauthoring/description.xml| 
  37 
 helpauthoring/filter/soffice2xmlhelp.xsl | 
1315 ++
 helpauthoring/filter/xmlhelp.dtd | 
 233 +
 helpauthoring/filter/xmlhelp2soffice.xsl | 
1937 ++
 helpauthoring/help/en-US/help.tree   | 
  35 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-docroot.xhp | 
  37 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-elements.xhp| 
  42 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-extendedtips.xhp| 
  35 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-hidsindex.xhp   | 
  37 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-ids.xhp | 
  46 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-l10n.xhp| 
  35 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-metadata.xhp| 
  35 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-newfile.xhp | 
  35 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-specialsections.xhp | 
  55 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-switch.xhp  | 
  32 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-transclude.xhp  | 
  37 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/ha-validating.xhp  | 
  35 
 helpauthoring/help/en-US/org.openoffice.helpauthoring/helpauthoring.xhp  | 
  35 
 helpauthoring/images/dialog-question.png 
|binary
 helpaut

[Libreoffice-commits] core.git: icon-themes/sifr

[Matthias Freund]

 icon-themes/sifr/sw/res/doublepage_10x22.png |binary
 icon-themes/sifr/sw/res/emptypage_10x14.png  |binary
 icon-themes/sifr/sw/res/twopages_10x24.png   |binary
 3 files changed

New commits:
commit c6483666232a231446190d5c256857db45c5e4cc
Author: Matthias Freund 
Date:   Tue Jun 30 18:32:43 2015 +0200

tdf#92425 - Correct the inactive pageindicators

The inactive pageindicators had the same grey like the active ones, I 
correct
this and changed the dark grey into light grey.

Change-Id: Iea810d466504ceb80750c45358a01f8b8d3c8b9e
Reviewed-on: https://gerrit.libreoffice.org/16621
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/icon-themes/sifr/sw/res/doublepage_10x22.png 
b/icon-themes/sifr/sw/res/doublepage_10x22.png
index ccdf656..27630e3 100644
Binary files a/icon-themes/sifr/sw/res/doublepage_10x22.png and 
b/icon-themes/sifr/sw/res/doublepage_10x22.png differ
diff --git a/icon-themes/sifr/sw/res/emptypage_10x14.png 
b/icon-themes/sifr/sw/res/emptypage_10x14.png
index aae3865..3a781f3 100644
Binary files a/icon-themes/sifr/sw/res/emptypage_10x14.png and 
b/icon-themes/sifr/sw/res/emptypage_10x14.png differ
diff --git a/icon-themes/sifr/sw/res/twopages_10x24.png 
b/icon-themes/sifr/sw/res/twopages_10x24.png
index 9aa128e..c32ee06 100644
Binary files a/icon-themes/sifr/sw/res/twopages_10x24.png and 
b/icon-themes/sifr/sw/res/twopages_10x24.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp

[Henry Castro]

 loolwsd/LOOLSession.cpp |   76 +++-
 1 file changed, 43 insertions(+), 33 deletions(-)

New commits:
commit d788fa92e993e6d5131bd0730c631828a37829de
Author: Henry Castro 
Date:   Fri Jul 3 10:01:47 2015 -0400

loolwsd: let libreoffice handle http protocol

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index df0a698..f66dbbe 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -597,46 +597,49 @@ void MasterProcessSession::dispatchChild()
 std::cout << Util::logPrefix() << "_availableChildSessions size=" << 
_availableChildSessions.size() << std::endl;
 lock.unlock();
 
-assert(jailDocumentURL[0] == '/');
-Path copy(getJailPath(childSession->_childId), jailDocumentURL.substr(1));
-Application::instance().logger().information(Util::logPrefix() + "Copying 
" + _docURL + " to " + copy.toString());
-
-URIStreamOpener opener;
-opener.registerStreamFactory("http", new HTTPStreamFactory());
-try
+if (_docURL.find("http:"))
 {
-std::istream *input = opener.open(_docURL);
-std::ofstream output(copy.toString());
-if (!output)
+assert(jailDocumentURL[0] == '/');
+Path copy(getJailPath(childSession->_childId), 
jailDocumentURL.substr(1));
+Application::instance().logger().information(Util::logPrefix() + 
"Copying " + _docURL + " to " + copy.toString());
+
+URIStreamOpener opener;
+opener.registerStreamFactory("http", new HTTPStreamFactory());
+try
 {
-Application::instance().logger().error(Util::logPrefix() + "Could 
not open " + copy.toString() + " for writing");
-sendTextFrame("error: cmd=load kind=internal");
+std::istream *input = opener.open(_docURL);
+std::ofstream output(copy.toString());
+if (!output)
+{
+Application::instance().logger().error(Util::logPrefix() + 
"Could not open " + copy.toString() + " for writing");
+sendTextFrame("error: cmd=load kind=internal");
+
+// We did not use the child session after all
+// FIXME: Why do we do the same thing both here and then when 
we catch the IOException that we throw, a dozen line below?
+lock.lock();
+_availableChildSessions.insert(childSession);
+std::cout << Util::logPrefix() << "_availableChildSessions 
size=" << _availableChildSessions.size() << std::endl;
+lock.unlock();
+throw IOException(copy.toString());
+}
+StreamCopier::copyStream(*input, output);
+output.close();
 
-// We did not use the child session after all
-// FIXME: Why do we do the same thing both here and then when we 
catch the IOException that we throw, a dozen line below?
+Application::instance().logger().information(Util::logPrefix() + 
"Copying done");
+}
+catch (IOException& exc)
+{
+Application::instance().logger().error(Util::logPrefix() + 
"Copying failed: " + exc.message());
+sendTextFrame("error: cmd=load kind=failed");
+
+// FIXME: See above FIXME
 lock.lock();
 _availableChildSessions.insert(childSession);
 std::cout << Util::logPrefix() << "_availableChildSessions size=" 
<< _availableChildSessions.size() << std::endl;
 lock.unlock();
-throw IOException(copy.toString());
-}
-StreamCopier::copyStream(*input, output);
-output.close();
-
-Application::instance().logger().information(Util::logPrefix() + 
"Copying done");
-}
-catch (IOException& exc)
-{
-Application::instance().logger().error(Util::logPrefix() + "Copying 
failed: " + exc.message());
-sendTextFrame("error: cmd=load kind=failed");
-
-// FIXME: See above FIXME
-lock.lock();
-_availableChildSessions.insert(childSession);
-std::cout << Util::logPrefix() << "_availableChildSessions size=" << 
_availableChildSessions.size() << std::endl;
-lock.unlock();
 
-throw;
+throw;
+}
 }
 
 _peer = childSession;
@@ -851,7 +854,14 @@ bool ChildProcessSession::loadDocument(const char *buffer, 
int length, StringTok
 if (LIBREOFFICEKIT_HAS(_loKit, registerCallback))
 _loKit->pClass->registerCallback(_loKit, myCallback, this);
 
-if ((_loKitDocument = _loKit->pClass->documentLoad(_loKit, 
jailDocumentURL.c_str())) == NULL)
+std::string sURL;
+
+if ( _docURL.find("http:") )
+sURL = _docURL;
+else
+sURL = jailDocumentURL;
+
+if ((_loKitDocument = _loKit->pClass->documentLoad(_loKit, sURL.c_str())) 
== NULL)
 {
 sendTextFrame("error: cmd=load kind=failed");
 return false;
___
Libreoffice-commits maili

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/layer/tile/TileLayer.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6b52fe1436c20987729a04c1a5a026676c480503
Author: Mihai Varga 
Date:   Fri Jul 3 16:53:20 2015 +0300

Set opacity to 1 when replacing a tile

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index d3a2419..b56bcef 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -420,9 +420,11 @@ L.TileLayer = L.GridLayer.extend({
var tile = this._tiles[key];
if (tile) {
if (tile.el.src) {
+   // cancel the animFade if there's any
+   L.DomUtil.setOpacity(tile.el, 1);
this._skipFadeAnimated = true;
}
-   if (this._tiles[key]._invalidCount && 
this._tiles[key]._invalidCount > 0) {
+   if (this._tiles[key]._invalidCount > 0) {
this._tiles[key]._invalidCount -= 1;
}
tile.el.src = 'data:image/png;base64,' + 
window.btoa(strBytes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - include/registry registry/Executable_regview.mk registry/inc registry/Library_reg.mk registry/source registry/tools

[Stephan Bergmann]

 include/registry/reflread.hxx  |  286 --
 include/registry/reflwrit.hxx  |  221 
 include/registry/registry.h|  440 -
 registry/Executable_regview.mk |5 
 registry/Library_reg.mk|5 
 registry/inc/regapi.hxx|  432 
 registry/source/keyimpl.hxx|2 
 registry/source/reflread.cxx   |  199 ++
 registry/source/reflread.hxx   |  119 +++
 registry/source/reflwrit.cxx   |  144 +++--
 registry/source/reflwrit.hxx   |  107 +
 registry/source/regimpl.cxx|4 
 registry/source/regimpl.hxx|2 
 registry/source/registry.cxx   |8 
 registry/source/regkey.cxx |2 
 registry/tools/regview.cxx |2 
 16 files changed, 786 insertions(+), 1192 deletions(-)

New commits:
commit bded4ddd6da0de2c465b28a51d773720338542c3
Author: Stephan Bergmann 
Date:   Fri Jul 3 11:22:38 2015 +0200

Make RegistryTypeWriter non-copyable

(and note the operator == vs. = typo)

Change-Id: I9c25149967ed9b80f5e8f014de0dfee2e8f485d8

diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 288beb9..689bc2d 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -1165,14 +1165,6 @@ void TypeWriter::createBlop()
 
 extern "C" {
 
-static void TYPEREG_CALLTYPE acquire(TypeWriterImpl hEntry)
-{
-TypeWriter* pEntry = static_cast(hEntry);
-
-if (pEntry != NULL)
-pEntry->m_refCount++;
-}
-
 static void TYPEREG_CALLTYPE release(TypeWriterImpl hEntry)
 {
 TypeWriter* pEntry = static_cast(hEntry);
@@ -1374,29 +1366,11 @@ RegistryTypeWriter::RegistryTypeWriter(RTTypeClass  
 RTTypeClass,
   referenceCount);
 }
 
-RegistryTypeWriter::RegistryTypeWriter(const RegistryTypeWriter& toCopy)
-: m_hImpl(toCopy.m_hImpl)
-{
-acquire(m_hImpl);
-}
-
 RegistryTypeWriter::~RegistryTypeWriter()
 {
 release(m_hImpl);
 }
 
-RegistryTypeWriter& RegistryTypeWriter::operator == (const RegistryTypeWriter& 
toAssign)
-{
-if (m_hImpl != toAssign.m_hImpl)
-{
-release(m_hImpl);
-m_hImpl = toAssign.m_hImpl;
-acquire(m_hImpl);
-}
-
-return *this;
-}
-
 void RegistryTypeWriter::setFieldData( sal_uInt16  index,
   const rtl::OUString&name,
   const rtl::OUString&typeName,
diff --git a/registry/source/reflwrit.hxx b/registry/source/reflwrit.hxx
index 9bb8475..dcf2eec 100644
--- a/registry/source/reflwrit.hxx
+++ b/registry/source/reflwrit.hxx
@@ -58,18 +58,12 @@ public:
   sal_uInt16methodCount,
   sal_uInt16referenceCount);
 
-/// Copy constructcor
-RegistryTypeWriter(const RegistryTypeWriter& toCopy);
-
 /** Destructor. The Destructor frees the internal data block.
 
 The pointer (returned by getBlop) will be set to NULL.
  */
 ~RegistryTypeWriter();
 
-/// Assign operator
-RegistryTypeWriter& operator == (const RegistryTypeWriter& toAssign);
-
 /** sets the data for a field member of a type blob.
 
 @param index indicates the index of the field.
@@ -100,7 +94,9 @@ public:
  */
 sal_uInt32   getBlopSize();
 
-protected:
+private:
+RegistryTypeWriter(RegistryTypeWriter &) = delete;
+void operator =(RegistryTypeWriter) = delete;
 
 /// stores the handle of an implementation class
 TypeWriterImpl   m_hImpl;
commit 79429448052d4b69cc235000b74f3f8d6fa5a74c
Author: Stephan Bergmann 
Date:   Fri Jul 3 11:19:50 2015 +0200

Remove RegistryTypeWriter_Api indirection

Change-Id: I313adfb72272a631299efb3d2464873853a126be

diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index c8ec720..288beb9 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -1356,26 +1356,66 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
 return t;
 }
 
-RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api()
+}
+
+RegistryTypeWriter::RegistryTypeWriter(RTTypeClass   RTTypeClass,
+  const rtl::OUString&typeName,
+  const rtl::OUString&
superTypeName,
+  sal_uInt16
fieldCount,
+  sal_uInt16
methodCount,
+  sal_uInt16
referenceCount)
+: m_hImpl(NULL)
 {
-static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0};
-if (!aApi.acquire)
-{
-aApi.createEntry= &createEntry;
-aApi.acquire= &acquire;
-aApi.

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

[Tor Lillqvist]

 vcl/source/window/cursor.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 4cf3dd78870456f786d39e8946648550a655d9a3
Author: Tor Lillqvist 
Date:   Fri Jul 3 16:37:21 2015 +0300

Revert "Don't belive the 'draw direct' parameter when double-buffering"

it introduces other problems instead.

This reverts commit 05806f4603476dd150af7770543fea749cc6d10c.

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index e1119ae..b665be7 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -167,9 +167,6 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool 
bRestore )
 
 if ( pWindow )
 {
-if ( pWindow->SupportsDoubleBuffering() )
-bDrawDirect = false;
-
 if ( !mpData )
 {
 mpData = new ImplCursorData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 978033d5ed9f93f2d5d9a1ba44acf6b37bc13bfe
Author: Miklos Vajna 
Date:   Fri Jul 3 11:52:17 2015 +0200

SwViewShell::DLPrePaint2: fix missing clipping for the non-buffered case

With this, if the sw window is small enough that the page shadow is
supposed to be under the sidebar, we no longer paint the shadow over the
sidebar.

In the non-double-buffered case the output is a window, so
SdrPaintWindow::PreparePreRenderDevice() does its own buffering, and
clipping is taken care of when that buffer is copied to the window in
SdrPreRenderDevice::OutputPreRenderDevice().

This wasn't a problem before, as either the output was a non-screen
device or UI elements were painted (like the sidebar), but never both at
the same time.

Change-Id: Ic02c814fc4deeea86c245c74bd69656533d9f835

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 3e77cf1..0f27fc5 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -203,6 +203,9 @@ void SwViewShell::DLPrePaint2(const vcl::Region& rRegion)
 mpBufferedOut = mpOut;
 mpOut = &(mpTargetPaintWindow->GetTargetOutputDevice());
 }
+else
+// In case mpOut is used without buffering, need to set clipping.
+mpOut->SetClipRegion(rRegion);
 
 // remember original paint MapMode for wrapped FlyFrame paints
 maPrePostMapMode = mpOut->GetMapMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/qa/extras/uiwriter/data/draw-anchor-undo.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   27 
 sw/source/core/undo/unattr.cxx  |   11 +++--
 3 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit b5a4e6974a5473c44fc239b6a9ae21f233111c2a
Author: Caolán McNamara 
Date:   Fri Jul 3 12:47:41 2015 +0100

add a shape resize undo test

Change-Id: I88c2d7de243660ba727f057d6a2d67726b41b982

diff --git a/sw/qa/extras/uiwriter/data/draw-anchor-undo.odt 
b/sw/qa/extras/uiwriter/data/draw-anchor-undo.odt
new file mode 100644
index 000..370799c
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/draw-anchor-undo.odt 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 6138ed2..a0c1bfe 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -113,6 +113,7 @@ public:
 void testEmbeddedDataSource();
 void testUnoCursorPointer();
 void testTextTableCellNames();
+void testShapeAnchorUndo();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -163,6 +164,7 @@ public:
 CPPUNIT_TEST(testEmbeddedDataSource);
 CPPUNIT_TEST(testUnoCursorPointer);
 CPPUNIT_TEST(testTextTableCellNames);
+CPPUNIT_TEST(testShapeAnchorUndo);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1476,6 +1478,31 @@ void SwUiWriterTest::testTextTableCellNames()
 CPPUNIT_ASSERT(nCol == 105);
 }
 
+void SwUiWriterTest::testShapeAnchorUndo()
+{
+SwDoc* pDoc = createDoc("draw-anchor-undo.odt");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SdrPage* pPage = 
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+SdrObject* pObject = pPage->GetObj(0);
+Rectangle aOrigLogicRect(pObject->GetLogicRect());
+
+sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
+rUndoManager.StartUndo(UNDO_START, NULL);
+
+pWrtShell->SelectObj(Point(), 0, pObject);
+
+pWrtShell->GetDrawView()->MoveMarkedObj(Size(100, 100), false);
+pWrtShell->ChgAnchor(0, true, true);
+
+rUndoManager.EndUndo(UNDO_END, NULL);
+
+CPPUNIT_ASSERT(aOrigLogicRect != pObject->GetLogicRect());
+
+rUndoManager.Undo();
+
+CPPUNIT_ASSERT(aOrigLogicRect == pObject->GetLogicRect());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
commit f1256611054701a2bba20225fb654814eecbf559
Author: Caolán McNamara 
Date:   Fri Jul 3 11:46:18 2015 +0100

Resolves: tdf#92137 drawing layer resize undo in writer fails...

to restore location correctly

if SwFEShell::EndDrag is tweaked to not group the anchor change
undo and the draw size/pos change undo together and then you
undo each step in the ui one at a time this works fine.

The first undo occurs, then the layout kicks in on idle and calls MakeObjPos
on the drawing item and updates it for the new anchor pos

Then on triggering size undo the anchor is correct so the new
pos is set correctly.

If they are bundled together however, the layout at idle doesn't occur
until after the anchor and size have been set, so the adjustment is
too late

Change-Id: I5402d851fcae7f240cc6e9a0e15159115bb663ce

diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index ec5770d..9283ae2 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -480,9 +480,9 @@ bool 
SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
 }
 }
 
+SwDrawContact *pCont = NULL;
 if ( RES_DRAWFRMFMT == pFrameFormat->Which() ) {
-SwDrawContact *pCont =
-static_cast(pFrameFormat->FindContactObj());
+pCont = static_cast(pFrameFormat->FindContactObj());
 // The Draw model also prepared an Undo object for its right 
positioning
 // which unfortunately is relative. Therefore block here a position
 // change of the Contact object by setting the anchor.
@@ -508,8 +508,13 @@ bool 
SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
 pTextNd->InsertItem( aFormat, pPos->nContent.GetIndex(), 0 );
 }
 
-if( RES_DRAWFRMFMT != pFrameFormat->Which() )
+if (RES_DRAWFRMFMT != pFrameFormat->Which())
 pFrameFormat->MakeFrms();
+else
+{
+SdrObject* pSdrObj = pFrameFormat->FindSdrObject();
+pCont->GetAnchoredObj(pSdrObj)->MakeObjPos();
+}
 
 rContext.SetSelections(pFrameFormat, 0);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/basegfx sax/inc shell/inc shell/source stoc/source

[Noel Grandin]

 include/basegfx/color/bcolor.hxx  |   31 --
 include/basegfx/matrix/b2dhommatrixtools.hxx  |1 
 include/basegfx/pixel/bpixel.hxx  |5 -
 include/basegfx/range/b1drange.hxx|   22 
 include/basegfx/range/b2ibox.hxx  |   57 
 include/basegfx/range/b2irange.hxx|   50 --
 include/basegfx/range/b3drange.hxx|   65 --
 include/basegfx/tuple/b2i64tuple.hxx  |   14 ---
 include/basegfx/tuple/b3ituple.hxx|   18 ---
 include/basegfx/vector/b3dvector.hxx  |   26 -
 sax/inc/xml2utf.hxx   |4 
 shell/inc/internal/i_xml_parser_event_handler.hxx |7 -
 shell/source/unix/sysshell/recently_used_file_handler.cxx |7 -
 stoc/source/corereflection/base.hxx   |6 -
 stoc/source/javavm/javavm.hxx |3 
 15 files changed, 316 deletions(-)

New commits:
commit 3b32c5898ff4e744d3f18b00421b433500426d74
Author: Noel Grandin 
Date:   Thu Jul 2 14:21:30 2015 +0200

loplugin:unusedmethods sax,shell,stoc,basegfx

Change-Id: Ia5d63f7153e4b02acc5e206739316264d6d1184e

diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 2bdd420..4358e05 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -131,15 +131,6 @@ namespace basegfx
 return *this;
 }
 
-// blend to another color using luminance
-void blend(const BColor& rColor)
-{
-const double fLuminance(luminance());
-mfX = rColor.getRed() * fLuminance;
-mfY = rColor.getGreen() * fLuminance;
-mfZ = rColor.getBlue() * fLuminance;
-}
-
 // luminance
 double luminance() const
 {
@@ -164,16 +155,6 @@ namespace basegfx
 return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB);
 }
 
-double getMinimumDistance(const BColor& rColor) const
-{
-const double fDistR(getDistanceRed(rColor));
-const double fDistG(getDistanceGreen(rColor));
-const double fDistB(getDistanceBlue(rColor));
-
-double fRetval(fDistR < fDistG ? fDistR : fDistG);
-return (fRetval < fDistB ? fRetval : fDistB);
-}
-
 double getMaximumDistance(const BColor& rColor) const
 {
 const double fDistR(getDistanceRed(rColor));
@@ -206,18 +187,6 @@ namespace basegfx
 return static_cast( 
::basegfx::B3DTuple::getEmptyTuple() );
 }
 
-com::sun::star::uno::Sequence< double > colorToDoubleSequence(const 
com::sun::star::uno::Reference< com::sun::star::rendering::XGraphicDevice >& 
/*xGraphicDevice*/) const
-{
-com::sun::star::uno::Sequence< double > aRet(4);
-double* pRet = aRet.getArray();
-
-pRet[0] = mfX;
-pRet[1] = mfY;
-pRet[2] = mfZ;
-pRet[3] = 1.0;
-
-return aRet;
-}
 };
 } // end of namespace basegfx
 
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx 
b/include/basegfx/matrix/b2dhommatrixtools.hxx
index b2aef89..41a17ec 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -218,7 +218,6 @@ namespace basegfx
 const B2DVector& getScale() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
maScale; }
 const B2DVector& getTranslate() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
maTranslate; }
 double getRotate() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
mfRotate; }
-double getShearX() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
mfShearX; }
 };
 } // end of namespace tools
 
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index cf5c7a3..fda6a79 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -95,21 +95,16 @@ namespace basegfx
 sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; }
 sal_uInt8 getBlue() const { return maPixelUnion.maRGBO.mnB; }
 sal_uInt8 getOpacity() const { return maPixelUnion.maRGBO.mnO; }
-sal_uInt32 getRedGreenBlueOpacity() const { return 
maPixelUnion.maCombinedRGBO.mnValue; }
 
 // data access write
 void setRed(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnR = nNew; }
 void setGreen(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnG = nNew; }
 void setBlue(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnB = nNew; }
 void setOpacit

[Libreoffice-commits] core.git: 3 commits - config_host.mk.in configure.ac download.lst external/Module_external.mk Makefile.fetch onlineupdate/Executable_updater.mk onlineupdate/README onlineupdate/s

[Jan Holesovsky]

 Makefile.fetch  |1 
 RepositoryExternal.mk   |   33 ++
 config_host.mk.in   |3 
 configure.ac|   24 +
 download.lst|1 
 external/Module_external.mk |1 
 onlineupdate/Executable_updater.mk  |   21 -
 onlineupdate/README |4 
 onlineupdate/source/libmar/sign/moz.build   |   24 -
 onlineupdate/source/libmar/src/moz.build|   30 -
 onlineupdate/source/libmar/tool/moz.build   |   58 ---
 onlineupdate/source/libmar/verify/moz.build |   32 --
 onlineupdate/source/update/common/moz.build |   29 -
 onlineupdate/source/update/src/moz.build|   30 -
 onlineupdate/source/update/updater/automounter_gonk.cxx |  251 
 onlineupdate/source/update/updater/automounter_gonk.h   |   48 ---
 onlineupdate/source/update/updater/moz.build|   13 
 onlineupdate/source/update/updater/updater.cxx  |2 
 18 files changed, 67 insertions(+), 538 deletions(-)

New commits:
commit 025952f52767fb3508a6725468fe4b1e6ce4c9b1
Author: Jan Holesovsky 
Date:   Fri Jul 3 13:46:38 2015 +0200

online update: Make the 'updater' build & link at least on Linux.

Works with the non-system bzip2; the --with-system case might still need 
some
love - but then again, distros want to have the online update switched off
anyway...

Change-Id: I26a27aec07a8f1aac22a4d14a38fb5b833550ea7

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0592dea..a556c3d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4131,16 +4131,19 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS))
 
 endef
+
 gb_ExternalProject__use_bzip2 :=
 
 else # !SYSTEM_BZIP2
 
 define gb_LinkTarget__use_bzip2
-$(call gb_LinkTarget_use_external_project,$(1),bzip2)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,bzip2) \
$$(INCLUDE) \
 )
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,bzip2) -lbz2 \
+)
 endef
 
 define gb_ExternalProject__use_bzip2
diff --git a/onlineupdate/Executable_updater.mk 
b/onlineupdate/Executable_updater.mk
index 30713c4..a4c4f95 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -26,22 +26,6 @@ $(eval $(call gb_Executable_add_libs,updater,\
 -lICE \
 ))
 
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Executable_set_include,updater,\
-   -lgtk \
-))
-$(eval $(call gb_Exectuable_add_libs,updater,\
-   -lpthread \
-))
-else ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_set_include,updater,\
-   -lgtk \
-))
-$(eval $(call gb_Exectuable_add_libs,updater,\
-   -lpthread \
-))
-endif
-
 $(eval $(call gb_Executable_add_cxxflags,updater,\
 $$(GTK3_CFLAGS) \
 ))
diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 8de9cc1..998a310 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -143,7 +143,7 @@ static bool sUseHardLinks = true;
 // declare it here to avoid including that entire header file.
 #define BZ2_CRC32TABLE_UNDECLARED
 
-#if MOZ_IS_GCC
+#if defined(HAVE_GCC_VISIBILITY_FEATURE)
 extern "C"  __attribute__((visibility("default"))) unsigned int 
BZ2_crc32Table[256];
 #undef BZ2_CRC32TABLE_UNDECLARED
 #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
commit 7eb863d6b6258f31343d4b0b82038afe5e036bc0
Author: Nathan Yee 
Date:   Fri Jul 3 11:58:27 2015 +0200

online update: Add the bzip2 external.

Change-Id: Id7547390c49c0bcf672eb1a9863fc236518bfa49

diff --git a/Makefile.fetch b/Makefile.fetch
index 390d3d0..87c8b8a 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -112,6 +112,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,APR,APR_UTIL_TARBALL) \
$(call fetch_Optional,BOOST,BOOST_TARBALL) \
$(call fetch_Optional,BSH,BSH_TARBALL) \
+   $(call fetch_Optional,BZIP2,BZIP2_TARBALL) \
$(call fetch_Optional,CAIRO,CAIRO_TARBALL) \
$(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \
$(call fetch_Optional,CDR,CDR_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3ea67b8..0592dea 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4120,4 +4120,34 @@ endef
 
 endif
 
+ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
+ifneq ($(SYSTEM_BZIP2),)
+
+define gb_LinkTarget__use_bzip2
+$(call gb_LinkTarget_set_include,$(1),\
+   $(BZIP2_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS))
+
+en

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

[Tor Lillqvist]

 vcl/source/window/cursor.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 05806f4603476dd150af7770543fea749cc6d10c
Author: Tor Lillqvist 
Date:   Fri Jul 3 14:46:37 2015 +0300

Don't belive the 'draw direct' parameter when double-buffering

Avoids leftover artefacts of the blinking text insertion cursor. Did not 
seem
to have any ill effects.

Change-Id: I8a1e7413034eacb3014a4ca902cf5e72bda492a4

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index b665be7..e1119ae 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -167,6 +167,9 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool 
bRestore )
 
 if ( pWindow )
 {
+if ( pWindow->SupportsDoubleBuffering() )
+bDrawDirect = false;
+
 if ( !mpData )
 {
 mpData = new ImplCursorData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2 sfx2/uiconfig

[Szymon Kłos]

 include/sfx2/dinfdlg.hxx |2 +-
 sfx2/uiconfig/ui/documentinfopage.ui |7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4acd1debc1cf1b002e3a3555c4dd7579d3f65e24
Author: Szymon Kłos 
Date:   Fri Jul 3 13:03:59 2015 +0200

tdf#83089 : Cannot select location in properties dialogue

Change-Id: I008622cb8178cb1c83f72e5919ebc1be0dd9a2d5
(cherry picked from commit 7976422efedb973c17d7af3f6fa69325c632a0d2)
Signed-off-by: Michael Stahl 

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index eb589bd..a8b7d04 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -185,7 +185,7 @@ private:
 VclPtrm_pChangePassBtn;
 
 VclPtr   m_pShowTypeFT;
-VclPtr  m_pFileValEd;
+VclPtr   m_pFileValEd;
 VclPtr   m_pShowSizeFT;
 
 VclPtr   m_pCreateValFt;
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 4697207..633ffa1 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -297,10 +297,13 @@
   
 
 
-  
+  
 True
 True
-False
+True
+True
+0
+50
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/uiconfig

[Szymon Kłos]

 include/sfx2/dinfdlg.hxx |2 +-
 sfx2/uiconfig/ui/documentinfopage.ui |7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 7976422efedb973c17d7af3f6fa69325c632a0d2
Author: Szymon Kłos 
Date:   Fri Jul 3 13:03:59 2015 +0200

tdf#83089 : Cannot select location in properties dialogue

Change-Id: I008622cb8178cb1c83f72e5919ebc1be0dd9a2d5

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index eb589bd..a8b7d04 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -185,7 +185,7 @@ private:
 VclPtrm_pChangePassBtn;
 
 VclPtr   m_pShowTypeFT;
-VclPtr  m_pFileValEd;
+VclPtr   m_pFileValEd;
 VclPtr   m_pShowSizeFT;
 
 VclPtr   m_pCreateValFt;
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 4697207..633ffa1 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -297,10 +297,13 @@
   
 
 
-  
+  
 True
 True
-False
+True
+True
+0
+50
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Adding Languages to Writer's Character, Font Menu

[Caolán McNamara]

On Thu, 2015-07-02 at 19:34 +0100, Richard Wordingham wrote:
> On Wed, 24 Jun 2015 23:40:10 +0200
> Michael Stahl  wrote:
> 
> > On 24.06.2015 23:26, toki wrote:
> 
> > > That is part of the reason why I think the whole Western/CJKV/CTL
> > > split should be thrown out, and replaced with language/writing
> > > system, supplemented by locale data.
> 
> > that's a great idea in theory, unfortunately it would throw out any
> > hope of compatibility with Microsoft Office as well
> 
> How does one achieve compatibility with per script font-selection as
> shown in
> http://blogs.msdn.com/b/officeinteroperability/archive/2013/04/22/office-open-xml-themes-schemes-and-fonts.aspx
>  ?
> 
> For that matter, how does the current scheme square with a style having
> separate fonts for ASCII and other Latin characters - the *four*-way
> split ASCII / 'High ANSI' / Complex Script / East Asian?

See
http://opengrok.libreoffice.org/xref/core/filter/source/msfilter/util.cxx#127
for the last time I went digging into the rancid pit of what MSOffice
means there.

Though we don't use that above method anywhere at the moment, its just
documentation of what I think I found out. I don't know what we
currently do for ASCII/High-ANSI, but for the other categories we assume
that our CTL is the same as their Complex Script and our CJK is the same
as their East Asian and for the .doc format (and possibly also the docx,
would need to check that) GetPseudoCharRuns in
sw/source/filter/ww8/writerwordglue.cxx splits the text up into those
runs

C.

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

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

[Noel Grandin]

 include/sot/object.hxx|   69 
 sot/source/base/object.cxx|   37 +--
 sot/source/sdstor/storage.cxx |   80 ++
 3 files changed, 107 insertions(+), 79 deletions(-)

New commits:
commit 9136f2344af88d524b6c10b6b2dfd6017bba60ec
Author: Noel Grandin 
Date:   Fri Jul 3 10:29:31 2015 +0200

expand out some sot macros

Change-Id: Ic583fe767e5f85628f8270ec740ce3e72fe56ded
Reviewed-on: https://gerrit.libreoffice.org/16722
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index c4aa662..8c20856 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -25,72 +25,6 @@
 #include 
 #include 
 
-#define SO2_IMPL_BASIC_CLASS_DLL(ClassName,FactoryName,GlobalName)\
-SotFactory * ClassName::ClassFactory() \
-{ \
-SotFactory **ppFactory = GetFactoryAdress();   \
-if( !*ppFactory ) \
-{ \
-*ppFactory = new FactoryName( GlobalName, \
-OUString( #ClassName ), ClassName::CreateInstance ); \
-} \
-return *ppFactory;\
-} \
-void * ClassName::CreateInstance( SotObject ** ppObj )\
-{ \
-ClassName * p = new ClassName();  \
-if( ppObj )   \
-*ppObj = p;   \
-return p; \
-} \
-const SotFactory * ClassName::GetSvFactory() const \
-{ \
-return ClassFactory();\
-} \
-void * ClassName::Cast( const SotFactory * pFact ) \
-{ \
-void * pRet = NULL;   \
-if( !pFact || pFact == ClassFactory() )   \
-pRet = this;  \
-return pRet;  \
-}
-
-#define SO2_IMPL_BASIC_CLASS1_DLL(ClassName,FactoryName,Super1,GlobalName)\
-SotFactory * ClassName::ClassFactory() \
-{ \
-SotFactory **ppFactory = GetFactoryAdress();   \
-if( !*ppFactory ) \
-{ \
-*ppFactory = new FactoryName( GlobalName, \
-OUString( #ClassName ), ClassName::CreateInstance ); \
-(*ppFactory)->PutSuperClass( Super1::ClassFactory() );\
-} \
-return *ppFactory;\
-} \
-void * ClassName::CreateInstance( SotObject ** ppObj )\
-{ \
-ClassName * p = new ClassName();  \
-Super1* pSuper1 = p;  \
-SotObject* pBasicObj = pSuper1;\
-if( ppObj )   \
-*ppObj = pBasicObj;   \
-return p; \
-} \
-const SotFactory * ClassName::GetSvFactory() const\
-{ \
-return ClassFactory();\
-} \
-void * ClassName::Cast( const SotFactory * pFact )\
-{ \
-   

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

[Caolán McNamara]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 338f47cf52f6eed3c05021d4272604438f0f550d
Author: Caolán McNamara 
Date:   Thu Jul 2 16:40:21 2015 +0100

fix a11y crash seen on moving chart wizard dialog

Change-Id: Ic3ba292e28fe12d7dcc2c2e67aeea48a4c8aaac2
(cherry picked from commit b161552bd9f7d6b6de9752e4f0e7d6f65bbcf42e)
(cherry picked from commit ea228fdffd17b87e398216625213a691fcb34825)
Reviewed-on: https://gerrit.libreoffice.org/16714
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index ea2688e..b2ff325 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -813,8 +813,9 @@ uno::Reference< XAccessible > 
ScChildrenShapes::GetSelected(sal_Int32 nSelectedC
 std::vector < uno::Reference < drawing::XShape > > aShapes;
 FillShapes(aShapes);
 
-if(aShapes.size()<=0)
+if (nSelectedChildIndex < 0 || 
static_cast(nSelectedChildIndex) >= aShapes.size())
 return xAccessible;
+
 SortedShapes::iterator aItr;
 if (FindShape(aShapes[nSelectedChildIndex], aItr))
 xAccessible = Get(aItr - maZOrderedShapes.begin());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source external/liborcus external/redland filter/source forms/qa forms/source fpicker/source framework/inc framework/qa framework/source

[Andrea Gelmini]

 extensions/source/ole/oleobjw.cxx |2 -
 extensions/source/plugin/base/xplugin.cxx |4 +-
 extensions/source/resource/resourceservices.cxx   |2 -
 extensions/source/update/check/updatecheckconfig.hxx  |2 -
 external/liborcus/ExternalProject_liborcus.mk |2 -
 external/redland/raptor/raptor2.h |2 -
 external/redland/rasqal/rasqal.h  |4 +-
 filter/source/config/cache/filtercache.cxx|2 -
 filter/source/config/cache/filtercache.hxx|4 +-
 filter/source/config/cache/typedetection.cxx  |2 -
 filter/source/graphicfilter/epict/epict.cxx   |2 -
 filter/source/graphicfilter/idxf/dxfvec.hxx   |2 -
 filter/source/graphicfilter/ipict/shape.cxx   |2 -
 filter/source/graphicfilter/itiff/ccidecom.cxx|2 -
 filter/source/graphicfilter/itiff/ccidecom.hxx|2 -
 filter/source/msfilter/eschesdo.cxx   |2 -
 filter/source/msfilter/msdffimp.cxx   |2 -
 filter/source/msfilter/util.cxx   |2 -
 filter/source/svg/svgexport.cxx   |4 +-
 filter/source/xslt/common/math.xsl|4 +-
 forms/qa/integration/forms/FormControlTest.java   |2 -
 forms/source/component/ImageControl.hxx   |2 -
 forms/source/xforms/datatypes.cxx |2 -
 forms/source/xforms/xpathlib/xpathlib.cxx |2 -
 fpicker/source/office/iodlg.cxx   |4 +-
 fpicker/source/win32/filepicker/FileOpenDlg.hxx   |2 -
 fpicker/source/win32/filepicker/VistaFilePicker.hxx   |2 -
 framework/inc/interaction/quietinteraction.hxx|2 -
 framework/qa/complex/XUserInputInterception/EventTest.java|2 -
 framework/qa/complex/api_internal/CheckAPI.java   |2 -
 framework/qa/complex/framework/recovery/RecoveryTest.java |2 -
 framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java  |2 -
 framework/source/accelerators/acceleratorconfiguration.cxx|2 -
 framework/source/accelerators/presethandler.cxx   |2 -
 framework/source/classes/framecontainer.cxx   |8 ++--
 framework/source/dispatch/closedispatcher.cxx |4 +-
 framework/source/dispatch/dispatchprovider.cxx|2 -
 framework/source/dispatch/interceptionhelper.cxx  |2 -
 framework/source/dispatch/oxt_handler.cxx |   10 ++---
 framework/source/dispatch/servicehandler.cxx  |4 +-
 framework/source/fwi/threadhelp/transactionmanager.cxx|6 +--
 framework/source/inc/dispatch/loaddispatcher.hxx  |2 -
 framework/source/jobs/job.cxx |2 -
 framework/source/jobs/jobdata.cxx |6 +--
 framework/source/jobs/jobresult.cxx   |2 -
 framework/source/loadenv/loadenv.cxx  |4 +-
 framework/source/services/ContextChangeEventMultiplexer.cxx   |2 -
 framework/source/services/autorecovery.cxx|6 +--
 framework/source/services/desktop.cxx |2 -
 framework/source/services/frame.cxx   |   18 
+-
 framework/source/services/pathsettings.cxx|2 -
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |2 -
 framework/source/uielement/popuptoolbarcontroller.cxx |2 -
 53 files changed, 83 insertions(+), 83 deletions(-)

New commits:
commit 465489d97ab9ffa0bfee02d80eb99aad771aee3f
Author: Andrea Gelmini 
Date:   Thu Jul 2 18:22:30 2015 +0200

Fix typos

Change-Id: Id884946cae0687d0b71c967e236e58df17567884
Reviewed-on: https://gerrit.libreoffice.org/16707
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index 364e256..eb49637 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1723,7 +1723,7 @@ Any  
IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
 }
 else
 {
-//If there are namesd arguments, then the dispparams.cArgs
+//If there are named arguments, then the dispparams.cArgs
 //is the number of supplied args, otherwise it is the expected number.
 if (dispparams.cNamedArgs)
 

[Libreoffice-commits] core.git: hwpfilter/source i18nlangtag/source i18npool/inc i18npool/source idlc/test idl/source include/basegfx include/basic include/comphelper include/drawinglayer include/edit

[Andrea Gelmini]

 hwpfilter/source/hbox.h  |2 +-
 hwpfilter/source/hwpeq.cxx   |2 +-
 i18nlangtag/source/languagetag/languagetag.cxx   |2 +-
 i18npool/inc/servicename.hxx |2 +-
 i18npool/source/breakiterator/breakiteratorImpl.cxx  |2 +-
 i18npool/source/localedata/LocaleNode.cxx|2 +-
 i18npool/source/transliteration/transliteration_body.cxx |2 +-
 idl/source/objects/object.cxx|2 +-
 idlc/test/typelookup.idl |8 
 include/basegfx/polygon/b2dlinegeometry.hxx  |2 +-
 include/basegfx/polygon/b2dpolygontools.hxx  |2 +-
 include/basic/sberrors.hxx   |2 +-
 include/comphelper/numberedcollection.hxx|4 ++--
 include/comphelper/propagg.hxx   |2 +-
 include/drawinglayer/primitive2d/cropprimitive2d.hxx |2 +-
 include/editeng/hangulhanja.hxx  |2 +-
 include/formula/vectortoken.hxx  |2 +-
 include/framework/titlehelper.hxx|2 +-
 include/jvmfwk/framework.h   |2 +-
 include/osl/process.h|2 +-
 include/osl/security.h   |2 +-
 include/osl/security_decl.hxx|2 +-
 include/registry/writer.hxx  |2 +-
 include/rtl/byteseq.h|2 +-
 include/sfx2/shell.hxx   |2 +-
 include/sfx2/sidebar/SidebarChildWindow.hxx  |2 +-
 include/sfx2/tabdlg.hxx  |2 +-
 include/svl/PasswordHelper.hxx   |2 +-
 include/svl/filerec.hxx  |6 +++---
 include/svl/undo.hxx |2 +-
 include/svtools/acceleratorexecute.hxx   |2 +-
 include/svtools/headbar.hxx  |2 +-
 include/svtools/svparser.hxx |2 +-
 include/svtools/table/tablemodel.hxx |2 +-
 include/svtools/toolpanel/decklayouter.hxx   |2 +-
 include/svtools/wizardmachine.hxx|2 +-
 include/svx/SpellDialogChildWindow.hxx   |2 +-
 include/svx/sdtfsitm.hxx |2 +-
 include/svx/svdmodel.hxx |2 +-
 include/svx/svdoashp.hxx |2 +-
 include/svx/svdotext.hxx |2 +-
 include/svx/svdouno.hxx  |2 +-
 include/svx/svdsnpv.hxx  |2 +-
 include/svx/svxids.hrc   |2 +-
 include/toolkit/awt/animatedimagespeer.hxx   |2 +-
 include/tools/weakbase.h |2 +-
 include/typelib/typedescription.h|2 +-
 include/ucbhelper/resultsetmetadata.hxx  |2 +-
 include/vcl/bitmap.hxx   |2 +-
 include/vcl/gdimetafiletools.hxx |2 +-
 include/vcl/pdfwriter.hxx|2 +-
 include/vcl/svapp.hxx|2 +-
 include/vcl/texteng.hxx  |2 +-
 include/vcl/toolbox.hxx  |2 +-
 include/xmloff/shapeexport.hxx   |2 +-
 55 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit 420923ba76ad84892fd242ed37be9d85e1ea03fe
Author: Andrea Gelmini 
Date:   Thu Jul 2 18:23:08 2015 +0200

Fix typos

Change-Id: Ie2bbe020fc6e3a4a4f913208c245f395849bb9ee
Reviewed-on: https://gerrit.libreoffice.org/16708
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index c1e5f18..7499bd2 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -807,7 +807,7 @@ struct NewNum: public HBox
 virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE;
 };
 
-// page numger(20)
+// page number(20)
 /**
  * @short Input page index in footer or header
  */
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index 7ea8815..a897abe 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -54,7 +54,7 @@ using namespace std;
 #define STRICMP strcasecmp
 #endif
 
-// sub and sup scipt script status
+// sub and sup script status
 enum { SCRIPT_NONE, SCRIPT_SUB, SCRIPT_SUP, SCRIPT_ALL};
 
 static int  eq_word(MzString& outs, istream *strm, int script = SCRIPT_NONE);
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangta

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/996b16dcb590ebf779f5d95caf15e9ab18036b07/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=39468

--- Comment #181 from Commit Notification 
 ---
Phillip Sz committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=918d3e30d7ff91387d9de55156a4c1364cc7b58c

tdf#39468 Translate German Comments - filter/source/graphicfilter/eps/eps.cxx

It will be available in 5.1.0.

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

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

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

[Phillip Sz]

 filter/source/graphicfilter/eps/eps.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 918d3e30d7ff91387d9de55156a4c1364cc7b58c
Author: Phillip Sz 
Date:   Thu Jul 2 20:55:58 2015 +0200

tdf#39468 Translate German Comments - 
filter/source/graphicfilter/eps/eps.cxx

Change-Id: Id86b7082b17a4cd702d6ab92fbeaa9ec8288d14a
Reviewed-on: https://gerrit.libreoffice.org/16715
Reviewed-by: Daniel L. Robertson 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/eps/eps.cxx 
b/filter/source/graphicfilter/eps/eps.cxx
index a3b4dc8..38460b9 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::uno;
 #define PS_RET  2
 #define PS_WRAP 4
 
-// -Feld-Typen---
+// -field-types--
 
 struct ChrSet
 {
@@ -240,7 +240,7 @@ public:
 ~PSWriter();
 };
 
-//== Methoden von PSWriter ==
+//== methods from PSWriter ==
 
 
 
@@ -2221,7 +2221,7 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint )
 mpPS->WriteCharPtr( "sf " );
 }
 if ( eTextAlign != ALIGN_BASELINE )
-{   // PostScript 
kennt kein FontAlignment
+{   // PostScript does 
not know about FontAlignment
 if ( eTextAlign == ALIGN_TOP )  // -> so I assume 
that
 aPoint.Y() += ( aSize.Height() * 4 / 5 );   // the area under 
the baseline
 else if ( eTextAlign == ALIGN_BOTTOM )  // is about 20% of 
the font size
@@ -2845,7 +2845,7 @@ bool PSWriter::ImplGetBoundingBox( double* nNumb, 
sal_uInt8* pSource, sal_uLong
 return bRetValue;
 }
 
-//== GraphicExport - die exportierte Funktion 
+//== GraphicExport - the exported function ===
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com wizards/source writerfilter/source xmerge/source xmlhelp/source xmloff/dtd xmloff/source xmlscript/source xmlsecurity/source

[Andrea Gelmini]

 wizards/com/sun/star/wizards/agenda/AgendaDocument.py  
|4 ++--
 wizards/com/sun/star/wizards/ui/FieldSelection.java
|2 +-
 wizards/com/sun/star/wizards/ui/event/DataAware.py 
|2 +-
 wizards/com/sun/star/wizards/ui/event/UnoDataAware.py  
|2 +-
 wizards/com/sun/star/wizards/web/FTPDialog.py  
|4 ++--
 wizards/com/sun/star/wizards/web/Process.py
|2 +-
 wizards/com/sun/star/wizards/web/WWD_Startup.py
|2 +-
 wizards/source/access2base/DoCmd.xba   
|4 ++--
 wizards/source/depot/CommonLang.xba
|4 ++--
 wizards/source/importwizard/API.xba
|2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx 
|2 +-
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
 |2 +-
 xmlhelp/source/treeview/tvread.cxx 
|2 +-
 xmloff/dtd/dtypes.mod  
|2 +-
 xmloff/dtd/nmspace.mod 
|2 +-
 xmloff/source/chart/contexts.hxx   
|2 +-
 xmloff/source/core/DomBuilderContext.cxx   
|2 +-
 xmloff/source/draw/ximpshap.cxx
|2 +-
 xmloff/source/forms/attriblistmerge.hxx
|2 +-
 xmloff/source/forms/elementimport.cxx  
|2 +-
 xmloff/source/script/XMLStarBasicContextFactory.cxx
|2 +-
 xmloff/source/style/xmlaustp.cxx   
|2 +-
 xmloff/source/text/XMLIndexTabStopEntryContext.cxx 
|2 +-
 xmloff/source/text/XMLTextFrameContext.cxx 
|2 +-
 xmloff/source/text/XMLTextHeaderFooterContext.cxx  
|2 +-
 xmloff/source/text/txtflde.cxx 
|2 +-
 xmloff/source/text/txtfldi.cxx 
|6 +++---
 xmloff/source/text/txtprmap.cxx
|2 +-
 xmloff/source/transform/Oasis2OOo.cxx  
|2 +-
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
|2 +-
 xmlsecurity/source/helper/xsecctl.cxx  
|2 +-
 xmlsecurity/source/xmlsec/xmlstreamio.cxx  
|2 +-
 32 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 1c5f07e60cfd81f27ad3aea0b56634554f3ef5a9
Author: Andrea Gelmini 
Date:   Thu Jul 2 18:26:18 2015 +0200

Fix typos

Change-Id: I98b4dfb0f72f315065693335e2f882bb2eed3afe
Reviewed-on: https://gerrit.libreoffice.org/16713
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py 
b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index 531068d..8ab03c4 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -410,7 +410,7 @@ class AgendaDocument(TextDocument):
 '''
 create the minutes for the given topics or remove the minutes
 section from the document.
-If no topics are supplied, or the user specified not to create minuts,
+If no topics are supplied, or the user specified not to create minutes,
 the minutes section will be removed,
 @param topicsData supplies PropertyValue arrays containing
 the values for the topics.
@@ -514,7 +514,7 @@ class AgendaDocument(TextDocument):
 
 '''given a text range and a text, fills the given
 text range with the given text.
-If the given text is empty, uses a placeholder with the giveb
+If the given text is empty, uses a placeholder with the given
 placeholder text.
 @param range text range to fill
 @param text the text to fill to the text range object.
diff --git a/wizards/com/sun/star/wizards/ui/FieldSe

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source

[Andrea Gelmini]

 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d26c86bb0bd0b56564d09c2c6ef0befcb785096
Author: Andrea Gelmini 
Date:   Wed Jul 1 00:13:57 2015 +0200

Fix PostgreSQL function name

Change-Id: Ic089540c07c7fe7c85705fc3513411a7e2571a12
Reviewed-on: https://gerrit.libreoffice.org/16698
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 5c4a29b..41c9558 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -384,7 +384,7 @@ OUString DatabaseMetaData::getStringFunctions(  ) throw 
(SQLException, RuntimeEx
 "convert_to,"
 "decode,"
 "encode,"
-"foramt,"
+"format,"
 "initcap,"
 "left,"
 "length,"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac connectivity/source cppuhelper/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source

[Andrea Gelmini]

 configure.ac |
6 +++---
 connectivity/source/commontools/TTableHelper.cxx |
2 +-
 connectivity/source/commontools/dbtools2.cxx |
2 +-
 connectivity/source/drivers/file/FConnection.cxx |
2 +-
 connectivity/source/drivers/firebird/Connection.cxx  |
2 +-
 connectivity/source/drivers/mork/MorkParser.hxx  |
2 +-
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx |
2 +-
 connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx  |
2 +-
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx   |
2 +-
 connectivity/source/drivers/postgresql/pq_resultset.cxx  |
2 +-
 cppuhelper/source/paths.cxx  |
2 +-
 cui/source/options/personalization.cxx   |
4 ++--
 cui/source/tabpages/tpshadow.cxx |
2 +-
 cui/source/tabpages/transfrm.cxx |
2 +-
 dbaccess/source/core/api/RowSetCache.cxx |
2 +-
 dbaccess/source/core/dataaccess/databasedocument.hxx |
2 +-
 dbaccess/source/ext/macromigration/migrationengine.cxx   |
2 +-
 dbaccess/source/ui/app/AppTitleWindow.hxx|
2 +-
 dbaccess/source/ui/control/RelationControl.cxx   |
2 +-
 dbaccess/source/ui/dlg/paramdialog.cxx   |
2 +-
 dbaccess/source/ui/inc/JoinController.hxx|
2 +-
 dbaccess/source/ui/inc/TableConnectionData.hxx   |
2 +-
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx |
2 +-
 desktop/source/app/app.cxx   |
2 +-
 desktop/source/deployment/gui/dp_gui_updatedata.hxx  |
2 +-
 desktop/source/deployment/manager/dp_extensionmanager.hxx|
2 +-
 desktop/source/deployment/manager/dp_manager.cxx |
2 +-
 desktop/source/deployment/misc/dp_descriptioninfoset.cxx |
2 +-
 desktop/source/deployment/registry/component/dp_component.cxx|
2 +-
 desktop/source/deployment/registry/help/dp_help.cxx  |
2 +-
 drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx   |
2 +-
 drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx |
2 +-
 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx   |
2 +-
 drawinglayer/source/primitive3d/sdrprimitive3d.cxx   |
2 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |
4 ++--
 editeng/source/accessibility/AccessibleStaticTextBase.cxx|
2 +-
 editeng/source/editeng/eertfpar.cxx  |
2 +-
 editeng/source/editeng/impedit2.cxx  |
2 +-
 editeng/source/editeng/impedit3.cxx  |
2 +-
 editeng/source/editeng/impedit4.cxx  |
2 +-
 editeng/source/editeng/impedit5.cxx  |
2 +-
 editeng/source/misc/splwrap.cxx  |
2 +-
 editeng/source/outliner/outlvw.cxx   |
2 +-
 43 files changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 87dc6c82d5cd174ae2384b66a203a93402b43291
Author: Andrea Gelmini 
Date:   Thu Jul 2 18:21:49 2015 +0200

Fix typos

Change-Id: Ideb5688a8c9e7cf10038f2e9d00991e8653b1875
Reviewed-on: https://gerrit.libreoffice.org/16706
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/configure.ac b/configure.ac
index 70ab9c8..06b2d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1453,10 +1453,10 @@ AC_ARG_ENABLE(openssl,
 
 AC_ARG_ENABLE(library-bin-tar,
 AS_HELP_STRING([--enable-library-bin-tar],
-[Enable the building and reused of tarball of binary build for some 
'external' libraries
+[Enable the building and reused of tarball of binary build for some 
'external' libraries.
 Some libraries can save their build result in a tarball
-stored in TARFILE_LOCATION. that binary tarball is
-uniquely identified by the source tarbal,
+stored in TARFILE_LOCATION. That binary tarball is
+uniquely identified by the source tarball,
 the content of the config_host.mk file and the content
 of the top-level directory in core for that library
 If this option is enabled, then if such a tarfile exist, it will be 
untarred
diff --git a/connectivity/sourc

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - sw/source vcl/source

[Miklos Vajna]

 sw/source/core/layout/frmtool.cxx |2 +-
 vcl/source/control/button.cxx |8 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 64b4ed9de3852494416cdcb8c25d2e24fc4d0253
Author: Miklos Vajna 
Date:   Thu Jul 2 12:09:59 2015 +0200

tdf#92443 PushButton::ImplDrawPushButtonFrame: fix Invalidate() loop

Regression from commit 32a776c83b86db3efaa7177c479e9327f28fbf46
(Refactor Buttons to use RenderContext when painting, 2015-05-05), the
problem was that we started to call vcl::Window::SetSettings(), which
invokes Invalidate(), which should not happen, since we're in Paint().

Fix this by restoring the old behavior of calling
OutputDevice::SetSettings() directly again.

Change-Id: I57c8e7947764e8cdc2d144be2dd140d3c408255d
(cherry picked from commit b45040d1ec1a0b765f1b2284fffaed2b17b6227b)

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index e8ab9c9..2b3759e 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -729,9 +729,13 @@ void 
PushButton::ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext,
 StyleSettings aStyleSettings = aSettings.GetStyleSettings();
 aStyleSettings.Set3DColors(GetControlBackground());
 aSettings.SetStyleSettings(aStyleSettings);
-rRenderContext.SetSettings(aSettings);
+
+// Call OutputDevice::SetSettings() explicitly, as rRenderContext may
+// be a vcl::Window in fact, and vcl::Window::SetSettings() will call
+// Invalidate(), which is a problem, since we're in Paint().
+rRenderContext.OutputDevice::SetSettings(aSettings);
 rRect = aDecoView.DrawButton(rRect, nStyle);
-rRenderContext.SetSettings(aOldSettings);
+rRenderContext.OutputDevice::SetSettings(aOldSettings);
 }
 else
 rRect = aDecoView.DrawButton(rRect, nStyle);
commit 7fe52c31531ab3ba0d8ca92d16096861b77db081
Author: Miklos Vajna 
Date:   Thu Jul 2 09:56:33 2015 +0200

coverity#1309050 pLayout might be 0 here

Change-Id: I5756c033e173faaba373c145b15a07e275453643
(cherry picked from commit ef46186bbab756442db1b7c12cd1902c138c737e)

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 6cbc38c..72bfaef 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3317,7 +3317,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify 
const& rMod, sal_uInt1
 {
 SwObjectFormatter::FormatObj( *pFlyFrm );
 }
-pTmpFrm->Calc(pLayout->GetCurrShell()->GetOut());
+pTmpFrm->Calc(pLayout ? 
pLayout->GetCurrShell()->GetOut() : 0);
 }
 
 // #127369#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - download.lst external/curl external/nss

[Michael Stahl]

 download.lst  |6 
 external/curl/curl-7.26.0_win-proxy.patch |9 
 external/curl/curl-msvc-schannel.patch.1  |4 
 external/nss/UnpackedTarball_nss.mk   |2 
 external/nss/nspr-build-config.patch  | 2543 --
 external/nss/nss-linux-x86.patch.0|   10 
 external/nss/nss.patch|6 
 external/nss/nss_macosx.patch |   32 
 8 files changed, 12 insertions(+), 2600 deletions(-)

New commits:
commit 6e7991dfd8c54a833f4a9795a0d57f4690e92e6b
Author: Michael Stahl 
Date:   Wed Jul 1 17:15:39 2015 +0200

nss: upgrade to release 3.19.2

- drop nss-linux-x86-patch.0:
  this was actually patching OS/2-specific code so is evidently obsolete
- drop nspr-build-config.patch:
  there does not appear to be any justification why this huge patch exists
  at all, so the only reasonable thing to do is to drop it
- nss_macosx.patch:
  drop several hunks relevant only to unuspported MacOSX/PPC platform

Change-Id: Id55fcb8eaa637c10a42203f1897480df8a6ec0fa

diff --git a/download.lst b/download.lst
index 958fad6..54ed35b 100644
--- a/download.lst
+++ b/download.lst
@@ -110,7 +110,7 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
+export NSS_TARBALL := 
2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz
 export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
 export ODFGEN_VERSION_MICRO := 4
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index fa798d1..1b9f45d 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -16,13 +16,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.aix.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
-   external/nss/nss-linux-x86.patch.0 \
external/nss/nss-win32-make.patch.1 \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \
-external/nss/nspr-build-config.patch \
 external/nss/ubsan.patch.0 \
 $(if $(filter IOS,$(OS)), \
 external/nss/nss-chromium-nss-static.patch \
diff --git a/external/nss/nspr-build-config.patch 
b/external/nss/nspr-build-config.patch
deleted file mode 100644
index 5fce0ec..000
--- a/external/nss/nspr-build-config.patch
+++ /dev/null
@@ -1,2543 +0,0 @@
 a/a/nspr/build/autoconf/GPLv3.txt  1970-01-01 01:00:00.0 +0100
-+++ b/b/nspr/build/autoconf/GPLv3.txt  2014-07-10 00:56:24.0 +0200
-@@ -0,0 +1,674 @@
-+GNU GENERAL PUBLIC LICENSE
-+   Version 3, 29 June 2007
-+
-+ Copyright (C) 2007 Free Software Foundation, Inc. 
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+Preamble
-+
-+  The GNU General Public License is a free, copyleft license for
-+software and other kinds of works.
-+
-+  The licenses for most software and other practical works are designed
-+to take away your freedom to share and change the works.  By contrast,
-+the GNU General Public License is intended to guarantee your freedom to
-+share and change all versions of a program--to make sure it remains free
-+software for all its users.  We, the Free Software Foundation, use the
-+GNU General Public License for most of our software; it applies also to
-+any other work released this way by its authors.  You can apply it to
-+your programs, too.
-+
-+  When we speak of free software, we are referring to freedom, not
-+price.  Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+them if you wish), that you receive source code or can get it if you
-+want it, that you can change the software or use pieces of it in new
-+free programs, and that you know you can do these things.
-+
-+  To protect your rights, we need to prevent others from denying you
-+these rights or asking you to surrender the rights.  Therefore, you have
-+certain responsibilities if you distribute copies of the software, or if
-+you modify it: responsibilities to respect the freedom of others.
-+
-+  For example, if you distribute copies of such a program, whether
-+gratis or for a fee

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

[Andras Timar]

 external/libvisio/UnpackedTarball_libvisio.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5289e0fac00189f975f62fa6aab5166478eef0b6
Author: Andras Timar 
Date:   Fri Jul 3 10:25:42 2015 +0200

revert inadvertedly committed hunk

Change-Id: I6b0efe5648eed68e6d69a692561a511b30bf331e

diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index f78714e..4c55ece 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
external/libvisio/vsd-msvc-max.patch.1 \
external/libvisio/ubsan.patch \
-   external/libvisio/char-background.patch \
-   external/libvisio/import-theme-color.patch \
 ))
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jurt/com jvmfwk/plugins lotuswordpro/source odk/config odk/docs odk/examples offapi/com offapi/type_reference officecfg/registry oox/inc oox/source package/source qadev

[Andrea Gelmini]

 jurt/com/sun/star/uno/AnyConverter.java
  |2 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
  |2 +-
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
  |2 +-
 lotuswordpro/source/filter/lwpcelllayout.cxx   
  |2 +-
 lotuswordpro/source/filter/lwpfribheader.hxx   
  |2 +-
 lotuswordpro/source/filter/lwplayout.cxx   
  |2 +-
 lotuswordpro/source/filter/lwppara.cxx 
  |2 +-
 lotuswordpro/source/filter/lwpstory.cxx
  |4 ++--
 lotuswordpro/source/filter/lwptablelayout.cxx  
  |2 +-
 lotuswordpro/source/filter/lwpuidoc.hxx
  |2 +-
 lotuswordpro/source/filter/xfilter/xffont.cxx  
  |2 +-
 lotuswordpro/source/filter/xfilter/xffontfactory.hxx   
  |2 +-
 lotuswordpro/source/filter/xfilter/xfframe.hxx 
  |2 +-
 odk/config/configure.pl
  |2 +-
 odk/docs/idl/wikilinks.py  
  |2 +-
 odk/examples/DevelopersGuide/Config/ConfigExamples.java
  |2 +-
 odk/examples/DevelopersGuide/Forms/SalesFilter.java
  |2 +-
 odk/examples/DevelopersGuide/GUI/UnoMenu.java  
  |2 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java  
  |6 +++---
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java 
  |2 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java 
  |4 ++--
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java  
  |2 +-
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
 |6 +++---
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
  |2 +-
 odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java  
  |4 ++--
 odk/examples/java/Text/TextDocumentStructure.java  
  |2 +-
 offapi/com/sun/star/ucb/Content.idl
  |4 ++--
 offapi/type_reference/typelibrary_history.txt  
  |2 +-
 officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs   
  |2 +-
 oox/inc/drawingml/chart/axismodel.hxx  
  |2 +-
 oox/source/core/binarycodec.cxx
  |2 +-
 oox/source/ppt/pptfilterhelpers.cxx
  |2 +-
 package/source/xstor/xstorage.cxx  
  |2 +-
 qadevOOo/runner/base/java_complex.java 
  |2 +-
 qadevOOo/runner/complexlib/ComplexTestCase.java
  |6 +++---
 qadevOOo/runner/helper/LoggingThread.java  
  |2 +-
 qadevOOo/runner/lib/SimpleStatus.java  
  |4 ++--
 qadevOOo/runner/lib/TestResult.java
  |4 ++--
 qadevOOo/runner/stats/Summarizer.java  
  |2 +-
 qadevOOo/runner/util/UITools.java  
  |2 +-
 qadevOOo/runner/util/XMLTools.java 
  |2 +-
 qadevOOo/runner/util/utils.java
  |2 +-
 qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java 
  |2 +-
 qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java   
  |2 +-
 qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
  |4 ++--
 qadevOOo/tests/java/ifc/beans/_XPropertyState.java 
  |2 +-
 qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java   
  |2 +-
 qadevOOo/tests/java/ifc/datatransfe

[Libreoffice-commits] core.git: desktop/source extensions/test external/libvisio framework/source include/sfx2 qadevOOo/tests sw/source ucb/source wizards/com

[Andras Timar]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |2 +-
 extensions/test/ole/VisualBasic/Module1.vb   |2 +-
 extensions/test/pgp/readme.txt   |2 +-
 external/libvisio/UnpackedTarball_libvisio.mk|2 ++
 framework/source/uielement/menubarmerger.cxx |2 +-
 include/sfx2/shell.hxx   |2 +-
 qadevOOo/tests/java/ifc/frame/_XFrame.java   |2 +-
 sw/source/core/doc/DocumentLayoutManager.cxx |2 +-
 sw/source/filter/xml/xmltbli.cxx |2 +-
 ucb/source/ucp/webdav-neon/NeonSession.cxx   |2 +-
 wizards/com/sun/star/wizards/web/WWD_Events.py   |2 +-
 11 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit e9e61a4a7850ec7f2e0cf238c58794b021da5235
Author: Andras Timar 
Date:   Fri Jul 3 10:05:58 2015 +0200

typo: therfore -> therefore

Change-Id: I9dcc0ce882dfd533d98a4f71625bb85e44084283

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 86adb02..bc2319f 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1481,7 +1481,7 @@ short UpdateRequiredDialog::Execute()
 //be disabled because they are in a read only repository. However, 
disabling extensions
 //is now always possible because the registration data of all repositories
 //are in the user installation.
-//Therfore all extensions could be displayed and all the handling around 
m_bHasLockedEntries
+//Therefore all extensions could be displayed and all the handling around 
m_bHasLockedEntries
 //could be removed.
 if ( m_bHasLockedEntries )
 {
diff --git a/extensions/test/ole/VisualBasic/Module1.vb 
b/extensions/test/ole/VisualBasic/Module1.vb
index 4295ee6..ae3ca7f 100644
--- a/extensions/test/ole/VisualBasic/Module1.vb
+++ b/extensions/test/ole/VisualBasic/Module1.vb
@@ -201,7 +201,7 @@ Public Sub Main()
 objOleTest.testout_methodUHyper(outUHyper)
 objOleTest.testout_methodString(outString)
 objOleTest.testout_methodChar(outChar)
-'outCharAsString is a string. Therfore the returned sal_Unicode value 
of 65 will be converted
+'outCharAsString is a string. Therefore the returned sal_Unicode value 
of 65 will be converted
 'to a string "65"
 objOleTest.testout_methodChar(outCharAsString)
 objOleTest.testout_methodAny(outAny)
diff --git a/extensions/test/pgp/readme.txt b/extensions/test/pgp/readme.txt
index bb59434..ccb26d3 100644
--- a/extensions/test/pgp/readme.txt
+++ b/extensions/test/pgp/readme.txt
@@ -23,7 +23,7 @@ Please note the semicolons!
  Office/user/config/javarc
  under SystemClasspath.
 
-There is a bug with jdk1.1.8, therfore use 1.2 instead.
+There is a bug with jdk1.1.8, therefore use 1.2 instead.
 
 The TestPGP is called without ;iiop; :
 
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index 4c55ece..f78714e 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
external/libvisio/vsd-msvc-max.patch.1 \
external/libvisio/ubsan.patch \
+   external/libvisio/char-background.patch \
+   external/libvisio/import-theme-color.patch \
 ))
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
diff --git a/framework/source/uielement/menubarmerger.cxx 
b/framework/source/uielement/menubarmerger.cxx
index 076dcb6..464b302 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -244,7 +244,7 @@ bool MenuBarMerger::ReplaceMenuItem(
 const OUString&rModuleIdentifier,
 const AddonMenuContainer& rAddonMenuItems )
 {
-// There is no replace available. Therfore we first have to
+// There is no replace available. Therefore we first have to
 // remove the old menu entry,
 pMenu->RemoveItem( nPos );
 
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 43c79d2..aae874a 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -513,7 +513,7 @@ public:
 this must be set directly from one derived SfxShell class and ny
 derivatives of SfxObjectShell.
 
-The SfxShell class itself does not have any SfxItemPool, therfore a
+The SfxShell class itself does not have any SfxItemPool, therefore a
 null-pointer is returned.
 */
 SfxItemPool& SfxShell::GetPool() const
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java 
b/qadevOOo/tests/java/ifc/frame/_XFrame.java
index 6d462eb..137405d 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrame.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java
@@ -454,7 +454,7 @@ public class _XFrame extends MultiMethodTest {
 * Test calls the method, then result is checked.
 * Has  OK  status i

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

[Miklos Vajna]

 sw/source/core/layout/layact.cxx   |4 ++--
 sw/source/core/layout/pagechg.cxx  |4 ++--
 sw/source/core/layout/paintfrm.cxx |6 +++---
 sw/source/core/view/viewsh.cxx |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit dd819b76b60df52e98d75993f9e69c22f2811de9
Author: Miklos Vajna 
Date:   Fri Jul 3 09:05:19 2015 +0200

sw: clean up SwPageFrm::PaintBorderAndShadow and related comments

Change-Id: Id046bf8a8ff9da816d4c8d0e53aabcf124258d29

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 1275893..27dc66b 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1260,7 +1260,7 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrm *pLay,
 if ( !bNoPaint && IsPaint() && bAddRect && (pLay->IsCompletePaint() || 
bChanged) )
 {
 SwRect aPaint( pLay->Frm() );
-// OD 13.02.2003 #i9719#, #105645# - consider border and shadow for
+// #i9719# - consider border and shadow for
 // page frames -> enlarge paint rectangle correspondingly.
 if ( pLay->IsPageFrm() )
 {
@@ -1306,7 +1306,7 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrm *pLay,
 aFrmAtCompletePaint = pLay->Frm();
 }
 
-// OD 13.02.2003 #i9719#, #105645# - provide paint of spacing
+// #i9719# - provide paint of spacing
 // between pages (not only for in online mode).
 if ( pLay->IsPageFrm() )
 {
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 2976db7..3c755e1 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -257,7 +257,7 @@ void SwPageFrm::DestroyImpl()
 pImp->SetFirstVisPageInvalid();
 if ( pImp->IsAction() )
 pImp->GetLayAction().SetAgain();
-// OD 12.02.2003 #i9719#, #105645# - retouche area of page
+// #i9719# - retouche area of page
 // including border and shadow area.
 const bool bRightSidebar = (SidebarPosition() == 
sw::sidebarwindows::SidebarPosition::RIGHT);
 SwRect aRetoucheRect;
@@ -621,7 +621,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const 
SfxPoolItem *pNew,
 // cleanup Window
 if( pSh && pSh->GetWin() && aOldPageFrmRect.HasArea() )
 {
-// OD 12.02.2003 #i9719#, #105645# - consider border and 
shadow of
+// #i9719# - consider border and shadow of
 // page frame for determine 'old' rectangle - it's used for 
invalidating.
 const bool bRightSidebar = (SidebarPosition() == 
sw::sidebarwindows::SidebarPosition::RIGHT);
 SwRect aOldRectWithBorderAndShadow;
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 49a0773..4f27f02 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6027,7 +6027,7 @@ bool SwPageFrm::IsLeftShadowNeeded() const
 
 /**
  * Determine rectangle for bottom page shadow
- * OD 12.02.2003 for #i9719# and #105645#
+ * for #i9719#
  */
 /*static*/ void SwPageFrm::GetHorizontalShadowRect( const SwRect& _rPageRect,
 const SwViewShell*
_pViewShell,
@@ -6090,7 +6090,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext 
*pOut, const Point& aPoin
 /**
  * Paint page border and shadow
  *
- * OD 12.02.2003 for #i9719# and #105645#
+ * for #i9719#
  * implement paint of page border and shadow
 */
 /*static*/ void SwPageFrm::PaintBorderAndShadow( const SwRect& _rPageRect,
@@ -6367,7 +6367,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext 
*pOut, const Point& aPoin
 /**
  * Get bound rectangle of border and shadow for repaints
  *
- * OD 12.02.2003 for #i9719# and #105645#
+ * for #i9719#
  */
 /*static*/ void SwPageFrm::GetBorderAndShadowBoundRect( const SwRect& 
_rPageRect,
 const SwViewShell*
_pViewShell,
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index ad014b5..3e77cf1 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1084,7 +1084,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
 aPageRect.SSize() = 
rFormatPage.GetBoundRect(GetWin()).SSize();
 }
 
-// OD 12.02.2003 #i9719#, #105645# - consider new border and 
shadow width
+// #i9719# - consider new border and shadow width
 if ( aPageRect.IsOver( aBoth ) )
 {
 SwTwips nPageLeft = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
ht