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

[Caolán McNamara]

 svtools/source/contnr/treelist.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 96e48976d25fb32d31fa5a128cfb3de103260576
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Jan 31 21:11:57 2015 +

coverity#1267678 this is surely backwards (gold)

surely we clone from the source and return the newly created
entry. Presumably this doesn't break all the time because
aCloneLink is generally set ?

coverity#1267678 Resource leak

Change-Id: I3e02dfaef371e006f1510b186cdd881c991ef2cf
(cherry picked from commit 9f1ecd3ac35f06746fe2a12ca52899f664679de5)
Reviewed-on: https://gerrit.libreoffice.org/15023
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index f60b1c9..a0fd4ca 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -355,8 +355,8 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* 
pSource ) const
 if( aCloneLink.IsSet() )
 return (SvTreeListEntry*)aCloneLink.Call( pSource );
 SvTreeListEntry* pEntry = CreateEntry();
-pSource-Clone( pEntry );
-return pSource;
+pEntry-Clone(pSource);
+return pEntry;
 }
 
 SvTreeListEntry* SvTreeList::CreateEntry() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 svtools/source/brwbox/brwbox2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5a17dd94ed0aca6cefbe1d44cd0a9aed74d1ff21
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jan 16 17:08:07 2015 +0100

fdo#88475 BrowseBox/grid: reposition data cursor to current row after paint

Change-Id: I0deee2c3cfdb111b178c4254d7b0544c4ce5c966
Reviewed-on: https://gerrit.libreoffice.org/13955
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index ef9a6d4..eacb2a8 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1031,6 +1031,8 @@ void BrowseBox::ImplPaintData(OutputDevice _rOut, const 
Rectangle _rRect, bool
 }
 }
 
+OSL_ENSURE(SeekRow(nCurRow), BrowseBox::ImplPaintData could not seek back 
to current row after paint);
+
 if (aPos.Y()  aOverallAreaBRPos.Y() + 1)
 aPos.Y() = aOverallAreaBRPos.Y() + 1;
 // needed for some of the following drawing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muthu Subramanian]

 svtools/source/misc/embedtransfer.cxx |5 +
 sw/source/core/uibase/dochdl/swdtflvr.cxx |   18 ++
 2 files changed, 23 insertions(+)

New commits:
commit 4ab54cf64ff194fa2f53f2f0d2512a4fc267674c
Author: Muthu Subramanian muthu.subramanian.karunani...@ericsson.com
Date:   Fri Oct 10 22:58:00 2014 +0530

Enable copy-paste of charts/ole as bitmaps.

Cherry-picked from 6296c64fb0ed8bce61eb6303920f952eda65de71

Change-Id: I0e074da34ff1a11c223994dcf373bf60af7cd271
Reviewed-on: https://gerrit.libreoffice.org/11911
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/svtools/source/misc/embedtransfer.cxx 
b/svtools/source/misc/embedtransfer.cxx
index 7792f84..7c99085 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -76,6 +76,7 @@ void SvEmbedTransferHelper::AddSupportedFormats()
 AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
 AddFormat( FORMAT_GDIMETAFILE );
+AddFormat( FORMAT_BITMAP );
 }
 
 
@@ -169,6 +170,10 @@ bool SvEmbedTransferHelper::GetData( const 
css::datatransfer::DataFlavor rFlavo
 SetAny( aAny, rFlavor );
 bRet = true;
 }
