date:20120708

From Korrawit Pruegsanusak detective.conan.1...@gmail.com:

Korrawit Pruegsanusak has uploaded a new change for review.

Change subject: fdo#51179: SearchAscii() is equal to indexOfAsciiL(), not 
match()
..

fdo#51179: SearchAscii() is equal to indexOfAsciiL(), not match()

regression from 8adec08d56a9ad46d3550e43b115e916c4cf783f

Change-Id: Ic1c3160be1c61162f6a62a7e14c4efb7bedccdcc
---
M sd/source/ui/docshell/docshel4.cxx
1 file changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/264/1
--
To view, visit https://gerrit.libreoffice.org/264
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1c3160be1c61162f6a62a7e14c4efb7bedccdcc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com

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

Question about calling a method with a default parameter

2012-07-08 Thread Christophe JAILLET


Hi,

Sometimes some methods are declared with some default value(s)
As an example, here is the definition of matchAsciiL for OUString

sal_Bool matchAsciiL( const sal_Char* asciiStr, sal_Int32 
asciiStrLength, sal_Int32 fromIndex = 0 ) const SAL_THROW(())




When these functions are called, the optional parameters are sometimes 
passed with the default values.
As an example, at line 60 of 
/framework/source/lomenubar/MenuItemStatusListener.cxx, we can find :