+else if ( ( nFormat == FORMAT_BITMAP || nFormat == 
SOT_FORMATSTR_ID_PNG )  m_pGraphic )
+{
+bRet = SetBitmapEx( m_pGraphic-GetBitmapEx(), rFlavor );
+}
 else if ( m_xObj.is()  :: 
svt::EmbeddedObjectRef::TryRunningState( m_xObj ) )
 {
 uno::Reference datatransfer::XTransferable  
xTransferable( m_xObj-getComponent(), uno::UNO_QUERY );
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx 
b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index 3cdd21a..3db9338 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -495,6 +495,7 @@ bool SwTransferable::GetData( const DataFlavor rFlavor, 
const OUString rDestDo
 
 // the following solution will be used in the case when the object can 
not generate the image
 // TODO/LATER: in future the transferhelper must probably be created 
based on object and the replacement stream
+// TODO: Block not required now, SvEmbedTransferHelper should be able 
to handle GDIMetaFile format
 if ( nFormat == SOT_FORMAT_GDIMETAFILE )
 {
 pOLEGraph = FindOLEReplacementGraphic();
@@ -828,6 +829,23 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
 AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
 
 AddFormat( FORMAT_GDIMETAFILE );
+
+// Fetch the formats supported via embedtransferhelper as well
+sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
+uno::Reference  embed::XEmbeddedObject  xObj = FindOLEObj( nAspect );
+const Graphic* pOLEGraph = FindOLEReplacementGraphic();
+if( xObj.is() )
+{
+TransferableDataHelper aD( new SvEmbedTransferHelper( xObj, 
pOLEGraph, nAspect ) );
+if ( aD.GetTransferable().is() )
+{
+DataFlavorExVector  aVector( 
aD.GetDataFlavorExVector() );
+DataFlavorExVector::iteratoraIter( aVector.begin() ), 
aEnd( aVector.end() );
+
+while( aIter != aEnd )
+AddFormat( *aIter++ );
+}
+}
 eBufferType = TRNSFR_OLE;
 }
 // Is there anything to provide anyway?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/contnr/svimpbox.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d3a227820040c25bb4ad3b28a9042e3f7d37eef0
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 9 13:50:20 2014 +0100

Resolves: fdo#82270 Grabbing focus can invalidate the entries

Change-Id: Ie9b4f936cebdcf2a37e66abef456c6b0c0e26201
(cherry picked from commit fef9bf4e39b041c7f13e4d1584e3086068e781fc)
Reviewed-on: https://gerrit.libreoffice.org/11878
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 79ae60b..d08660d 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2049,6 +2049,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent rMEvt )
 nCurTabPos = FIRST_ENTRY_TAB;
 nFlags = (~F_FILLING);
 pView-GrabFocus();
+//fdo#82270 Grabbing focus can invalidate the entries, re-fetch
+pEntry = GetEntry(aPos);
 // the entry can still be invalid!
 if( !pEntry || !pView-GetViewData( pEntry ))
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

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

New commits:
commit 233e6a62d12d2d67089f1934777ac41c9fc88238
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Sep 5 12:44:21 2014 +0200

fdo#69162 avoid crashing on Accellerator in poorly initialized context

Change-Id: If3446ae33f2c2e737acf56bb523519e7b9d9935e
Reviewed-on: https://gerrit.libreoffice.org/11293
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/svtools/source/misc/acceleratorexecute.cxx 
b/svtools/source/misc/acceleratorexecute.cxx
index 83348b1..4fe6a63 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -181,8 +181,11 @@ bool AcceleratorExecute::execute(const css::awt::KeyEvent 
aAWTKey)
 OUString sCommand = impl_ts_findCommand(aAWTKey);
 
 // No Command found? Do nothing! User isnt interested on any error 
handling .-)
-if (sCommand.isEmpty())
+// or for some reason m_xContext is NULL (which would crash 
impl_ts_getURLParser()
+if (sCommand.isEmpty() || !m_xContext.is())
+{
 return false;
+}
 
 // SAFE - --
 ::osl::ResettableMutexGuard aLock(m_aLock);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Niklas Johansson]

 svtools/source/contnr/svimpbox.cxx |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

New commits:
commit bee7674a602123229b62cad23536f103496a5298
Author: Niklas Johansson sleeping.pil...@gmail.com
Date:   Sun Aug 17 20:53:47 2014 +0200

Treeview may lose focus when left/right arrow is used

In a treeview, for example the hierarchal view of the
styles and formatting panel, if your not on a node that is
expandable or collapsable when you press the left or right
arrow key, the focus will move away from the tree view in
a very awkward way. This patch makes the control work more
like a native treeview.

At this point I don't feel confident about the surrounding
code to avoid the code duplication that this patch adds.

Reviewed-on: https://gerrit.libreoffice.org/10956
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit a6f78bf8fd5dc768cc8c37ca717d7bad8fe2dc81)

Change-Id: Ibd04cf5329b4d226aac102d214a45e45811982e7
Reviewed-on: https://gerrit.libreoffice.org/11255
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 32c694a..79ae60b 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2237,8 +2237,13 @@ bool SvImpLBox::KeyInput( const KeyEvent rKEvt)
 
 case KEY_RIGHT:
 {
-if( bSubLstOpLR  IsNowExpandable() )
-pView-Expand( pCursor );
+if( bSubLstOpLR )
+{
+// only try to expand if sublist is expandable,
+// otherwise ignore the key press
+if( IsNowExpandable() )
+pView-Expand( pCursor );
+}
 else if ( bIsCellFocusEnabled  pCursor )
 {
 if ( nCurTabPos  ( pView-TabCount() - 1 /*!2*/ ) )
@@ -2304,8 +2309,17 @@ bool SvImpLBox::KeyInput( const KeyEvent rKEvt)
 }
 }
 }
-else if( bSubLstOpLR  IsExpandable() )
-pView-Collapse( pCursor );
+else if( bSubLstOpLR )
+{
+if( IsExpandable()  pView-IsExpanded( pCursor ) )
+pView-Collapse( pCursor );
+else
+{
+pNewCursor = pView-GetParent( pCursor );
+if( pNewCursor )
+SetCursor( pNewCursor );
+}
+}
 else
 bKeyUsed = false;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit a5fedcf7fe56a56475dea484a78971c504e52272
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 29 09:27:01 2014 +0100

Resolves: fdo#83068 ignore spaces in font-size unit detection

Change-Id: Id9a5c2ee576bd533d8b0a2b4356e319354abbbac
(cherry picked from commit d54b2bd8dcc393bb168386a5c0ec4ce40bb3c6d4)
Reviewed-on: https://gerrit.libreoffice.org/11186
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index d54dcb4..415750b 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -19,6 +19,7 @@
 
 #include config_folders.h
 
+#include i18nutil/unicode.hxx
 #include tools/stream.hxx
 #include vcl/builder.hxx
 #include vcl/svapp.hxx
@@ -1724,7 +1725,7 @@ void FontSizeBox::Modify()
 const sal_Unicode* pStr = aStr.getStr();
 while ( *pStr )
 {
-if ( ((*pStr  '0') || (*pStr  '9'))  (*pStr != '%') )
+if ( ((*pStr  '0') || (*pStr  '9'))  (*pStr != '%')  
!unicode::isSpace(*pStr) )
 {
 if ( ('-' == *pStr || '+' == *pStr)  !bPtRelative )
 bPtRelative = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 svtools/source/graphic/transformer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86173e73db8f520f80c567aed27bcbfb811e7aeb
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 26 16:29:46 2014 +0300

bnc#719994: We need the proper alpha mask

Change-Id: Ic16dceaca431929238fcef6be31ee95e068b91e4
(cherry picked from commit e06014e0db64ec36ec41dee542d2453c945fddd3)
Reviewed-on: https://gerrit.libreoffice.org/11126
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/svtools/source/graphic/transformer.cxx 
b/svtools/source/graphic/transformer.cxx
index 945d78b..06c2595 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -147,7 +147,7 @@ uno::Reference graphic::XGraphic  SAL_CALL 
GraphicTransformer::applyDuotone(
 ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) );
 
 BitmapExaBitmapEx( aGraphic.GetBitmapEx() );
-Bitmap  aMask( aBitmapEx.GetMask() );
+AlphaMask   aMask( aBitmapEx.GetAlpha() );
 Bitmap  aBitmap( aBitmapEx.GetBitmap() );
 BmpFilterParam aFilter( (sal_uLong) nColorOne, (sal_uLong) nColorTwo );
 aBitmap.Filter( BMP_FILTER_DUOTONE, aFilter );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

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

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

fdo#81044 detect UTF-8 BOM too

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

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

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

[Caolán McNamara]

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

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

Related: fdo#82259 add Armenian preview text

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Khaled Hosny]

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

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

Related: fdo#82259 not all STIX are symbol fonts

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

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

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

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

[Adolfo Jayme Barrientos]

 svtools/source/config/colorcfg.cxx |2 +-
 vcl/source/app/settings.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 88f720db4ad5b0dfb922fcd2492276edd2340e62
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Thu Jul 24 15:21:33 2014 -0500

Resolves fdo#79278: not too dark, not too bright background color

This patch is based on Caolán's one at 
68075a61c28a5c72429f78776a822ed45fdcb4a7
I've chosen the background color used in Windows program Paint.NET as
our default background color. It's a nice compromise that doesn't look
out of place anywhere.

Change-Id: I5081201043be4a7ad6152d1ce59451daa4ece1ac
Reviewed-on: https://gerrit.libreoffice.org/10527
Reviewed-by: Stefan Knorr heinzless...@gmail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index 7a087c4..10c731c 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -418,7 +418,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 {
 COL_WHITE, // DOCCOLOR
 0xc0c0c0, // DOCBOUNDARIES
-0xA9A9A9, // APPBACKGROUND
+0xCFCFCF, // APPBACKGROUND
 0xc0c0c0, // OBJECTBOUNDARIES
 0xc0c0c0, // TABLEBOUNDARIES
 COL_BLACK, // FONTCOLOR
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 97b05d0..b317b72 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -708,7 +708,7 @@ void ImplStyleData::SetStandardStyles()
 maWindowTextColor   = Color( COL_BLACK );
 maDialogColor   = Color( COL_LIGHTGRAY );
 maDialogTextColor   = Color( COL_BLACK );
-maWorkspaceColor= Color( 0xA9, 0xA9, 0xA9 );
+maWorkspaceColor= Color( 0xCF, 0xCF, 0xCF );
 maMonoColor = Color( COL_BLACK );
 maFieldColor= Color( COL_WHITE );
 maFieldTextColor= Color( COL_BLACK );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 svtools/source/control/ruler.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e0a7557e97de0bad7ff8510c768bdbed6cdae6f5
Author: Michael Meeks michael.me...@collabora.com
Date:   Thu Jul 24 14:24:25 2014 -0400

fdo#51534 - rulers should have app-background by default (apparently).

Change-Id: I981febb02074ed323732ef7c19e89f1e946604f1
Reviewed-on: https://gerrit.libreoffice.org/10519
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 4332966..29655de 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -27,6 +27,7 @@
 #include svtools/ruler.hxx
 #include svtools/svtresid.hxx
 #include svtools/svtools.hrc
+#include svtools/colorcfg.hxx
 
 #include boost/scoped_array.hpp
 #include vector
@@ -1021,7 +1022,10 @@ void Ruler::ImplInitSettings( bool bFont, bool 
bForeground, bool bBackground )
 if ( IsControlBackground() )
 aColor = GetControlBackground();
 else
-aColor = rStyleSettings.GetDialogColor();
+{
+svtools::ColorConfig aColorConfig;
+aColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND 
).nColor );
+}
 SetBackground( aColor );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 svtools/source/filter/exportdialog.cxx |4 +---
 svtools/uiconfig/ui/graphicexport.ui   |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c003f0270018d0b4c9d2220d43aa5a8d239d00b4
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Tue Jun 24 21:19:35 2014 +0200