if ((Event.State = oULabel) 
!oULabel.matchAsciiL (private:, 8, 0) 
!oULabel.matchAsciiL (.uno:, 5, 0)
!oULabel.matchAsciiL (slot:, 5, 0)
!oULabel.matchAsciiL (service:, 8, 0) 
!oULabel.matchAsciiL (.cmd:, 5, 0)
!oULabel.matchAsciiL (macro:///, 5, 0))


Would it be interesting to lightweight the code by removing these 
useless parameters ?

It could be a Easy Hacks for Beginners


Best regards
Christophe JAILLET

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

[Libreoffice-commits] .: reportdesign/inc sc/inc sw/source xmloff/source

2012-07-08 Thread Takeshi Abe

 reportdesign/inc/UndoActions.hxx   |1 -
 sc/inc/dpitemdata.hxx  |4 
 sw/source/core/inc/layouter.hxx|2 --
 xmloff/source/chart/SchXMLChartContext.hxx |1 -
 xmloff/source/text/XMLRedlineExport.hxx|1 -
 5 files changed, 9 deletions(-)

New commits:
commit e719baa35f58a32a21c6ddc9189aa086606faf03
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sat Jul 7 17:11:08 2012 +0900

removed unused includes

Change-Id: I248ef370c55c18d60a8ea32ef92f70734bffbaf2

diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 12825ef..e8cbfe8 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -56,7 +56,6 @@
 
 #include functional
 #include memory
-#include boost/shared_ptr.hpp
 
 namespace dbaui
 {
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index e294de8..f44bc3a 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -37,10 +37,6 @@
 #include rtl/ustring.hxx
 #include dpmacros.hxx
 
-#include vector
-
-#include boost/unordered_map.hpp
-
 /**
  * When assigning a string value, you can also assign an interned string
  * whose life-cycle is managed by the pivot cache that it belongs to.  Those
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 2b62b47..2bf1ef0 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -45,8 +45,6 @@ class SwRowFrm;
 // -- #i35911#
 class SwObjsMarkedAsTmpConsiderWrapInfluence;
 class SwAnchoredObject;
-// -- #i40155#
-#include vector
 // -- #i65250#
 #include boost/unordered_map.hpp
 class SwFlowFrm;
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx 
b/xmloff/source/chart/SchXMLChartContext.hxx
index 4e39113..3b63270 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -38,7 +38,6 @@
 #include transporttypes.hxx
 
 #include list
-#include map
 
 class SchXMLImportHelper;
 
diff --git a/xmloff/source/text/XMLRedlineExport.hxx 
b/xmloff/source/text/XMLRedlineExport.hxx
index ddbc362..258a7e5 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -26,7 +26,6 @@
 
 #include list
 #include map
-#include set
 
 class SvXMLExport;
 namespace com { namespace sun { namespace star {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sfx2/source

 sfx2/source/control/thumbnailview.cxx |4 ++--
 sfx2/source/doc/templatedlg.cxx   |8 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit bdbd2c3057683694a75d9d8f88fc33e7a26c0769
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sat Jul 7 23:56:30 2012 -0430

Hide search view when theres no text to search for.

Change-Id: Ic178bf641d313b45a750f4b56dc3de53000abd8a

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bf98f42..9ac7512 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -591,6 +591,11 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
 
 mpSearchView-Invalidate();
 }
+else
+{
+mpSearchView-Hide();
+maView-Show();
+}
 
 return 0;
 }
commit 72cbe83e2f6dfba9291a404f8f77d5da68f0631f
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sat Jul 7 23:35:20 2012 -0430

Increase action toolbar width.

Change-Id: Iec101fea2f1ed505219bd6892c733cc5bc3d1f24

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2d1ff04..bf98f42 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -128,7 +128,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 Size aActionSize = mpActionBar-CalcMinimumWindowSizePixel();
 Size aTemplateSize = mpTemplateBar-CalcMinimumWindowSizePixel();
 
-aActionSize.setWidth(2*aActionSize.getWidth());
+aActionSize.setWidth(3*aActionSize.getWidth());
 
aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar-GetPosPixel().X());
 aTemplateSize.setWidth(aWinSize.getWidth());
 
commit d3314abcd91b50158f229bc4fa8ad7f02fd84bd1
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sat Jul 7 22:23:23 2012 -0430

Set default ThumbnailView fill color the same as the dialogs.

Change-Id: Id67d2dc5b626cd63f55088b7cb7950d86244d4b9

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 3897f38..b8a962c 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -52,8 +52,7 @@ enum
 };
 
 ThumbnailView::ThumbnailView (Window *pParent, WinBits nWinStyle, bool 
bDisableTransientChildren)
-: Control( pParent, nWinStyle ),
-maColor( pParent-GetBackground().GetColor() )
+: Control( pParent, nWinStyle )
 {
 ImplInit();
 mbIsTransientChildrenDisabled = bDisableTransientChildren;
@@ -106,6 +105,7 @@ void ThumbnailView::ImplInit()
 mbSelectionMode = false;
 mbActive = true;
 maFilterFunc = ViewFilterAll();
+maColor = GetSettings().GetStyleSettings().GetDialogColor();
 
 // Create the processor and process the primitives
 const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f2c961f..2d1ff04 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -176,7 +176,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 mpSearchEdit-EnableUpdateData();
 
 maView-SetStyle(WB_VSCROLL);
-maView-SetColor(GetBackground().GetColor());
 maView-SetSizePixel(aThumbSize);
 maView-setItemMaxTextLength(ITEM_MAX_TEXT_LENGTH);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Adding Extension for Experimental Thai Spelling

2012-07-08 Thread sungkhum

I hope no one minds if I piggy-back on this thread. Recently I contributed
to the ICU break iterator for Khmer and it was added to ICU 4.8 (I just
helped with the dictionary, another volunteer did the code). LibreOffice 3.6
added the updated ICU code and now uses the code to line-break Khmer even if
zero-width spaces have not been provided.

I have two questions: is there a way to have the LibreOffice spelling
checker (Hunspell) also recognize word-breaks using the ICU break iterator
for Khmer so that Cambodians no longer have to add zero-width spaces
manually (as it seems to work for Thai now?)? Currently, lines without
zero-width spaces are seen as one long word to the spelling checker in
LibreOffice 3.6. But since the line-breaking is working, it would seem
breaking words for the spelling checker should also be able to work. Should
I submit a bug? How should I proceed?

Also, since many other programs do not incorporate ICU's code, is there a
way to make the line breaks real when a document is saved in another
format (such as a .doc?). And by real I mean that a zero-width space is
actually added to the text where a line-break should be. This also would
make LibreOffice a great tool for Cambodians, since most do not like to type
spaces between words (since the language traditionally doesn't have spaces),
but would then allow them to use their work with other programs without
having to manually type spaces between words.

--
View this message in context:
http://nabble.documentfoundation.org/Adding-Extension-for-Experimental-Thai-Spelling-tp3735637p3994303.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

[PATCH] - Report correct test name

2012-07-08 Thread Christophe JAILLET


Hi,

In '\sal\qa\rtl_strings\rtl_OUString.cxx', I think that this one should 
be 'ctor_005' and not 'ctor_004'.


Best regards
Christophe JAILLET
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx 
b/sal/qa/rtl_strings/rtl_OUString.cxx
index 8271253..64b9aa1 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -153,7 +153,7 @@ static sal_Bool test_rtl_OUString_ctor_005( hTestResult 
hRtlTestResult )
 hRtlTestResult,
 aUStr == aUStr1,
 New OUString from the first n characters of unicode string,
-ctor_004
+ctor_005
 )
 );
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/source

2012-07-08 Thread Daniel Bankston

 sc/source/core/tool/formularesult.cxx |   15 ---
 sc/source/filter/xml/xmlcelli.cxx |   56 +--
 sc/source/filter/xml/xmlsubti.cxx |   69 ++
 sc/source/filter/xml/xmlsubti.hxx |   43 -
 4 files changed, 68 insertions(+), 115 deletions(-)

New commits:
commit 9e639de0f9a7db8fb9cc48ca1e8036bb8f910811
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Sun Jul 8 11:26:52 2012 -0500

Use cached formula results for matrices

Change-Id: Ia77a94184c3d598f16a2f51d996f4c7058d9e303

diff --git a/sc/source/core/tool/formularesult.cxx 
b/sc/source/core/tool/formularesult.cxx
index 9606899..3b94481 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -398,11 +398,16 @@ void ScFormulaResult::SetHybridDouble( double f )
 ResetToDefaults();
 if (mbToken  mpToken)
 {
-String aString( GetString());
-String aFormula( GetHybridFormula());
-mpToken-DecRef();
-mpToken = new ScHybridCellToken( f, aString, aFormula);
-mpToken-IncRef();
+if(GetType() == formula::svMatrixCell)
+SetDouble(f);
+else
+{
+String aString( GetString());
+String aFormula( GetHybridFormula());
+mpToken-DecRef();
+mpToken = new ScHybridCellToken( f, aString, aFormula);
+mpToken-IncRef();
+}
 }
 else
 {
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 212f03e..67ca9c7 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -355,8 +355,7 @@ SvXMLImportContext 
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
 
 ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
 
-if( ((nCellType == util::NumberFormat::TEXT) || 
bFormulaTextResult) 
-!rXMLImport.GetTables().IsPartOfMatrix(aCellPos.Col(), 
aCellPos.Row()) )
+if( ((nCellType == util::NumberFormat::TEXT) || 
bFormulaTextResult) )
 {
 if (!bHasTextImport)
 {
@@ -746,7 +745,7 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const 
ScAddress rCurrentPos,
 const SCCOL nCurrentCol, const ::boost::optional rtl::OUString  
pOUText )
 {
 bool bDoIncrement = true;
-if( rXMLImport.GetTables().IsPartOfMatrix(rCurrentPos.Col(), 
rCurrentPos.Row()) )
+if( rXMLImport.GetTables().IsPartOfMatrix(rCurrentPos) )
 {
 ScBaseCell* pCell = rXMLImport.GetDocument()-GetCell( rCurrentPos );
 bDoIncrement = ( pCell  pCell-GetCellType() == CELLTYPE_FORMULA );
@@ -761,6 +760,7 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const 
ScAddress rCurrentPos,
 pFCell-SetHybridString( *pOUText );
 else
 bDoIncrement = false;
+pFCell-SetFormatType( nCellType );
 pFCell-ResetDirty();
 }
 }
@@ -789,7 +789,7 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const 
ScAddress rCurrentPos,
 
 void ScXMLTableRowCellContext::AddNumberCellToDoc( const ScAddress 
rCurrentPos )
 {
-if( rXMLImport.GetTables().IsPartOfMatrix(rCurrentPos.Col(), 
rCurrentPos.Row()) )
+if( rXMLImport.GetTables().IsPartOfMatrix(rCurrentPos) )
 {
 ScBaseCell* pCell = rXMLImport.GetDocument()-GetCell( rCurrentPos );
 if ( pCell  pCell-GetCellType() == CELLTYPE_FORMULA )
@@ -996,15 +996,6 @@ void ScXMLTableRowCellContext::AddNonFormulaCells( const 
ScAddress rCellPos )
 }
 }
 
-namespace{
-
-bool isErrOrNA(const rtl::OUString rStr)
-{
-return (rStr.indexOf(Err:)   -1) || (rStr.indexOf(#N/A)  -1);
-}
-
-}
-
 void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( const ScAddress 
rCellPos )
 {
 ScDocument* pDoc = rXMLImport.GetDocument();
@@ -1015,10 +1006,6 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( 
const ScAddress rCellPo
 ::boost::scoped_ptrScExternalRefManager::ApiGuard pExtRefGuard;
 pExtRefGuard.reset(new ScExternalRefManager::ApiGuard(pDoc));
 
-//if this is an Err:### or #N/A then use text:p value
-if( bFormulaTextResult  pOUTextContent  isErrOrNA(*pOUTextContent) )
-pOUTextValue.reset(*pOUTextContent);
-
 ScBaseCell* pNewCell = NULL;
 
 if ( !aText.isEmpty() )
@@ -1065,6 +1052,15 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( 
const ScAddress rCellPo
 }
 }
 
+namespace{
+
+bool isErrOrNA(const rtl::OUString rStr)
+{
+return (rStr.indexOf(Err:)   -1) || (rStr.indexOf(#N/A)  -1);
+}
+
+}
+
 void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress rCellPos )
 {
 if( cellExists(rCellPos) )
@@ -1072,9 +1068,13 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 SetContentValidation( rCellPos );
 OSL_ENSURE(((nColsRepeated == 1)  (nRepeatedRows == 1)), repeated 
cells with formula

[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source

 sfx2/inc/templatedlg.hxx|2 ++
 sfx2/source/doc/templatedlg.cxx |   34 +-
 sfx2/source/doc/templatedlg.src |4 ++--
 3 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit 7f1674d214c1567638412dba89633b5d5f8d4924
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Jul 8 11:40:04 2012 -0430

Fix not displaying thumbnail text after opening a template.

Change-Id: I57ccefd5ce115d095e30afe0673aa61cb3b6d39b

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6143cd7..2b08cf2 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -549,7 +549,7 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, 
ThumbnailViewItem*, pItem)
 
 try
 {
-
mxDesktop-loadComponentFromURL(pTemplateItem-getPath(),rtl::OUString(_blank),
 0, aArgs );
+
mxDesktop-loadComponentFromURL(pTemplateItem-getPath(),rtl::OUString(_default),
 0, aArgs );
 }
 catch( const uno::Exception )
 {
commit 27da19cdd62d14d56beaec6c6fce1f68e05c8d86
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Jul 8 10:58:31 2012 -0430

Center template dialog top buttons.

Change-Id: I18c324a815df279280f3d5efc7b0d9651275bfaa

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 5fa51ae..7b528ae 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -72,6 +72,8 @@ private:
 void OnTemplateProperties ();
 void OnTemplateDelete ();
 
+void centerTopButtons ();
+
 private:
 
 PushButton aButtonAll;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9ac7512..6143cd7 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -215,6 +215,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 // Set dialog to correct dimensions
 SetSizePixel(aWinSize);
 
+centerTopButtons();
+
 mpViewBar-Show();
 mpActionBar-Show();
 
@@ -755,6 +757,36 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
 }
 }
 
+void SfxTemplateManagerDlg::centerTopButtons()
+{
+Point aFirstBtnPos = aButtonAll.GetPosPixel();
+
+Size aSelBtnSize = maButtonSelMode.GetOutputSize(); // Last button in the 
list
+Size aBtnSize = aButtonAll.GetOutputSize();
+Size aWinSize = GetOutputSize();
+
+long nTotalWidth = aSelBtnSize.getWidth() + aBtnSize.getWidth()*5;
+long nSpace = (aWinSize.getWidth() - nTotalWidth)/2;
+
+Point aBtnPos(nSpace,aFirstBtnPos.getY());
+aButtonAll.SetPosPixel(aBtnPos);
+
+aBtnPos.setX(aBtnPos.getX() + aBtnSize.getWidth());
+aButtonDocs.SetPosPixel(aBtnPos);
+
+aBtnPos.setX(aBtnPos.getX() + aBtnSize.getWidth());
+aButtonPresents.SetPosPixel(aBtnPos);
+
+aBtnPos.setX(aBtnPos.getX() + aBtnSize.getWidth());
+aButtonSheets.SetPosPixel(aBtnPos);
+
+aBtnPos.setX(aBtnPos.getX() + aBtnSize.getWidth());
+aButtonDraws.SetPosPixel(aBtnPos);
+
+aBtnPos.setX(aBtnPos.getX() + aBtnSize.getWidth());
+maButtonSelMode.SetPosPixel(aBtnPos);
+}
+
 void lcl_createTemplate(uno::Reference 
com::sun::star::frame::XComponentLoader  xDesktop,
 const FILTER_APPLICATION eApp)
 {
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 0a8f851..f9ce918 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -104,8 +104,8 @@ ModalDialog DLG_TEMPLATE_MANAGER
 
 ImageButton BTN_SELECTION_MODE
 {
-Pos = MAP_APPFONT(265,5);
-Size = MAP_APPFONT(14,14);
+Pos = MAP_APPFONT(260,5);
+Size = MAP_APPFONT(20,14);
 TabStop = TRUE;
 
 ButtonImage = Image
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Change in core[master]: Implement support for HeaderBar arrow native rendering, add ...

From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has uploaded a new change for review.

Change subject: Implement support for HeaderBar arrow native rendering, add GTK 
support
..

Implement support for HeaderBar arrow native rendering, add GTK support

Change-Id: Ib65e61259fdbf371c3330dd555ee020f3a20d1fb
---
M svtools/source/control/headbar.cxx
M vcl/inc/unx/gtk/gtkgdi.hxx
M vcl/inc/vcl/salnativewidgets.hxx
M vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
4 files changed, 87 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/266/1
--
To view, visit https://gerrit.libreoffice.org/266
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib65e61259fdbf371c3330dd555ee020f3a20d1fb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com

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

Re: [PATCH] Implement support for treeview headers native rendering, add GTK implementation

Hi Ruslan,

On Sat, Jul 07, 2012 at 10:06:37PM +0400, Ruslan Kabatsayev wrote:
 These two patches implement support for listview headers (aka
 HeaderBar) native rendering.
 First one makes the buttons look natively, and second one makes
 arrow showing sort order also look native.
 Aside from adding support for this, these patches also add GTK
 implementation of this.

Pushed as dependant patches:

https://gerrit.libreoffice.org/#/c/265/
https://gerrit.libreoffice.org/#/c/266/

for review on gerrit.

@Caolan: I would love to have you as a reviewer on this Gtk stuff. Could you
finally get yourself an account on gerrit(*)?

Best,

Bjoern

(*) https://wiki.documentfoundation.org/Development/gerrit/setup
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] - use indexOfAsciiL and avoid static variable

2012-07-08 Thread Christophe JAILLET


Hi,

in 'comphelper\source\misc\logging.cxx' we can read :
// (if ::rtl::OUString had an indexOfAscii, we could save those 
ugly statics ...)


Well, it has kind of and indexOfAsciiL can be used if length is provided.


This patch is untested, so please check it before applying.
Especially, I've not checked for the includes for 'strlen'.


Best regards,
Christophe JAILLET
diff --git a/comphelper/source/misc/logging.cxx 
b/comphelper/source/misc/logging.cxx
index 19f7f42..9d830e1 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -131,14 +131,14 @@ namespace comphelper
 //
 namespace
 {
-voidlcl_replaceParameter( ::rtl::OUString _inout_Message, const 
::rtl::OUString _rPlaceHolder, const ::rtl::OUString _rReplacement )
+voidlcl_replaceParameter( ::rtl::OUString _inout_Message, const 
sal_Char* _pPlaceHolder, const ::rtl::OUString _rReplacement )
 {
-sal_Int32 nPlaceholderPosition = _inout_Message.indexOf( 
_rPlaceHolder );
+sal_Int32 nPlaceholderPosition = _inout_Message.indexOfAsciiL( 
_pPlaceHolder, strlen(_pPlaceHolder) );
 OSL_ENSURE( nPlaceholderPosition = 0, lcl_replaceParameter: 
placeholder not found! );
 if ( nPlaceholderPosition  0 )
 return;
 
-_inout_Message = _inout_Message.replaceAt( nPlaceholderPosition, 
_rPlaceHolder.getLength(), _rReplacement );
+_inout_Message = _inout_Message.replaceAt( nPlaceholderPosition, 
strlen(_pPlaceHolder), _rReplacement );
 }
 }
 
@@ -149,32 +149,24 @@ namespace comphelper
 const OptionalString _rArgument3, const OptionalString _rArgument4,
 const OptionalString _rArgument5, const OptionalString _rArgument6 ) 
const
 {
-// (if ::rtl::OUString had an indexOfAscii, we could save those ugly 
statics ...)
-static ::rtl::OUString sPH1( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( $1$ ) ) );
-static ::rtl::OUString sPH2( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( $2$ ) ) );
-static ::rtl::OUString sPH3( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( $3$ ) ) );
-static ::rtl::OUString sPH4( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( $4$ ) ) );
-static ::rtl::OUString sPH5( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( $5$ ) ) );
-static ::rtl::OUString sPH6( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( $6$ ) ) );
-
 ::rtl::OUString sMessage( _rMessage );
 if ( !!_rArgument1 )
-lcl_replaceParameter( sMessage, sPH1, *_rArgument1 );
+lcl_replaceParameter( sMessage, $1$, *_rArgument1 );
 
 if ( !!_rArgument2 )
-lcl_replaceParameter( sMessage, sPH2, *_rArgument2 );
+lcl_replaceParameter( sMessage, $2$, *_rArgument2 );
 
 if ( !!_rArgument3 )
-lcl_replaceParameter( sMessage, sPH3, *_rArgument3 );
+lcl_replaceParameter( sMessage, $3$, *_rArgument3 );
 
 if ( !!_rArgument4 )
-lcl_replaceParameter( sMessage, sPH4, *_rArgument4 );
+lcl_replaceParameter( sMessage, $4$, *_rArgument4 );
 
 if ( !!_rArgument5 )
-lcl_replaceParameter( sMessage, sPH5, *_rArgument5 );
+lcl_replaceParameter( sMessage, $5$, *_rArgument5 );
 
 if ( !!_rArgument6 )
-lcl_replaceParameter( sMessage, sPH6, *_rArgument6 );
+lcl_replaceParameter( sMessage, $6$, *_rArgument6 );
 
 try
 {
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Better center status bar items between separators

2012-07-08 Thread Ruslan Kabatsayev

Hello,

This patch fixes status bar separators position so that status bar
items appears better centered between them.
As a side effect, it also gives more space for rendering separators
for themes which have thicker separators than 2px.

Regards,
Ruslan


0003-Better-center-status-bar-items-between-separators.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sal/qa

 sal/qa/rtl_strings/rtl_OUString.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a076603a602cef9ce1fb7ef094fddd05b92cce58
Author: Christophe JAILLET christophe.jail...@wanadoo.fr
Date:   Sun Jul 8 19:34:04 2012 +0200

Report correct test name

Change-Id: I8181713f28e500b960b9c32be304cdf93231

diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx 
b/sal/qa/rtl_strings/rtl_OUString.cxx
index 8271253..64b9aa1 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -153,7 +153,7 @@ static sal_Bool test_rtl_OUString_ctor_005( hTestResult 
hRtlTestResult )
 hRtlTestResult,
 aUStr == aUStr1,
 New OUString from the first n characters of unicode string,
-ctor_004
+ctor_005
 )
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] - Report correct test name

Hi,

On Sun, Jul 08, 2012 at 05:59:52PM +0200, Christophe JAILLET wrote:
 In '\sal\qa\rtl_strings\rtl_OUString.cxx', I think that this one
 should be 'ctor_005' and not 'ctor_004'.

Pushed as:

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

for now. Please consider using gerrit for submitting your patches next time:

 https://wiki.documentfoundation.org/Development/gerrit/setup
 https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch

If for whatever reason you do not want to do that, please tell us why, but ata
least generate your patches with git format-patch -1 next time as described
on the wiki. ;)

Thanks!

Best,

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

[PUSHED] - Report correct test name

please ignore, adjusted mail subject to mark this as PUSHED in the archaic
workflow.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - 2 commits - sc/qa sc/source

2012-07-08 Thread Daniel Bankston

 sc/qa/unit/data/contentCSV/matrix2.csv |2 ++
 sc/qa/unit/data/ods/matrix.ods |binary
 sc/qa/unit/subsequent_filters-test.cxx |   23 ++-
 sc/source/filter/xml/xmlcelli.cxx  |   31 +--
 4 files changed, 41 insertions(+), 15 deletions(-)

New commits:
commit 191c4bf8a6ee43bbac25f5a0f83181c74fac8390
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Sun Jul 8 12:57:36 2012 -0500

Fix problem with cached matrix formula results that contain errors

Change-Id: I9277714780e00e311e6e81a9de6e4d39409d5c9b

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 67ca9c7..e5c81e0 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -795,7 +795,10 @@ void ScXMLTableRowCellContext::AddNumberCellToDoc( const 
ScAddress rCurrentPos
 if ( pCell  pCell-GetCellType() == CELLTYPE_FORMULA )
 {
 ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
-pFCell-SetHybridDouble( fValue );
+if( bFormulaTextResult  pOUTextValue  !pOUTextValue-isEmpty() 
)
+pFCell-SetHybridString( *pOUTextValue );
+else
+pFCell-SetHybridDouble( fValue );
 pFCell-ResetDirty();
 }
 }
@@ -1052,15 +1055,6 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( 
const ScAddress rCellPo
 }
 }
 
-namespace{
-
-bool isErrOrNA(const rtl::OUString rStr)
-{
-return (rStr.indexOf(Err:)   -1) || (rStr.indexOf(#N/A)  -1);
-}
-
-}
-
 void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress rCellPos )
 {
 if( cellExists(rCellPos) )
@@ -1069,10 +1063,6 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 OSL_ENSURE(((nColsRepeated == 1)  (nRepeatedRows == 1)), repeated 
cells with formula not possible now);
 rXMLImport.GetStylesImportHelper()-AddCell(rCellPos);
 
-//if this is an Err:### or #N/A then use text:p value
-if( bFormulaTextResult  pOUTextContent  isErrOrNA(*pOUTextContent) 
)
-pOUTextValue.reset(*pOUTextContent);
-
 //add matrix
 if(bIsMatrix)
 {
@@ -1115,6 +1105,15 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 }
 }
 
+namespace{
+
+bool isErrOrNA(const rtl::OUString rStr)
+{
+return (rStr.indexOf(Err:)   -1) || (rStr.indexOf(#N/A)  -1);
+}
+
+}
+
 void ScXMLTableRowCellContext::EndElement()
 {
 if( bHasTextImport  rXMLImport.GetRemoveLastChar() )
@@ -1131,6 +1130,10 @@ void ScXMLTableRowCellContext::EndElement()
 }
 }
 
+//if this is an Err:### or #N/A then use text:p value
+if( bFormulaTextResult  pOUTextContent  isErrOrNA(*pOUTextContent) )
+pOUTextValue.reset(*pOUTextContent);
+
 ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
 if( aCellPos.Col()  0  nRepeatedRows  1 )
 aCellPos.SetRow( aCellPos.Row() - (nRepeatedRows - 1) );
commit 8fd6bdaa4fcffce595675f79e2e75bc8a795e0c2
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Sun Jul 8 12:45:52 2012 -0500

Add test for cached matrix formula results

-Includes test case for cached formula result errors

Change-Id: I446240daffdbd6cd7ebd3c3b8dc2305c789d8519

diff --git a/sc/qa/unit/data/contentCSV/matrix2.csv 
b/sc/qa/unit/data/contentCSV/matrix2.csv
new file mode 100644
index 000..44b3f71
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/matrix2.csv
@@ -0,0 +1,2 @@
+Matrix with errors:,,
+Err:502,Err:502,Err:502
diff --git a/sc/qa/unit/data/ods/matrix.ods b/sc/qa/unit/data/ods/matrix.ods
index 3c9f16a..7b69691 100644
Binary files a/sc/qa/unit/data/ods/matrix.ods and 
b/sc/qa/unit/data/ods/matrix.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index ce0133f..537b565 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -103,6 +103,7 @@ public:
 void testHardRecalcODS();
 void testFunctionsODS();
 void testCachedFormulaResultsODS();
+void testCachedMatrixFormulaResultsODS();
 void testDatabaseRangesODS();
 void testDatabaseRangesXLS();
 void testDatabaseRangesXLSX();
@@ -136,6 +137,7 @@ public:
 CPPUNIT_TEST(testHardRecalcODS);
 CPPUNIT_TEST(testFunctionsODS);
 CPPUNIT_TEST(testCachedFormulaResultsODS);
+CPPUNIT_TEST(testCachedMatrixFormulaResultsODS);
 CPPUNIT_TEST(testDatabaseRangesODS);
 CPPUNIT_TEST(testDatabaseRangesXLS);
 CPPUNIT_TEST(testDatabaseRangesXLSX);
@@ -313,7 +315,7 @@ void ScFiltersTest::testHardRecalcODS()
 ScDocShellRef xDocSh = loadDoc( aFileNameBase, ODS );
 xDocSh-DoHardRecalc(true);
 
-CPPUNIT_ASSERT_MESSAGE(Failed to load functions.*, xDocSh.Is());
+CPPUNIT_ASSERT_MESSAGE(Failed to load hard-recalc.*, xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
 rtl::OUString aCSVFileName;

Re: Windows tinderboxes unresolved external errors

I fixed it by including the file defining the class ThumbnailViewItem.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

 sc/source/ui/condformat/condformatdlg.cxx |   19 +++
 sc/source/ui/src/condformatdlg.src|   10 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 1259cee4111a6b8f66d8583166c2ff9f3fc4d80d
Author: Andras Timar ati...@suse.com
Date:   Sun Jul 8 20:26:38 2012 +0200

fix a few layout problems in Conditional Formatting dialog

Absolute pixel coordinates should not be used, because
we work with font size dependent relative coordinates
all over the place. Layout on Linux was OK, but controls
were positioned partially outside the visible area on Windows.

Change-Id: Iee417f57135ada7ea9cb73726c56f96b3154e0b8

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 79a111d..9ba146d 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -320,12 +320,12 @@ void ScCondFrmtEntry::Init()
 Point aPointCol = maLbColMiddle.GetPosPixel();
 Point aPointEdDataBar = maEdDataBarMin.GetPosPixel();
 Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel();
-const long nMovePos = 250;
+const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2;
 aPointLb.X() += nMovePos;
 aPointEd.X() += nMovePos;
 aPointCol.X() += nMovePos;
-aPointEdDataBar.X() += 1.5*nMovePos;
-aPointLbDataBar.X() += 1.5*nMovePos;
+aPointEdDataBar.X() += 2*nMovePos;
+aPointLbDataBar.X() += 2*nMovePos;
 maLbEntryTypeMiddle.SetPosPixel(aPointLb);
 maEdMiddle.SetPosPixel(aPointEd);
 maLbColMiddle.SetPosPixel(aPointCol);
@@ -444,6 +444,10 @@ void ScCondFrmtEntry::HideCondElements()
 
 void ScCondFrmtEntry::SetCondType()
 {
+maEdVal1.SetSizePixel(maEdVal2.GetSizePixel());
+Point aPoint(maLbCondType.GetPosPixel().X() + 
maLbCondType.GetSizePixel().Width() + LogicToPixel(Size(5,1), 
MapMode(MAP_APPFONT)).getWidth(),
+maEdVal1.GetPosPixel().Y());
+maEdVal1.SetPosPixel(aPoint);
 maEdVal1.Show();
 maEdVal2.Show();
 maLbStyle.Show();
@@ -562,6 +566,10 @@ void ScCondFrmtEntry::SetFormulaType()
 SwitchToType(FORMULA);
 HideColorScaleElements();
 HideDataBarElements();
+maEdVal1.SetPosPixel(maLbCondType.GetPosPixel());
+Size aSize(maEdVal2.GetPosPixel().X() + maEdVal2.GetSizePixel().Width() - 
maLbCondType.GetPosPixel().X(), maEdVal1.GetSizePixel().Height());
+maEdVal1.SetPosPixel(maLbCondType.GetPosPixel());
+maEdVal1.SetSizePixel(aSize);
 maEdVal1.Show();
 maEdVal2.Hide();
 maLbCondType.Hide();
@@ -569,8 +577,6 @@ void ScCondFrmtEntry::SetFormulaType()
 maFtCondition.Show();
 maWdPreview.Show();
 maFtStyle.Show();
-Size aSize(440, 30);
-maEdVal1.SetSizePixel(aSize);
 }
 
 void ScCondFrmtEntry::Select()
@@ -894,14 +900,11 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
 {
 if(maLbCondType.GetSelectEntryPos() == 6 || 
maLbCondType.GetSelectEntryPos() == 7)
 {
-maEdVal1.SetSizePixel(maEdVal2.GetSizePixel());
 maEdVal2.Show();
 }
 else
 {
 maEdVal2.Hide();
-Size aSize(440, 30);
-maEdVal1.SetSizePixel(aSize);
 }
 return 0;
 }
diff --git a/sc/source/ui/src/condformatdlg.src 
b/sc/source/ui/src/condformatdlg.src
index ebf84f3..174da1f 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -108,7 +108,7 @@ Control RID_COND_ENTRY
 ListBox LB_CELLIS_TYPE
 {
 Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 50, 40 );
+Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -133,14 +133,14 @@ Control RID_COND_ENTRY
 };
 Edit ED_VAL1
 {
-Pos = MAP_APPFONT( 125, 15 );
-Size = MAP_APPFONT( 160, 12 );
+Pos = MAP_APPFONT( 155, 15 );
+Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 Edit ED_VAL2
 {
 Pos = MAP_APPFONT( 210, 15 );
-Size = MAP_APPFONT( 75, 12 );
+Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 ListBox LB_STYLE
@@ -157,7 +157,7 @@ Control RID_COND_ENTRY
 ListBox LB_COLOR_FORMAT
 {
 Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 60, 60);
+Size = MAP_APPFONT( 80, 60);
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/ui/condformat/condformatdlg.cxx |   19 +++
 sc/source/ui/src/condformatdlg.src|   10 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit dd9a9e192e9e7a18f96d9ecff71ac6d5718920ac
Author: Andras Timar ati...@suse.com
Date:   Sun Jul 8 20:26:38 2012 +0200

fix a few layout problems in Conditional Formatting dialog

Absolute pixel coordinates should not be used, because
we work with font size dependent relative coordinates
all over the place. Layout on Linux was OK, but controls
were positioned partially outside the visible area on Windows.

Change-Id: Iee417f57135ada7ea9cb73726c56f96b3154e0b8

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index e303625..2ec2dc7 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -320,12 +320,12 @@ void ScCondFrmtEntry::Init()
 Point aPointCol = maLbColMiddle.GetPosPixel();
 Point aPointEdDataBar = maEdDataBarMin.GetPosPixel();
 Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel();
-const long nMovePos = 250;
+const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2;
 aPointLb.X() += nMovePos;
 aPointEd.X() += nMovePos;
 aPointCol.X() += nMovePos;
-aPointEdDataBar.X() += 1.5*nMovePos;
-aPointLbDataBar.X() += 1.5*nMovePos;
+aPointEdDataBar.X() += 2*nMovePos;
+aPointLbDataBar.X() += 2*nMovePos;
 maLbEntryTypeMiddle.SetPosPixel(aPointLb);
 maEdMiddle.SetPosPixel(aPointEd);
 maLbColMiddle.SetPosPixel(aPointCol);
@@ -444,6 +444,10 @@ void ScCondFrmtEntry::HideCondElements()
 
 void ScCondFrmtEntry::SetCondType()
 {
+maEdVal1.SetSizePixel(maEdVal2.GetSizePixel());
+Point aPoint(maLbCondType.GetPosPixel().X() + 
maLbCondType.GetSizePixel().Width() + LogicToPixel(Size(5,1), 
MapMode(MAP_APPFONT)).getWidth(),
+maEdVal1.GetPosPixel().Y());
+maEdVal1.SetPosPixel(aPoint);
 maEdVal1.Show();
 maEdVal2.Show();
 maLbStyle.Show();
@@ -562,6 +566,10 @@ void ScCondFrmtEntry::SetFormulaType()
 SwitchToType(FORMULA);
 HideColorScaleElements();
 HideDataBarElements();
+maEdVal1.SetPosPixel(maLbCondType.GetPosPixel());
+Size aSize(maEdVal2.GetPosPixel().X() + maEdVal2.GetSizePixel().Width() - 
maLbCondType.GetPosPixel().X(), maEdVal1.GetSizePixel().Height());
+maEdVal1.SetPosPixel(maLbCondType.GetPosPixel());
+maEdVal1.SetSizePixel(aSize);
 maEdVal1.Show();
 maEdVal2.Hide();
 maLbCondType.Hide();
@@ -569,8 +577,6 @@ void ScCondFrmtEntry::SetFormulaType()
 maFtCondition.Show();
 maWdPreview.Show();
 maFtStyle.Show();
-Size aSize(440, 30);
-maEdVal1.SetSizePixel(aSize);
 }
 
 void ScCondFrmtEntry::Select()
@@ -894,14 +900,11 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
 {
 if(maLbCondType.GetSelectEntryPos() == 6 || 
maLbCondType.GetSelectEntryPos() == 7)
 {
-maEdVal1.SetSizePixel(maEdVal2.GetSizePixel());
 maEdVal2.Show();
 }
 else
 {
 maEdVal2.Hide();
-Size aSize(440, 30);
-maEdVal1.SetSizePixel(aSize);
 }
 return 0;
 }
diff --git a/sc/source/ui/src/condformatdlg.src 
b/sc/source/ui/src/condformatdlg.src
index ebf84f3..174da1f 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -108,7 +108,7 @@ Control RID_COND_ENTRY
 ListBox LB_CELLIS_TYPE
 {
 Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 50, 40 );
+Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -133,14 +133,14 @@ Control RID_COND_ENTRY
 };
 Edit ED_VAL1
 {
-Pos = MAP_APPFONT( 125, 15 );
-Size = MAP_APPFONT( 160, 12 );
+Pos = MAP_APPFONT( 155, 15 );
+Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 Edit ED_VAL2
 {
 Pos = MAP_APPFONT( 210, 15 );
-Size = MAP_APPFONT( 75, 12 );
+Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 ListBox LB_STYLE
@@ -157,7 +157,7 @@ Control RID_COND_ENTRY
 ListBox LB_COLOR_FORMAT
 {
 Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 60, 60);
+Size = MAP_APPFONT( 80, 60);
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - 2 commits - sc/qa sc/source

2012-07-08 Thread Daniel Bankston

 sc/qa/unit/data/contentCSV/matrix2.csv |7 +--
 sc/qa/unit/data/ods/matrix.ods |binary
 sc/source/filter/xml/xmlcelli.cxx  |3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1651e7b7ff0f97bf738bf5b210e1c97e201627a1
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Sun Jul 8 13:28:22 2012 -0500

Remove calls to ScFormulaCell::SetFormatType() that are no longer necessary

Change-Id: I632273a2278cd76d2af96192885a11bea85bd6a0

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index e5c81e0..fc20f36 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -760,7 +760,6 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const 
ScAddress rCurrentPos,
 pFCell-SetHybridString( *pOUText );
 else
 bDoIncrement = false;
-pFCell-SetFormatType( nCellType );
 pFCell-ResetDirty();
 }
 }
@@ -1030,7 +1029,6 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( 
const ScAddress rCellPo
 pFCell-SetHybridString( *pOUTextValue );
 else
 pFCell-SetHybridDouble( fValue );
-pFCell-SetFormatType( nCellType );
 pFCell-ResetDirty();
 }
 else if ( aText[0] == '\''  aText.getLength()  1 )
@@ -1083,7 +1081,6 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 pFCell-SetHybridString( *pOUTextValue );
 else
 pFCell-SetHybridDouble( fValue );
-pFCell-SetFormatType( nCellType );
 pFCell-ResetDirty();
 }
 }
commit 98c2c3be6e38f9f9d96b1889fc18a68fc77da51e
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Sun Jul 8 13:13:14 2012 -0500

Expand cached matrix formula result test case to include other potential 
probs

Change-Id: Idb036ffdf09ee92b34118d9f52ea1d06c15fb31b

diff --git a/sc/qa/unit/data/contentCSV/matrix2.csv 
b/sc/qa/unit/data/contentCSV/matrix2.csv
index 44b3f71..955d345 100644
--- a/sc/qa/unit/data/contentCSV/matrix2.csv
+++ b/sc/qa/unit/data/contentCSV/matrix2.csv
@@ -1,2 +1,5 @@
-Matrix with errors:,,
-Err:502,Err:502,Err:502
+Matrices with errors and other misc potential problems:
+Err:502,Err:502,Err:502,,error result
+#N/A,#N/A,#N/A,,n/a
+TRUE,TRUE,TRUE,,Display TRUE instead of 1
+FALSE,FALSE,FALSE,,Display FALSE instead of 0
diff --git a/sc/qa/unit/data/ods/matrix.ods b/sc/qa/unit/data/ods/matrix.ods
index 7b69691..2a8c4ab 100644
Binary files a/sc/qa/unit/data/ods/matrix.ods and 
b/sc/qa/unit/data/ods/matrix.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Change in core[master]: - fdo#45830 - Language/User Interface: current choice indica...

From Rob Snelders libreoff...@ertai.nl:

Rob Snelders has uploaded a new change for review.

Change subject: - fdo#45830 - Language/User Interface: current choice indicated 
as default
..

- fdo#45830 - Language/User Interface: current choice indicated as default

Change-Id: I3ac2e8e3219c12be84ce38cb98342f0dce0d6476
---
M cui/source/options/optgdlg.cxx
M svtools/source/misc/langtab.src
M svx/inc/svx/langbox.hxx
M svx/source/dialog/langbox.cxx
4 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/267/1
--
To view, visit https://gerrit.libreoffice.org/267
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ac2e8e3219c12be84ce38cb98342f0dce0d6476
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rob Snelders libreoff...@ertai.nl

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

 sc/source/ui/condformat/colorformat.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 25bd4f0566e634037ce8d4fb94abe8b351625249
Author: Andras Timar ati...@suse.com
Date:   Sun Jul 8 21:42:06 2012 +0200

fix layout issue on Data Bar dialog

Change-Id: I6bdc5bbbf5e48b5b62562c46afe7f76f3b21a60e

diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index 71b88c9..867f29f 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -222,8 +222,7 @@ void ScDataBarSettingsDlg::Init()
 }
 maBtnOk.SetClickHdl( LINK( this, ScDataBarSettingsDlg, OkBtnHdl ) );
 
-Point aPoint = maLbTypeMax.GetPosPixel();
-aPoint.Y() += 50;
+Point aPoint(maLbTypeMax.GetPosPixel().X(), maFtMax.GetPosPixel().Y());
 maLbTypeMax.SetPosPixel(aPoint);
 
 maLbTypeMin.SetSelectHdl( LINK( this, ScDataBarSettingsDlg, TypeSelectHdl 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/ui/condformat/colorformat.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9a7e4eac50523df3f24008430340635d7b870328
Author: Andras Timar ati...@suse.com
Date:   Sun Jul 8 21:42:06 2012 +0200

fix layout issue on Data Bar dialog

Change-Id: I6bdc5bbbf5e48b5b62562c46afe7f76f3b21a60e

diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index 71b88c9..867f29f 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -222,8 +222,7 @@ void ScDataBarSettingsDlg::Init()
 }
 maBtnOk.SetClickHdl( LINK( this, ScDataBarSettingsDlg, OkBtnHdl ) );
 
-Point aPoint = maLbTypeMax.GetPosPixel();
-aPoint.Y() += 50;
+Point aPoint(maLbTypeMax.GetPosPixel().X(), maFtMax.GetPosPixel().Y());
 maLbTypeMax.SetPosPixel(aPoint);
 
 maLbTypeMin.SetSelectHdl( LINK( this, ScDataBarSettingsDlg, TypeSelectHdl 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Change in core[master]: Replaced deprecated tools/String with OUString in ScAddInCol

From Markus Mohrhard markus.mohrh...@googlemail.com:

Markus Mohrhard has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScAddInCol
..


Patch Set 2: I would prefer that you didn't submit this

(7 inline comments)

Sorry for more nitpicking. There are some more places that we should change to 
prevent unnecessary temporary objects.


File sc/inc/addincol.hxx
Line 56: typedef ::boost::unordered_map ::rtl::OUString, const 
ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to ::rtl::OUString   
ScAddInHashMap;
We should use rtl::OUStringHash for rtl::OUString to prevent temporary copies.

std::equal_to rtl::OUString  is the default parameter in this case so we can 
leave it out.


File sc/source/core/tool/addincol.cxx
Line 892: ::rtl::OUString aFuncName = 
aServiceName;
using rtl::OUStringBuffere here looks like a good idea

Line 1108: ::rtl::OUString aFuncName = rServiceName;
another place for OUStringBuffer

Line 1743: xMatrix-PutString( ::rtl::OUString( 
pColArr[nCol] ),
no need for a temporary object in this case


File sc/source/core/tool/compiler.cxx
Line 169: xMap-putExternalSoftly( String(aName), 
pFuncData-GetOriginalName());
no need for a temporary object in this case, will be automatically generated

Line 5245: aEntry.Name = String(aName);
no need for a temporary object in this case, just use aEntry.Name = aName;


File sc/source/filter/excel/xeformula.cxx
Line 2346: if( mxData-mpLinkMgr-InsertAddIn( nExtSheet, nExtName, 
String(aXclFuncName) ) )
No need for the temporary object in this case, will be generated automatically.

--
To view, visit https://gerrit.libreoffice.org/258
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7059f10617b9a33ba63690c980b96d95d9023c55
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Sören Möller soerenmoeller2...@gmail.com

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

Change in core[master]: Replaced deprecated tools/String with OUString in ScAddInCol

From Markus Mohrhard markus.mohrh...@googlemail.com:

Markus Mohrhard has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScAddInCol
..


Patch Set 2:

There is no need for a make clean. Just use make sc in the top level LibO 
directory. this should only rebuild sc and is much faster than a build after 
make clean.

--
To view, visit https://gerrit.libreoffice.org/258
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7059f10617b9a33ba63690c980b96d95d9023c55
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Sören Möller soerenmoeller2...@gmail.com

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

Change in core[master]: Replaced deprecated String with OUString in sc/../chgtrack

From Daniel Bankston daniel.e.banks...@gmail.com:

Daniel Bankston has posted comments on this change.

Change subject: Replaced deprecated String with OUString in sc/../chgtrack
..


Patch Set 1:

test

--
To view, visit https://gerrit.libreoffice.org/263
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iaeb273f68d1c76d1d40f903a3f782ba5bc75289d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Daniel Bankston daniel.e.banks...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de

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

Re: [ANN] Please use Gerrit from now on for Patch Review

2012-07-08 Thread Lionel Elie Mamane

On Mon, Jul 02, 2012 at 06:13:50PM +0200, Lionel Elie Mamane wrote:
 On Mon, Jun 18, 2012 at 12:09:49PM +0200, Bjoern Michaelsen wrote:

 gerrit is documented and ready to go. Please use it for code review
 as much as possible now as it simplifies things a lot over manual
 patch fiddling on mailing lists.

Now I went to https://gerrit.libreoffice.org/#/c/267/; there are at
this time three patchsets, but it seems there is no easy / convenient
way to see the differences (interdiff) between them.

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

Change in core[master]: Replaced deprecated String with OUString in sc/../chgtrack

From Markus Mohrhard markus.mohrh...@googlemail.com:

Markus Mohrhard has posted comments on this change.

Change subject: Replaced deprecated String with OUString in sc/../chgtrack
..


Patch Set 1: Looks good to me, approved

--
To view, visit https://gerrit.libreoffice.org/263
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iaeb273f68d1c76d1d40f903a3f782ba5bc75289d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Daniel Bankston daniel.e.banks...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com

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

diff between patch revisions (was: Please use Gerrit from now on for Patch Review)

On Sun, Jul 08, 2012 at 10:56:55PM +0200, Lionel Elie Mamane wrote:
 Now I went to https://gerrit.libreoffice.org/#/c/267/; there are at
 this time three patchsets, but it seems there is no easy / convenient
 way to see the differences (interdiff) between them.

Find the text Old Version History: and the drop down saying Base next to
it. If you select Patch Set 1 instead, you will see the diff to the first
patch.

Best,

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

Re: diff between patch revisions (was: Please use Gerrit from now on for Patch Review)

2012-07-08 Thread Lionel Elie Mamane

On Sun, Jul 08, 2012 at 11:17:31PM +0200, Bjoern Michaelsen wrote:
 On Sun, Jul 08, 2012 at 10:56:55PM +0200, Lionel Elie Mamane wrote:
 Now I went to https://gerrit.libreoffice.org/#/c/267/; there are at
 this time three patchsets, but it seems there is no easy / convenient
 way to see the differences (interdiff) between them.

 Find the text Old Version History: and the drop down saying Base next to
 it. If you select Patch Set 1 instead, you will see the diff to the first
 patch.

Ah, great, I see now. Thanks!

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

[Libreoffice-commits] .: 2 commits - sd/sdi sd/source svx/AllLangResTarget_svx.mk svx/Library_svx.mk svx/Package_inc.mk svx/inc svx/sdi svx/source

2012-07-08 Thread Tomaž Vajngerl

 sd/sdi/_drvwsh.sdi  |5 
 sd/source/ui/app/popup2_tmpl.src|1 
 sd/source/ui/view/drviews2.cxx  |   34 +++
 sd/source/ui/view/drviewsj.cxx  |6 
 svx/AllLangResTarget_svx.mk |1 
 svx/Library_svx.mk  |3 
 svx/Package_inc.mk  |1 
 svx/inc/globlmn_tmpl.hrc|5 
 svx/inc/svx/compressgraphicdialog.hxx   |   69 
 svx/inc/svx/dialogs.hrc |1 
 svx/inc/svx/svxids.hrc  |3 
 svx/sdi/svx.sdi |   24 ++
 svx/source/dialog/compressgraphicdialog.cxx |  241 
 svx/source/dialog/compressgraphicdialog.hrc |   45 +
 svx/source/dialog/compressgraphicdialog.src |  165 +++
 svx/source/dialog/dlgunit.hxx   |2 
 16 files changed, 602 insertions(+), 4 deletions(-)

New commits:
commit dcddd5b0ac73ade778f75f4a84545641d0614b5b
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Mon Jul 9 00:00:16 2012 +0200

GetUnitString depends on svdtrans.hxx

Change-Id: I17d922201b1ad253dfcdfb0afdaf4dea95631874

diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
index b8ebed5..bc6f570 100644
--- a/svx/source/dialog/dlgunit.hxx
+++ b/svx/source/dialog/dlgunit.hxx
@@ -28,6 +28,8 @@
 #ifndef _SVX_DLG_DLGUNIT_HXX
 #define _SVX_DLG_DLGUNIT_HXX
 
+#include svx/svdtrans.hxx
+
 inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode 
cSep )
 {
 String aVal = rtl::OUString::valueOf(static_castsal_Int64(
commit 4d7581b9075d826feebfb095310c74627314a484
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Sun Jul 8 23:36:30 2012 +0200

Compress Graphic functionallity added (currently only for Draw)

This is a initial commit of Compress Graphics functionallity.
Compress Graphics is accesible via pop-up menu option to graphics
objects. Currently this funtionallity is only available in Draw.
When the menu option is triggered, a Compress Graphics modal dialog
opens to define DPI, compression level and type of compression.
When OK is clicked, the graphics in Draw is compressed and exchanged.

The current implementation is not final as it needs handling in case
when the graphics is croped. Additionally cropped areas could be
removed when compressing, depending on a checkbox in the dialog.
Special cases of graphics need to be checked too, and some tests
would not hurt.

Change-Id: I9ec1a71f6ff4364a49b2521e42d88c3ba224dd87

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 7cb4c10..4b09d0c 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -75,6 +75,11 @@ interface DrawView
 ExecMethod = FuTemporary ;
 StateMethod = GetMenuState ;
 ]
+SID_COMPRESS_GRAPHIC
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_CUT // ole : no, status : ?
 [
 ExecMethod = FuSupport ;
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index abf4115..6762879 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -659,6 +659,7 @@
 MN_STYLEDT
 SEPARATOR
 MenuItem { ITEM_SAVE_GRAPHIC };
+MenuItem { ITEM_COMPRESS_GRAPHIC };
 };
 };
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c4630c2..75ff0f1 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -48,6 +48,7 @@
 #include editeng/flditem.hxx
 #include svx/xlineit0.hxx
 #include svx/graphichelper.hxx
+#include svx/compressgraphicdialog.hxx
 #include svx/svdoutl.hxx
 #include svx/xlnwtit.hxx
 #include svx/svdoattr.hxx
@@ -949,6 +950,39 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
 }
 break;
 
+case SID_COMPRESS_GRAPHIC:
+{
+const SdrMarkList rMarkList = mpDrawView-GetMarkedObjectList();
+if( rMarkList.GetMarkCount() == 1 )
+{
+SdrObject* pObj = rMarkList.GetMark( 0 )-GetMarkedSdrObj();
+if( pObj  pObj-ISA( SdrGrafObj )  ( (SdrGrafObj*) pObj 
)-GetGraphicType() == GRAPHIC_BITMAP )
+{
+GraphicObject aGraphicObject( ( (SdrGrafObj*) pObj 
)-GetGraphicObject() );
+{
+CompressGraphicsDialog dialog( GetParentWindow(), 
aGraphicObject.GetGraphic(), pObj-GetLogicRect().GetSize(), 
GetViewFrame()-GetBindings() );
+if ( dialog.Execute() == RET_OK )
+{
+SdrGrafObj* pNewObject = (SdrGrafObj*) 
pObj-Clone();
+const Graphic aNewGraphic = 
dialog.GetCompressedGraphic();
+SdrPageView* pPageView = 
mpDrawView-GetSdrPageView();
+

Re: Document conversion engine

2012-07-08 Thread Flavio Moringa

Hi Michael,


nice to ear from someone so up the ranks like you.. makes me feel much
more important :-)

2012/7/6 Michael Meeks michael.me...@suse.com

 Hi Flavio,

 On Tue, 2012-07-03 at 11:45 +0100, Flavio Moringa wrote:
  my name is Flávio Moringa, I'm from Portugal and I'm starting my
  Masters Dissertation next September (Master in Open Source software -
  http://moss.dcti.iscte.pt ).

 Welcome :-)


Thanks


  I'm not a programmer, so what I'm interested in doing is something in
  the lines of investigating the main conversion problems, identifying
  the possible conversion flows, analysing the way the conversion flow
  is implemented in LibreOffice, and eventually trying to improve this
  flow somehow.

 So - it will be hard to improve the flow without being a
 programmer I'm
 afraid :-)


well, although not a programmer right now I've had my fair share of perl,
python, c, bash, java, php... maybe I'm not so fluent in programming
right now, but I'm certainly no strange to it, and definitely not afraid to
do it if the need arises... what I meant was that I'll probably wont't be
able to do a conversion engine by myself... but I can definitely mess
around with code...


  From your reply I assume that testing the filters, and doing
  regression tests is something I could do, maybe identifying the main
  conversion issues in groups of documents and kind of creating a major
  conversion issues table, and prioritizing those issues. Is there
  already something like that?

 There is a useful QA role in prioritising bug reports and
 interoperability issues; we have a real problem with masses of bug
 reports many of which could be duplicates. Having said that -
 interoperability has many, many known feature / impedance mis-matches
 that are non-trivial development problems to fix.

 One thing that -would- be really useful, and that Microsoft have
 internally, is an analysis tool for Microsoft's XML document formats -
 such that we can get a good idea of which attributes are actually used
 much. ie. by analysing and comparing a large corpus of documents out
 there, we can answer questions such as:

 should we implement surface charts, or 3D doughnut charts ?

 given whatever amount of feature-development time we have - simply
 by
 referring to the database of crunched XML files to work out which one is
 used most.

 It'd be nice to have that for ODF as well too of course for when we
 have to make zero-sum back-compatibility decisions; but for
 interoperability crunching those MS documents would be really good.

 Is that something you could do ? a bit of perl, zip extraction, XML
 parsing, etc. ?


Yes, it's definitely something I can do... I do believe that the harder
part is getting that  large corpus of documents out
there At least as my experience goes, I've found that it's hard to get
users to send us documents they use... either due to privacy questions or
enterprise policies... But a tool like that makes a lot of sense


 Developers are -much- more likely to let themselves be lead by
 objective statistics on real documents out there, rather than subjective
 feelings of priority - which can prove rather controversial :-)


I can certainly relate to that...



 Thanks !


For now then I'll start doing as you suggest and look in bugzilla for
documents with conversion problems to try and compile as much examples as I
can. Then maybe using the latest beta to do the conversion and see which
problems are still there. Then maybe starting a perl script that can scrap
the OOXML files to find the most used tags... and start from there...



 Michael.

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



Thanks a lot for helping out.
Cheers

-- 
*Flávio Moringa*
Project Leader



Caixa Mágica Software
Energia Open Source
Rua Soeiro Pereira Gomes, Lote 1 - 4.º B,
Edifício Espanha, 1600-196 Lisboa - Portugal
Tel.: +351 217 921 260 Fax: +351 217 921 261
http://www.caixamagica.pt
https://twitter.com/flaviomoringa
https://www.facebook.com/flaviomoringahttps://www.facebook.com/flavio.moringa
http://pt.linkedin.com/in/flaviomoringa
http://people.caixamagica.pt/flaviomoringa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Document conversion engine

2012-07-08 Thread Flavio Moringa

Hi Robinson,

2012/7/6 Robinson Tryon bishop.robin...@gmail.com

 On Fri, Jul 6, 2012 at 5:51 AM, Flavio Moringa 
 flavio.mori...@caixamagica.pt wrote:


 I know that you can convert documents through the command line, using
 LibreOffice headless mode, and that can be something that's useful for
 scripting automatic tests... although I know that sometimes the main
 problems are visual and it's difficult to automatically detect the
 problems...


 I think that we still need human eyes for the final comparison, however
 the rest of the system could be automated a bit more -- e.g. we could put
 sample docs in subdirectories named by bug# and add screenshots of the docs
 as rendered in MS-Office; add in a script to have LO iterate over the
 subdirectories and spit out screenshots of how it renders the original
 files, and a little HTML GUI so that you can tab-through 2-ups of the
 original rendering vs. LO's rendering, and you've got a decent tool for
 testing improvements/regressions.


That's a good ideia, at least it would facilitate the testing, which is
always very helpful... From my initial investigation in document
conversion, the visual aspect is alwayst the difficult one because not
all thins are well translated to the XML...



 Is there any kind of repository for documents that are candidates for
 conversion testing? I mean documents which are known to have conversion
 problems, and that are used to test improvements to the filters?


 I usually just search bugzilla for conversion or formatting :-) Even
 documents attached to old bugs can be helpful, as they can serve as
 regression tests.


I've just replied to Michael Meeks that I'll do just that... try to compile
a list of available documents in bugzilla that have conversion problems,
and test them on the latest beta... And see which problems still exist...


 I would like very much to become more involved in improving the conversion
 filters, since it seems to be a major problem in LibreOffice adoption, and
 everything that can be done to help in that area would certainly boost
 LibreOffice adoption specially in the enterprise world.


 Yes, fidelity of document rendering is definitely one of the biggest
 hurdles I've faced when encouraging people to try LO. Any improvements on
 that front will be greatly appreciated!

 --R


Thanks

-- 
*Flávio Moringa*
Project Leader



Caixa Mágica Software
Energia Open Source
Rua Soeiro Pereira Gomes, Lote 1 - 4.º B,
Edifício Espanha, 1600-196 Lisboa - Portugal
Tel.: +351 217 921 260 Fax: +351 217 921 261
http://www.caixamagica.pt
https://twitter.com/flaviomoringa
https://www.facebook.com/flaviomoringahttps://www.facebook.com/flavio.moringa
http://pt.linkedin.com/in/flaviomoringa
http://people.caixamagica.pt/flaviomoringa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - sc/inc sc/source

2012-07-08 Thread Markus Mohrhard

 sc/inc/attarray.hxx|2 +-
 sc/inc/chgtrack.hxx|1 -
 sc/inc/column.hxx  |2 +-
 sc/inc/document.hxx|1 -
 sc/inc/table.hxx   |2 +-
 sc/source/core/data/attarray.cxx   |2 +-
 sc/source/core/data/column2.cxx|4 ++--
 sc/source/core/data/document.cxx   |   13 -
 sc/source/core/data/table1.cxx |4 ++--
 sc/source/core/tool/chgtrack.cxx   |2 +-
 sc/source/filter/excel/xetable.cxx |2 +-
 11 files changed, 10 insertions(+), 25 deletions(-)

New commits:
commit 9e9e53a2d961d489440f4addc25af90d3a6b793b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Jul 9 01:32:42 2012 +0200

Revert export all style information to xls/xlsx, fdo#46738

This reverts commit 5d123a0b0e827aba59ddb50ef1b961a529a34a15.

Conflicts:

sc/source/core/data/attarray.cxx

Change-Id: Ie4bd09d2350faf0689c375d6a3f0f2b307cedcae

diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 9b81440..1509f40 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -172,7 +172,7 @@ public:
 boolIsEmpty() const;
 
 boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool 
bFullFormattedArea = false ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const;
 boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
 boolIsVisibleEqual( const ScAttrArray rOther,
 SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6f776e1..721683d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -175,7 +175,7 @@ public:
 boolHasSelectionMatrixFragment(const ScMarkData rMark) const;
 
 boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea = 
false ) const;
+boolGetLastVisibleAttr( SCROW rLastRow ) const;
 boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
 boolIsVisibleAttrEqual( const ScColumn rCol, SCROW nStartRow = 0,
 SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 72d5168..bbb062e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -935,7 +935,6 @@ public:
 SCCOL rEndCol, SCROW rEndRow, bool 
bIncludeOld, bool bOnlyDown ) const;
 SC_DLLPUBLIC bool   GetCellArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow ) const;
 SC_DLLPUBLIC bool   GetTableArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow ) const;
-SC_DLLPUBLIC void   GetFormattedAndUsedArea( SCTAB nTab, SCCOL 
rEndCol, SCROW rEndRow ) const;
 SC_DLLPUBLIC bool   GetPrintArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow,
 bool bNotes = true ) const;
 SC_DLLPUBLIC bool   GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, 
SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 966c458..78fe25c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -404,7 +404,7 @@ public:
 
 boolGetCellArea( SCCOL rEndCol, SCROW rEndRow ) const;   
 // FALSE = empty
 boolGetTableArea( SCCOL rEndCol, SCROW rEndRow ) const;
-boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes, 
bool bFullFormattedArea = false ) const;
+boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes ) 
const;
 boolGetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
 SCCOL rEndCol, bool bNotes ) const;
 boolGetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 6cf487f..100dcfe 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1732,7 +1732,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW rFirstRow ) 
const
 
 const SCROW SC_VISATTR_STOP = 84;
 
-bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool 
bFullFormattedArea ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const
 {
 OSL_ENSURE( nCount, nCount == 0 );
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 57a4e87..62fc4ea 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1423,14 +1423,14 @@ bool ScColumn::GetFirstVisibleAttr( SCROW rFirstRow ) 
const
 return false;
 }
 
-bool ScColumn::GetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea ) 
const
+bool ScColumn::GetLastVisibleAttr( SCROW rLastRow ) const
 {
 if (pAttrArray)
 {
 // row of last cell is needed
 SCROW nLastData = GetLastVisDataPos();// always including notes, 0 
if none
 
-return

[PATCH] Make bottom tabbar items follow native theme

2012-07-08 Thread Ruslan Kabatsayev

Hello,

This patch makes bottom tabbar items (e.g. the ones switching sheets
in Calc or similar items in Draw) follow native theme (currently seems
only implemented for GTK, but should also be tested with Win32 - most
likely there'll need something to change).

Screenshots for comparison:
before: http://i.imgur.com/OH3lX.png
after: http://i.imgur.com/dMY6t.png

Regards,
Ruslan


0005-Make-bottom-tabbar-items-follow-native-theme.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - sc/inc sc/source

2012-07-08 Thread Markus Mohrhard

 sc/inc/attarray.hxx  |2 +-
 sc/inc/column.hxx|2 +-
 sc/inc/document.hxx  |1 +
 sc/inc/table.hxx |2 +-
 sc/source/core/data/attarray.cxx |2 +-
 sc/source/core/data/column2.cxx  |4 ++--
 sc/source/core/data/document.cxx |   13 +
 sc/source/core/data/table1.cxx   |4 ++--
 8 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 77a7c92fb3c0b1a8a97bca107f6bfe85cb79f7c4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Jul 9 01:47:21 2012 +0200

performance problem with this commit

Change-Id: I59bca684afcc1c51ecff3c6444ad1fd4b2b520e8

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 150c730..69db2be 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2208,7 +2208,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot rRoot 
) :
 // find used area (non-empty cells)
 SCCOL nLastUsedScCol;
 SCROW nLastUsedScRow;
-rDoc.GetFormattedAndUsedArea( nScTab, nLastUsedScCol, nLastUsedScRow );
+rDoc.GetTableArea( nScTab, nLastUsedScCol, nLastUsedScRow );
 
 if(nLastUsedScCol  nMaxScCol)
 nLastUsedScCol = nMaxScCol;
commit 6c8ec4ad8e816157799cd164d9f9a837efa0f9a7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Jul 9 01:40:58 2012 +0200

Revert Revert export all style information to xls/xlsx, fdo#46738

Lesson: Never trust that nobody was crazy enough to use my commits!

This reverts commit 9e9e53a2d961d489440f4addc25af90d3a6b793b.

diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 1509f40..9b81440 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -172,7 +172,7 @@ public:
 boolIsEmpty() const;
 
 boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool 
bFullFormattedArea = false ) const;
 boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
 boolIsVisibleEqual( const ScAttrArray rOther,
 SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 721683d..6f776e1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -175,7 +175,7 @@ public:
 boolHasSelectionMatrixFragment(const ScMarkData rMark) const;
 
 boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea = 
false ) const;
 boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
 boolIsVisibleAttrEqual( const ScColumn rCol, SCROW nStartRow = 0,
 SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index bbb062e..72d5168 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -935,6 +935,7 @@ public:
 SCCOL rEndCol, SCROW rEndRow, bool 
bIncludeOld, bool bOnlyDown ) const;
 SC_DLLPUBLIC bool   GetCellArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow ) const;
 SC_DLLPUBLIC bool   GetTableArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow ) const;
+SC_DLLPUBLIC void   GetFormattedAndUsedArea( SCTAB nTab, SCCOL 
rEndCol, SCROW rEndRow ) const;
 SC_DLLPUBLIC bool   GetPrintArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow,
 bool bNotes = true ) const;
 SC_DLLPUBLIC bool   GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, 
SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 78fe25c..966c458 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -404,7 +404,7 @@ public:
 
 boolGetCellArea( SCCOL rEndCol, SCROW rEndRow ) const;   
 // FALSE = empty
 boolGetTableArea( SCCOL rEndCol, SCROW rEndRow ) const;
-boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes ) 
const;
+boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes, 
bool bFullFormattedArea = false ) const;
 boolGetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
 SCCOL rEndCol, bool bNotes ) const;
 boolGetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 100dcfe..6cf487f 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1732,7 +1732,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW rFirstRow ) 
const
 
 const SCROW SC_VISATTR_STOP = 84;
 
-bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool 
bFullFormattedArea ) const
 {
 OSL_ENSURE( nCount,

Re: [PATCH] Implement support for treeview headers native rendering, add GTK implementation

2012-07-08 Thread Ruslan Kabatsayev

Hello again,

I'm sorry, but the second patch was broken, here's fixed version.
Please update the version in gerrit (I haven't yet figured out how to
do this myself).

Thanks,
Ruslan

On Sun, Jul 8, 2012 at 8:55 PM, Bjoern Michaelsen
bjoern.michael...@canonical.com wrote:
 Hi Ruslan,

 On Sat, Jul 07, 2012 at 10:06:37PM +0400, Ruslan Kabatsayev wrote:
 These two patches implement support for listview headers (aka
 HeaderBar) native rendering.
 First one makes the buttons look natively, and second one makes
 arrow showing sort order also look native.
 Aside from adding support for this, these patches also add GTK
 implementation of this.

 Pushed as dependant patches:

 https://gerrit.libreoffice.org/#/c/265/
 https://gerrit.libreoffice.org/#/c/266/

 for review on gerrit.

 @Caolan: I would love to have you as a reviewer on this Gtk stuff. Could you
 finally get yourself an account on gerrit(*)?

 Best,

 Bjoern

 (*) https://wiki.documentfoundation.org/Development/gerrit/setup
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice


0002-Implement-support-for-HeaderBar-arrow-native-renderi.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

2012-07-08 Thread Markus Mohrhard

 sc/source/filter/excel/xetable.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3b6e14db7a8134a49da7bdb12d351cddcc866d5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Jul 9 01:47:21 2012 +0200

performance problem with this commit

Change-Id: I59bca684afcc1c51ecff3c6444ad1fd4b2b520e8

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 150c730..69db2be 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2208,7 +2208,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot rRoot 
) :
 // find used area (non-empty cells)
 SCCOL nLastUsedScCol;
 SCROW nLastUsedScRow;
-rDoc.GetFormattedAndUsedArea( nScTab, nLastUsedScCol, nLastUsedScRow );
+rDoc.GetTableArea( nScTab, nLastUsedScCol, nLastUsedScRow );
 
 if(nLastUsedScCol  nMaxScCol)
 nLastUsedScCol = nMaxScCol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - sfx2/inc sfx2/source

 sfx2/inc/sfx2/templatefolderview.hxx   |6 ++-
 sfx2/inc/sfx2/thumbnailview.hxx|2 -
 sfx2/inc/templatedlg.hxx   |2 +
 sfx2/source/control/templatefolderview.cxx |   28 +++-
 sfx2/source/control/templatesearchview.cxx |2 -
 sfx2/source/control/templateview.cxx   |2 -
 sfx2/source/control/thumbnailview.cxx  |4 +-
 sfx2/source/doc/templatedlg.cxx|   50 ++---
 sfx2/source/doc/templatedlg.hrc|4 +-
 sfx2/source/doc/templatedlg.src|   12 --
 10 files changed, 77 insertions(+), 35 deletions(-)

New commits:
commit f8f2296a510612381fc86273d0380133d5929bf0
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Jul 8 19:53:25 2012 -0430

Change OnFolderSelected function name to OnItemSelected.

Change-Id: I9a7437e4a11db4c40a4be88c3a3270f0bc813a52

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 18ca2f8..4a45370 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -315,7 +315,7 @@ protected:
 DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
 DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
 
-DECL_LINK(OnFolderSelected, ThumbnailViewItem*);
+DECL_LINK(OnItemSelected, ThumbnailViewItem*);
 
 protected:
 
diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index de9c866..1db2f77 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -311,7 +311,7 @@ void TemplateFolderView::Populate ()
 TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, 
this );
 pItem-mnId = i+1;
 pItem-maText = aRegionName;
-pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
+pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
 sal_uInt16 nEntries = mpDocTemplates-GetCount(i);
 
@@ -456,7 +456,7 @@ sal_uInt16 TemplateFolderView::createRegion(const 
rtl::OUString rName)
 TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, this );
 pItem-mnId = nRegionId+1;
 pItem-maText = aRegionName;
-pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
+pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
 mItemList.push_back(pItem);
 
diff --git a/sfx2/source/control/templatesearchview.cxx 
b/sfx2/source/control/templatesearchview.cxx
index fa6eabc..5bf2f73 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -44,7 +44,7 @@ void TemplateSearchView::AppendItem(sal_uInt16 nItemId, 
sal_uInt16 nRegionId, sa
 pItem-maPreview1 = rImage;
 pItem-maText = rStr;
 pItem-setPath(rPath);
-pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
+pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
 mItemList.push_back(pItem);
 
diff --git a/sfx2/source/control/templateview.cxx 
b/sfx2/source/control/templateview.cxx
index a83a568..b804341 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -119,7 +119,7 @@ void TemplateView::InsertItems (const 
std::vectorTemplateItemProperties rTemp
 pItem-setPath(pCur-aPath);
 pItem-setFileType(pCur-aType);
 pItem-maPreview1 = pCur-aThumbnail;
-pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
+pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
 mItemList.push_back(pItem);
 }
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index b8a962c..d64edf1 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -540,7 +540,7 @@ void ThumbnailView::ImplEndTracking(const Point /*rPos*/, 
bool const /*bCancel*
 //FIXME TODO
 }
 
-IMPL_LINK (ThumbnailView, OnFolderSelected, ThumbnailViewItem*, pItem)
+IMPL_LINK (ThumbnailView, OnItemSelected, ThumbnailViewItem*, pItem)
 {
 maItemStateHdl.Call(pItem);
 return 0;
@@ -804,7 +804,7 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const 
BitmapEx rImage,
 pItem-mnId = nItemId;
 pItem-maPreview1 = rImage;
 pItem-maText   = rText;
-pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
+pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 ImplInsertItem( pItem, nPos );
 }
 
commit fa10ab03bb9f3e796eaa8880d00d116cad9a4225
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Jul 8 19:12:33 2012 -0430

Add an option in toolbar to delete folders when you select them.

Change-Id: Iff10ff99340d9680b924c11956dc036a5f2dac4f

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx 
b/sfx2/inc/sfx2/templatefolderview.hxx
index e3187c4..c969a2a 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++

Re: [PATCH] Implement support for treeview headers native rendering, add GTK implementation