fdo#51763 - make title of dialog localisable

Following the bug report the title is currently not correctly
localisable for Catalan language due format issues.

Change-Id: I09107acb3f4acd7acf5a614216265373c59938b2
Reviewed-on: https://gerrit.libreoffice.org/9883
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 6162191b4a258d071382aeaa88aa80852b04ae2a)

diff --git a/svtools/source/filter/exportdialog.cxx 
b/svtools/source/filter/exportdialog.cxx
index 813256e..78ee438 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -639,9 +639,7 @@ ExportDialog::ExportDialog(FltCallDialogParameter rPara,
 mnMaxFilesizeForRealtimePreview = 
mpOptionsItem-ReadInt32(OUString(MaxFilesizeForRealtimePreview), 0);
 mpFtEstimatedSize-SetText(OUString( \n ));
 
-OUString aTitle(maExt);
-aTitle += GetText();
-SetText(aTitle);
+SetText( GetText().replaceFirst(%1, maExt) ); //Set dialog title
 
 mnFormat = GetFilterFormat( maExt );
 
diff --git a/svtools/uiconfig/ui/graphicexport.ui 
b/svtools/uiconfig/ui/graphicexport.ui
index 780185f..4bb27a8 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -23,7 +23,7 @@
   object class=GtkDialog id=GraphicExportDialog
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=title translatable=yes Options/property
+property name=title translatable=yes%1 Options/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/contnr/imivctl2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a3fe589d03720148a9389f6c826350b18b78672
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jun 19 09:01:56 2014 +0100

sizeof(bool) is not required to be 1

(cherry picked from commit 3daec14fd62a6a1655813d26e470513237129263)

Conflicts:
svtools/source/contnr/imivctl2.cxx

Change-Id: I19ba4e27a4403d2c17d0bbf3f29c42e4745e4c41

diff --git a/svtools/source/contnr/imivctl2.cxx 
b/svtools/source/contnr/imivctl2.cxx
index dda5d4e..6892cc1 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -579,7 +579,7 @@ void IcnGridMap_Impl::Create_Impl()
 _nGridCols += 50;
 
 _pGridMap = new bool[ _nGridRows * _nGridCols];
-memset( (void*)_pGridMap, 0, _nGridRows * _nGridCols );
+memset( _pGridMap, 0, _nGridRows * _nGridCols * sizeof(bool) );
 
 const size_t nCount = _pView-aEntries.size();
 for( size_t nCur=0; nCur  nCount; nCur++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arnaud Versini]

 svtools/source/control/toolbarmenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b99a8af33f6a349225efe489507c848f89d8fd13
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Sun Jun 15 20:08:26 2014 +0200

Resolve fdo#79913 by checking index bounds

Change-Id: I023a625d73724332245d612a61cb786acefc4cf2
Reviewed-on: https://gerrit.libreoffice.org/9791
Reviewed-by: Jean-Baptiste Faure jbfa...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 7eceffef49c9f498c5758d5e351c0f22126003e5)

diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index d0f1e49..2be0e43 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -397,7 +397,7 @@ void ToolbarMenu_Impl::notifyHighlightedEntry()
 if( pValueSet )
 nChildIndex = static_cast sal_Int32 ( 
pValueSet-GetItemPos( pValueSet-GetSelectItemId() ) );
 
-if( nChildIndex = pEntry-getAccessibleChildCount() )
+if( (nChildIndex = pEntry-getAccessibleChildCount()) || 
(nChildIndex  0) )
 return;
 
 aNew = getAccessibleChild( pEntry-mpControl, nChildIndex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits