[PUSHED libreoffice-4-1-0] fdo#67093 Change traduction of Title for some more languages
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5044 Approvals: Petr Mladek: Verified; Looks good to me, but someone else must approve Thorsten Behrens: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/5044 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Gerrit-PatchSet: 2 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1-0 Gerrit-Owner: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Christian Lohmaier lohmaier+libreoff...@googlemail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] n#820504: default color hidden by Default style in writerfil...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4329 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/4329/1 n#820504: default color hidden by Default style in writerfilter Setting the font color of the default paragraph style to Auto makes the color set in the Writer defaults (from rPrDefault) ignored. Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c (cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445) (cherry picked from commit 122db845e057cfd83bb2b5fde442200bc742eb8d) --- M writerfilter/source/dmapper/StyleSheetTable.cxx 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 74adb0b..8352b1b 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -786,8 +786,7 @@ pEntry-pProperties-Insert(PROP_PARA_ORPHANS, true, aTwo, false); // Left-to-right direction if not already set pEntry-pProperties-Insert(PROP_WRITING_MODE, true, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); -// font color COL_AUTO if not already set -pEntry-pProperties-Insert(PROP_CHAR_COLOR, true, uno::makeAny( sal_Int32(0x) ), false); +// Don't set font color to Auto if not already set: this could hide the default font color setting } uno::Sequence beans::PropertyValue aPropValues = pEntry-pProperties-GetPropertyValues(); -- To view, visit https://gerrit.libreoffice.org/4329 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] added unit test for n#820504
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4330
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/4330/1
added unit test for n#820504
Change-Id: I804e081a564d24d3896160f817051b19da884c34
(cherry picked from commit f9610ed634318c27382d79089d022fb8175eb90a)
---
A sw/qa/extras/ooxmlimport/data/n820504.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/sw/qa/extras/ooxmlimport/data/n820504.docx
b/sw/qa/extras/ooxmlimport/data/n820504.docx
new file mode 100644
index 000..36279a9
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/n820504.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ce66980..c895db2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -119,6 +119,7 @@
void testPageBorderShadow();
void testN820509();
void testN820788();
+void testN820504();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -205,6 +206,7 @@
{page-border-shadow.docx, Test::testPageBorderShadow},
{n820509.docx, Test::testN820509},
{n820788.docx, Test::testN820788},
+{n820504.docx, Test::testN820504},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1457,6 +1459,16 @@
CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getPropertysal_Int16(xFrame,
SizeType));
}
+void Test::testN820504()
+{
+uno::Referencestyle::XStyleFamiliesSupplier
xFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xFamiliesAccess(xFamiliesSupplier-getStyleFamilies(), uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xStylesAccess(xFamiliesAccess-getByName(ParagraphStyles), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xStyle(xStylesAccess-getByName(Default Style), uno::UNO_QUERY);
+// The problem was that the CharColor was set to AUTO (-1) even if we have
some default char color set
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getPropertysal_Int32(xStyle,
CharColor));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
--
To view, visit https://gerrit.libreoffice.org/4330
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I804e081a564d24d3896160f817051b19da884c34
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Template Manager: Use actual template icons if no thumbnail ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3278 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3278 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1ee86a180701355886a340ea97940303f527422 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Fixed libcmis handling of related multipart content types
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4241
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/4241/1
Fixed libcmis handling of related multipart content types
Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
(cherry picked from commit 6b10219eefc0d6bd0e871976d6fe781a26020c8b)
(cherry picked from commit 6ed3ef87d2472bad71b719e9ec927e72acfd2850)
---
M libcmis/libcmis-0.3.0.patch
1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index 37644c8..772c828 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -33,3 +33,17 @@
contentLength = it-second-getLongs( ).front( );
return contentLength;
}
+diff --git src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+index ef91b4d..3a990e7 100644
+--- src/libcmis/ws-relatedmultipart.cxx
src/libcmis/ws-relatedmultipart.cxx
+@@ -93,6 +93,8 @@ RelatedMultipart::RelatedMultipart( const string body,
const string contentTyp
+ if ( value[0] == '' value[value.length() - 1] == '' )
+ value = value.substr( 1, value.length( ) - 2 );
+
++name = libcmis::trim( name );
++
+ if ( name == start )
+ {
+ m_startId = value;
+--
--
To view, visit https://gerrit.libreoffice.org/4241
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64577, CMIS: fixed crasher in libcmis
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3921
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3921/1
fdo#64577, CMIS: fixed crasher in libcmis
The crash is handled, but the huge files' size won't be properly handled
on 32bits builds: would require a libcmis API change.
Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2
(cherry picked from commit 7a6f5186a8e4089181f57af44fa4654fe692856b)
---
M libcmis/libcmis-0.3.0.patch
1 file changed, 13 insertions(+), 0 deletions(-)
diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index d9dc70f..37644c8 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -20,3 +20,16 @@
xmlTextWriterEndElement( writer ); // End of Expires
xmlTextWriterEndElement( writer ); // End of Timestamp
+diff --git src/libcmis/document.cxx src/libcmis/document.cxx
+index 7c2a8e6..e7014cb 100644
+--- src/libcmis/document.cxx
src/libcmis/document.cxx
+@@ -78,7 +78,7 @@ namespace libcmis
+ {
+ long contentLength = 0;
+ map string, libcmis::PropertyPtr ::const_iterator it =
getProperties( ).find( string( cmis:contentStreamLength ) );
+-if ( it != getProperties( ).end( ) !it-second-getStrings(
).empty( ) )
++if ( it != getProperties( ).end( ) !it-second-getLongs( ).empty(
) )
+ contentLength = it-second-getLongs( ).front( );
+ return contentLength;
+ }
--
To view, visit https://gerrit.libreoffice.org/3921
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix for fdo#53031
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3914 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3914 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64249: make sure we have matching start/end level for ta...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3907
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/3907/1
fdo#64249: make sure we have matching start/end level for table in shapes
Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
(cherry picked from commit 9ceda3013a6b7e60e0e56ba540e217fd36a34a0f)
---
M writerfilter/source/dmapper/DomainMapper_Impl.cxx
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index deda4f1..48e40dea 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1627,6 +1627,10 @@
if (m_aTextAppendStack.empty())
return;
uno::Referencetext::XTextAppend xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+
+appendTableManager( );
+appendTableHandler( );
+getTableManager().startLevel();
try
{
uno::Reference lang::XServiceInfo xSInfo( xShape,
uno::UNO_QUERY_THROW );
@@ -1685,10 +1689,6 @@
xProps-setPropertyValue( rPropNameSupplier.GetName(
PROP_ANCHOR_TYPE ), bIsGraphic ? uno::makeAny(
text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny(
text::TextContentAnchorType_AT_PARAGRAPH ) );
}
}
-
-appendTableManager( );
-appendTableHandler( );
-getTableManager().startLevel();
}
catch ( const uno::Exception e )
{
@@ -1700,11 +1700,10 @@
void DomainMapper_Impl::PopShapeContext()
{
+getTableManager().endLevel();
+popTableManager();
if ( m_aAnchoredStack.size() 0 )
{
-getTableManager().endLevel();
-popTableManager();
-
// For OLE object replacement shape, the text append context was
already removed
// or the OLE object couldn't be inserted.
if ( !m_aAnchoredStack.top().bToRemove )
--
To view, visit https://gerrit.libreoffice.org/3907
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#982969 Resource leak
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3902 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3902 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabf637be4b704de4165c5cefb6a19687a1b5637a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Require at least gio 2.26 for the dbus support.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3904 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3904 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6276d55081098f567104f61fde896d1b66591522 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mark Wielaard m...@klomp.org Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#705731 Resource leak
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3901 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3901 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbe476534025017d21e8af353e92a15cee902cca Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#1000721 Resource Leak
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3897 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3897 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59161a08eee0406ac71b1212a0a8697edf27911f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#1019413: Unitialized scalar variable
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3895 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3895 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0a2a1a137176f2f2176b2c16cd7a747d9bc9b52 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3893 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3893 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I048ff445fa04b12cb86ae580370bfe444041d41f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/utlui/
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3891 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3891 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie150e8812b674a9fdd0cb904489dfb561bdcf7a2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/shells...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3890 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3890 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3771 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3771 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80aca85562e4a43fded5c37f9895e51f79e42c14 Gerrit-PatchSet: 8 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ioan.rad...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#55582 calc part
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3872 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3872 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01ce4a7a7738304f47efc718c382a5b1dee68ea2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] cppcheck: fix arrayIndexThenCheck/optimize loops
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3869 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3869 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If399abf5fb3eaea91f4f5d5e86b86b37790d3c9a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#32368 - Link both Ctrl+Y as Ctrl+Shift+Z as shortcut key...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3853 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3853 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d766b300d79e9ebd85dc5ae7bb327cf9c1a7c41 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Related fdo#35546: Simplyfy Code in Photo Album Dialog
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3855 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3855 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie40a4f3bb4402b988071b315617404c802b7e92a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Related fdo#35546: Further improve Layout of Photo Album Dia...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3852 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3852 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfb24a8678d096bb596bcdeabbf539e9fe1835db Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Related fdo#35546: Remove 1 Image with Title Layout for Ph...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3858 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3858 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I891511d6cf8183e45b41a9358f4821f7de551836 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Get rid of GlobalEditData::GetStdRefDevice()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3886 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3886 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf3ae3c28da0583a44472f36312b07766734bf7b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] pastespecial.ui widget
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3790 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3790 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e26bfe16a64aee8d94dc6a8042a8a4cd722ade1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae almusair...@kacst.edu.sa Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] zoomandviewlayout.ui widget
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3794 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3794 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d607a5960ffc3c69ffa97ca3e2ebae555044581 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae almusair...@kacst.edu.sa Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#64531 : Tab-stops exported to DOCX added too much indent...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3884 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3884 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12747006c8aac663f9529b495914f4a08301c66f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Adam CloudOn rattles2...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#42144 WW8 export: avoid writing pointless empty footers
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3797 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3797 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] SwPostItMgr::Delete: fix crash when layout is not yet ready
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3757 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3757 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5fd5c908bc7b1feba926214863e84391b9037484 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] make parent style for 'frame contents' be 'standard' rather ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3697 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3697 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Fix out-of-bonds Sequence access in NumberingManager with pa...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3739 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3739 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix fdo#40496: don't reset RES_PARATR_ADJUST RES_FRAMEDIR ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3146 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3146 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69298632d56decbce3eb7058b982d845cb3e7240 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Templates Manager: merged the Double Click Handling into Tem...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3087
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3087/1
Templates Manager: merged the Double Click Handling into TemplateAbstractView
(cherry picked from commit 8a2bfe697bf71c8a2ca3c6ba1ef5e6324d4163aa)
Conflicts:
sfx2/inc/sfx2/templateview.hxx
sfx2/source/control/templateabstractview.cxx
sfx2/source/control/templatelocalview.cxx
sfx2/source/control/templateview.cxx
Change-Id: Iafc1650d57d29fbc24921498f18da6c0e510b37a
---
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/templateremoteview.hxx
M sfx2/inc/sfx2/templateview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateremoteview.cxx
M sfx2/source/control/templateview.cxx
M sfx2/source/doc/templatedlg.cxx
9 files changed, 39 insertions(+), 68 deletions(-)
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx
b/sfx2/inc/sfx2/templateabstractview.hxx
index ca51181..a5fef71 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -87,7 +87,7 @@
virtual void filterTemplatesByApp (const FILTER_APPLICATION eApp);
-virtual void showOverlay (bool bVisible) = 0;
+void showOverlay (bool bVisible);
void setItemDimensions (long ItemWidth, long ThumbnailHeight, long
DisplayHeight, int itemPadding);
@@ -109,7 +109,7 @@
void setOverlayItemStateHdl (const Link aLink) { maOverlayItemStateHdl =
aLink; }
-void setOverlayDblClickHdl (const Link rLink);
+void setOpenHdl (const Link rLink);
void setOverlayCloseHdl (const Link rLink);
@@ -127,10 +127,13 @@
DECL_LINK(OverlayItemStateHdl, const ThumbnailViewItem*);
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
protected:
TemplateView *mpItemView;
Link maOverlayItemStateHdl;
+Link maOpenHdl;
bool mbFilteredResults; // Flag keep track if overlay has been
filtered so folders can get filtered too afterwards
FILTER_APPLICATION meFilterOption;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index 78cf547..432b008 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -39,8 +39,6 @@
std::vectorOUString getFolderNames ();
-virtual void showOverlay (bool bVisible);
-
std::vectorTemplateItemProperties
getFilteredItems (const boost::functionbool (const
TemplateItemProperties) rFunc) const;
@@ -72,10 +70,6 @@
bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString
rName) const;
virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
-
-private:
-
-virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
private:
diff --git a/sfx2/inc/sfx2/templateremoteview.hxx
b/sfx2/inc/sfx2/templateremoteview.hxx
index bd1bf5c..b760f00 100644
--- a/sfx2/inc/sfx2/templateremoteview.hxx
+++ b/sfx2/inc/sfx2/templateremoteview.hxx
@@ -25,8 +25,6 @@
virtual ~TemplateRemoteView ();
-virtual void showOverlay (bool bVisible);
-
bool loadRepository (TemplateRepository* pRepository, bool bRefresh);
private:
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index e219905..aaa7334 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -36,26 +36,28 @@
void InsertItems (const std::vectorTemplateItemProperties rTemplates);
-void setDblClickHdl (const Link rLink) { maDblClickHdl = rLink; }
-
void setCloseHdl (const Link rLink) { maAllButton.SetClickHdl(rLink); }
void setMasterView(TemplateAbstractView* pMasterView) { mpMasterView =
pMasterView; }
virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+
+
+// FIXME Kept only during the refactoring
+void setOpenHdl (const Link rLink) { maOpenHdl = rLink; }
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem) {
maOpenHdl.Call(pItem); }
protected:
virtual void Resize ();
-virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
-
private:
TemplateAbstractView* mpMasterView;
+
+Link maOpenHdl;
PushButton maAllButton;
FixedText maFTName;
sal_uInt16 mnId;
OUString maName;
-Link maDblClickHdl;
};
#endif // TEMPLATEVIEW_HXX
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index 14ab811..43efcbb 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -217,9 +217,10 @@
mpItemView-filterItems(ViewFilter_Keyword(rKeyword));
}
-void TemplateAbstractView::setOverlayDblClickHdl(const Link rLink)
+void TemplateAbstractView::setOpenHdl(const Link rLink)
{
-mpItemView-setDblClickHdl(rLink);
+
[PATCH libreoffice-4-0] Deselect thumbnailview items when clearing the view.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3089
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3089/1
Deselect thumbnailview items when clearing the view.
Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34
(cherry picked from commit 1c9f13f921cb5bf955b8568ffb5d14047738eef9)
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 10 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index ca685cc..b3b1251 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -114,6 +114,16 @@
for ( size_t i = 0; i n; ++i )
{
ThumbnailViewItem *const pItem = mItemList[i];
+
+// deselect all current selected items and fire events
+if (pItem-isSelected())
+{
+pItem-setSelection(false);
+maItemStateHdl.Call(pItem);
+
+// fire accessible event???
+}
+
if ( pItem-isVisible() ImplHasAccessibleListeners() )
{
::com::sun::star::uno::Any aOldAny, aNewAny;
--
To view, visit https://gerrit.libreoffice.org/3089
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Fix template manager item selection behaviour with mouse.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3090
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3090/1
Fix template manager item selection behaviour with mouse.
Change-Id: Icf63454973b403eea1cc583fce3a78c5594d
(cherry picked from commit 28d5ced7f9982257d263ffc3e550bd479a9542f8)
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index b3b1251..8b2840d 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -609,15 +609,22 @@
{
if ( rMEvt.GetClicks() == 1 )
{
-if (pItem-isSelected() rMEvt.IsMod1())
-pItem-setSelection(false);
+if (rMEvt.IsMod1())
+{
+//Keep selected item group state and just invert current
desired one state
+pItem-setSelection(!pItem-isSelected());
+}
else
{
-if (!pItem-isSelected() !rMEvt.IsMod1())
-deselectItems( );
-
+//If we got a group of selected items deselect the rest
and only keep the desired one
+//mark items as not selected to not fire unnecessary
change state events.
+pItem-setSelection(false);
+deselectItems();
pItem-setSelection(true);
+}
+if (pItem-isSelected())
+{
bool bClickOnTitle =
pItem-getTextArea().IsInside(rMEvt.GetPosPixel());
pItem-setEditTitle(bClickOnTitle);
}
@@ -626,13 +633,11 @@
DrawItem(pItem);
maItemStateHdl.Call(pItem);
+
+//fire accessible event??
}
else if ( rMEvt.GetClicks() == 2 )
{
-// The mouse button down event 1 click right before is
pointless
-pItem-setSelection(false);
-maItemStateHdl.Call(pItem);
-
Rectangle aRect(pItem-getDrawArea());
if (aRect.IsInside(rMEvt.GetPosPixel()))
--
To view, visit https://gerrit.libreoffice.org/3090
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf63454973b403eea1cc583fce3a78c5594d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Syncronize thumbnails ids with SfxDocumentTemplates when mov...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3091
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3091/1
Syncronize thumbnails ids with SfxDocumentTemplates when moving.
Change-Id: I9ee17e00f769ca16f566b1397d09b76a09273912
(cherry picked from commit dda5fe60ff6dfd61f5f262c61e1d538d20e9c978)
---
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/templatedlg.cxx
3 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index 3bcacc4..68b7dc7 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -56,9 +56,9 @@
bool removeTemplate (const sal_uInt16 nItemId, const sal_uInt16
nSrcItemId);
bool moveTemplate (const ThumbnailViewItem* pItem, const sal_uInt16
nSrcItem,
- const sal_uInt16 nTargetItem, bool bCopy);
+ const sal_uInt16 nTargetItem);
-bool moveTemplates (const std::setconst
ThumbnailViewItem*,selection_cmp_fn rItems, const sal_uInt16 nTargetItem,
bool bCopy);
+bool moveTemplates (const std::setconst
ThumbnailViewItem*,selection_cmp_fn rItems, const sal_uInt16 nTargetItem);
bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx rThumbnail,
const OUString rPath);
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index ab55ca4..429b4dc 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -289,11 +289,8 @@
}
bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const
sal_uInt16 nSrcItem,
- const sal_uInt16 nTargetItem, bool
bCopy)
+ const sal_uInt16 nTargetItem)
{
-bool bRet = true;
-bool bRefresh = false;
-
TemplateContainerItem *pTarget = NULL;
TemplateContainerItem *pSrc = NULL;
@@ -313,16 +310,13 @@
const TemplateViewItem *pViewItem = static_castconst
TemplateViewItem*(pItem);
-bool bOK;
+bool bCopy =
!mpDocTemplates-Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnDocId);
if (bCopy)
-bOK =
mpDocTemplates-Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnId-1);
-else
-bOK =
mpDocTemplates-Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnId-1);
-
-if (!bOK)
-return false;
-
+{
+if
(!mpDocTemplates-Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnDocId))
+return false;
+}
// move template to destination
TemplateItemProperties aTemplateItem;
@@ -340,37 +334,45 @@
// remove template from region cached data
std::vectorTemplateItemProperties::iterator aIter;
-for (aIter = pSrc-maTemplates.begin(); aIter !=
pSrc-maTemplates.end(); ++aIter)
+for (aIter = pSrc-maTemplates.begin(); aIter !=
pSrc-maTemplates.end();)
{
-if (aIter-nId == pViewItem-mnId)
+if (aIter-nDocId == pViewItem-mnDocId)
{
-pSrc-maTemplates.erase(aIter);
-
-RemoveItem(pViewItem-mnId);
-break;
+aIter = pSrc-maTemplates.erase(aIter);
}
+else
+{
+// Keep region document id syncronized with
SfxDocumentTemplates
+if (aIter-nDocId pViewItem-mnDocId)
+--aIter-nDocId;
+
+++aIter;
+}
+}
+
+// Keep view document id syncronized with SfxDocumentTemplates
+std::vectorThumbnailViewItem*::iterator pItemIter =
mItemList.begin();
+for (; pItemIter != mItemList.end(); ++pItemIter)
+{
+if (static_castTemplateViewItem*(*pItemIter)-mnDocId
pViewItem-mnDocId)
+--static_castTemplateViewItem*(*pItemIter)-mnDocId;
}
}
-bRefresh = true;
-}
-else
-bRet = false;
-
-if (bRefresh)
-{
lcl_updateThumbnails(pSrc);
lcl_updateThumbnails(pTarget);
CalculateItemPositions();
Invalidate();
+
+return true;
}
-return bRet;
+return false;
}
bool TemplateLocalView::moveTemplates(const std::setconst ThumbnailViewItem*,
selection_cmp_fn rItems,
- const sal_uInt16 nTargetItem, bool bCopy)
+ const sal_uInt16 nTargetItem)
{
bool ret = true;
bool refresh = false;
@@ -400,17 +402,15 @@
{
const TemplateViewItem *pViewItem = static_castconst
TemplateViewItem*(*aSelIter);
-bool bOK;
+
[PUSHED libreoffice-4-0] fdo#61429: Stylist: save selection of Hierarchical entry
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3056 Approvals: Christoph Brill: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3056 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2bc9ce2690fbc742b4510e453ca1ef310614256 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Christoph Brill egore...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Separate template region ids from thumbnail ids.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3075 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3075 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22da25a4bbba4604f5df42f440e6532076d39457 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix deleting templates through Template Manager.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3076 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3076 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic59d3d666ae5f3808ef7dd7324589a731a841186 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Delete the correct template from the selected search results...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3077 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3077 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fe82b20e9b4a78a3e8e587a5720054f845d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix exporting selected search results in Template Manager.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3078 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3078 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0716b3f2833bdcc78a67f1b0874b92a59df705f7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix moving selected search results in Template Manager.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3079 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3079 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51ae74f91845255dc1f332e33c8e708e5af1ead0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix template manager item selection behaviour with mouse.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3053 -- To view, visit https://gerrit.libreoffice.org/3053 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf63454973b403eea1cc583fce3a78c5594d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Syncronize thumbnails ids with SfxDocumentTemplates when mov...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3054 -- To view, visit https://gerrit.libreoffice.org/3054 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ee17e00f769ca16f566b1397d09b76a09273912 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Merge TemplateView into TemplateAbstractView class.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3051 -- To view, visit https://gerrit.libreoffice.org/3051 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafc246eeff4c50c12ac9ebec9fe95dcc84991e9e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Deselect thumbnailview items when clearing the view.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3052 -- To view, visit https://gerrit.libreoffice.org/3052 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#61390: allow arrow keys to show hidden thumbnail items
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3033
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/3033/1
fdo#61390: allow arrow keys to show hidden thumbnail items
Change-Id: I70924b4c9578122a1c5a5b6c8a67889d6d003a2e
(cherry picked from commit cc599e914e7ade9f10da460fc1c77ea07454d7ff)
---
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/doc/templatedlg.cxx
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 95e6b53..9e29c9a 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -277,6 +277,7 @@
using Window::ImplInit;
void CalculateItemPositions ();
+void MakeItemVisible( sal_uInt16 nId );
SFX2_DLLPRIVATE void ImplInit();
SFX2_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index f78a308..08be7cb 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -553,11 +553,38 @@
Control::KeyInput( rKEvt );
}
-if ( pNext pNext-isVisible() )
+if ( pNext )
{
deselectItems();
SelectItem(pNext-mnId);
+MakeItemVisible(pNext-mnId);
}
+}
+
+void ThumbnailView::MakeItemVisible( sal_uInt16 nItemId )
+{
+// Get the item row
+size_t nPos = 0;
+bool bFound = false;
+for ( size_t i = 0; !bFound i mFilteredItemList.size(); ++i )
+{
+ThumbnailViewItem* pItem = mFilteredItemList[i];
+if ( pItem-mnId == nItemId )
+{
+nPos = i;
+bFound = true;
+}
+}
+sal_uInt16 nRow = nPos / mnCols;
+
+// Move the visible rows as little as possible to include that one
+if ( nRow mnFirstLine )
+mnFirstLine = nRow;
+else if ( nRow mnFirstLine + mnVisLines )
+mnFirstLine = nRow - mnVisLines;
+
+CalculateItemPositions();
+Invalidate();
}
void ThumbnailView::MouseButtonDown( const MouseEvent rMEvt )
@@ -703,11 +730,11 @@
void ThumbnailView::Resize()
{
+Control::Resize();
CalculateItemPositions();
if ( IsReallyVisible() IsUpdateMode() )
Invalidate();
-Control::Resize();
}
void ThumbnailView::StateChanged( StateChangedType nType )
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b9d3945..e5e4014 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -331,7 +331,7 @@
Point aViewPos = maView-GetPosPixel();
aViewPos.setY(nToolbarsHeight);
aViewPos.setX(0);
-Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY());
+Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getHeight() - aViewPos.getY());
maView-SetPosSizePixel(aViewPos, aThumbSize);
if (aWinSize.getHeight() aViewPos.getY() + aThumbSize.getHeight() +
PADDING_DLG_BORDER)
--
To view, visit https://gerrit.libreoffice.org/3033
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70924b4c9578122a1c5a5b6c8a67889d6d003a2e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#62659: only select items in ThumbnailView on TabStop
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3034
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3034/1
fdo#62659: only select items in ThumbnailView on TabStop
Change-Id: I024df8520f0daf2cc2e9e5f041e1ff18cb3689ec
(cherry picked from commit f8a3582d4cbcf6a705f724b921e370c739ecee35)
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 08be7cb..0da633f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -126,6 +126,7 @@
}
mItemList.clear();
+mFilteredItemList.clear();
}
void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool
bBackground )
@@ -680,17 +681,20 @@
void ThumbnailView::GetFocus()
{
-// Select the first item if nothing selected
-int nSelected = -1;
-for (size_t i = 0, n = mItemList.size(); i n nSelected == -1; ++i)
+if(GETFOCUS_TAB GetGetFocusFlags())
{
-if (mItemList[i]-isSelected())
-nSelected = i;
-}
+// Select the first item if nothing selected
+int nSelected = -1;
+for (size_t i = 0, n = mItemList.size(); i n nSelected == -1; ++i)
+{
+if (mItemList[i]-isSelected())
+nSelected = i;
+}
-if ( nSelected == -1 mItemList.size( ) 0 )
-{
-SelectItem( 1 );
+if ( nSelected == -1 mItemList.size( ) 0 )
+{
+SelectItem( 1 );
+}
}
// Tell the accessible object that we got the focus.
--
To view, visit https://gerrit.libreoffice.org/3034
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I024df8520f0daf2cc2e9e5f041e1ff18cb3689ec
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template Manager: fixed control WinBits reset... was breakin...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2909 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/2909/1 Template Manager: fixed control WinBits reset... was breaking tabstop Change-Id: I6e542ecc0e0f5a2b3e0ca59a52bb809b1a23284f (cherry picked from commit 5fa5f95612c53511fb951660b4ad397321e8) --- M sfx2/source/doc/templatedlg.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index e9f85eb..b9d3945 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -163,7 +163,7 @@ mpSearchEdit-SetUpdateDataHdl(LINK(this,SfxTemplateManagerDlg,SearchUpdateHdl)); mpSearchEdit-EnableUpdateData(); -maView-SetStyle(WB_VSCROLL); +maView-SetStyle(maView-GetStyle() | WB_VSCROLL); maView-setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH); maView-setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT, -- To view, visit https://gerrit.libreoffice.org/2909 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e542ecc0e0f5a2b3e0ca59a52bb809b1a23284f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template Manager: select first item when getting focus if no...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2910
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/2910/1
Template Manager: select first item when getting focus if no selection
Change-Id: Ie012e010ca92728725535345c76fc9f5eb31a254
(cherry picked from commit ec2f84b376f595b0553297d25b7716f6b97e1b87)
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index c996f0f..57dba07 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -579,12 +579,29 @@
void ThumbnailView::GetFocus()
{
-Control::GetFocus();
+// Select the first item if nothing selected
+int nSelected = -1;
+for (size_t i = 0, n = mItemList.size(); i n nSelected == -1; ++i)
+{
+if (mItemList[i]-isSelected())
+nSelected = i;
+}
+
+if ( nSelected == -1 mItemList.size( ) 0 )
+{
+mItemList[0]-setSelection(true);
+maItemStateHdl.Call(mItemList[0]);
+
+if (IsReallyVisible() IsUpdateMode())
+Invalidate();
+}
// Tell the accessible object that we got the focus.
ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation(
GetAccessible( sal_False ) );
if( pAcc )
pAcc-GetFocus();
+
+Control::GetFocus();
}
void ThumbnailView::LoseFocus()
--
To view, visit https://gerrit.libreoffice.org/2910
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie012e010ca92728725535345c76fc9f5eb31a254
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template Manager: removed some dead selection code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2911
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/2911/1
Template Manager: removed some dead selection code
(cherry picked from commit bfd1bcb204ed3ca35df1455a346a0ee7254a1191)
Conflicts:
sfx2/source/control/thumbnailview.cxx
Change-Id: Ib5ebcd928e77a115f4f62a50724656c33ae13c61
---
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/control/thumbnailviewacc.cxx
3 files changed, 24 insertions(+), 111 deletions(-)
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 8eb9426..efc5e78 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -202,10 +202,7 @@
void SelectItem( sal_uInt16 nItemId );
-sal_uInt16 GetSelectItemId() const { return mnSelItemId; }
-
-bool IsItemSelected( sal_uInt16 nItemId ) const
-{ return nItemId == mnSelItemId; }
+bool IsItemSelected( sal_uInt16 nItemId ) const;
void deselectItem (const sal_uInt16 nItemId);
@@ -258,8 +255,6 @@
virtual void DataChanged( const DataChangedEvent rDCEvt );
-virtual bool StartDrag( const CommandEvent rCEvt, Region rRegion );
-
virtual ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible CreateAccessible();
protected:
@@ -310,7 +305,6 @@
long mnVisLines;
long mnLines;
sal_uInt16 mnScrBarOffset;
-sal_uInt16 mnSelItemId;
sal_uInt16 mnHighItemId;
sal_uInt16 mnCols;
sal_uInt16 mnFirstLine;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 57dba07..63ba189 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -92,7 +92,6 @@
mnLines = 0;
mnFirstLine = 0;
mnScrBarOffset = 1;
-mnSelItemId = 0;
mnHighItemId= 0;
mnCols = 0;
mnSpacing = 0;
@@ -589,11 +588,7 @@
if ( nSelected == -1 mItemList.size( ) 0 )
{
-mItemList[0]-setSelection(true);
-maItemStateHdl.Call(mItemList[0]);
-
-if (IsReallyVisible() IsUpdateMode())
-Invalidate();
+SelectItem( 1 );
}
// Tell the accessible object that we got the focus.
@@ -710,10 +705,9 @@
}
// reset variables
-if ( (mnHighItemId == nItemId) || (mnSelItemId == nItemId) )
+if ( (mnHighItemId == nItemId) )
{
mnHighItemId= 0;
-mnSelItemId = 0;
}
CalculateItemPositions();
@@ -729,7 +723,6 @@
// reset variables
mnFirstLine = 0;
mnHighItemId= 0;
-mnSelItemId = 0;
CalculateItemPositions();
@@ -777,19 +770,18 @@
void ThumbnailView::SelectItem( sal_uInt16 nItemId )
{
-size_t nItemPos = 0;
+size_t nItemPos = GetItemPos( nItemId );
+if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
+return;
-if ( nItemId )
+ThumbnailViewItem* pItem = mItemList[nItemPos];
+if (!pItem-isSelected())
{
-nItemPos = GetItemPos( nItemId );
-if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
-return;
-}
+mItemList[nItemPos]-setSelection(true);
+maItemStateHdl.Call(mItemList[nItemPos]);
-if ( mnSelItemId != nItemId)
-{
-sal_uInt16 nOldItem = mnSelItemId ? mnSelItemId : 1;
-mnSelItemId = nItemId;
+if (IsReallyVisible() IsUpdateMode())
+Invalidate();
bool bNewOut = IsReallyVisible() IsUpdateMode();
@@ -815,44 +807,8 @@
if( ImplHasAccessibleListeners() )
{
-// focus event (deselect)
-if( nOldItem )
-{
-const size_t nPos = GetItemPos( nItemId );
-
-if( nPos != THUMBNAILVIEW_ITEM_NOTFOUND )
-{
-ThumbnailViewAcc* pItemAcc =
ThumbnailViewAcc::getImplementation(
-mItemList[nPos]-GetAccessible(
mbIsTransientChildrenDisabled ) );
-
-if( pItemAcc )
-{
-::com::sun::star::uno::Any aOldAny, aNewAny;
-if( !mbIsTransientChildrenDisabled )
-{
-aOldAny = ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface (
-static_cast ::cppu::OWeakObject* ( pItemAcc
));
-ImplFireAccessibleEvent
(::com::sun::star::accessibility::AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
aOldAny, aNewAny );
-}
-else
-{
-aOldAny =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
-pItemAcc-FireAccessibleEvent(
[PATCH libreoffice-4-0] fdo#61390: simple keybard support in TemplateManager
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2912
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/2912/1
fdo#61390: simple keybard support in TemplateManager
Adds support for the UP, DOWN, LEFT, RIGHT and RETURN keys in the
thumbnails view but doesn't handle the modifiers yet. There are still
some problems with the focus and key input outside the top level
(cherry picked from commit ee819bdd2dab5756cc3bad74f24e50bd7409f308)
Conflicts:
sfx2/source/control/thumbnailview.cxx
Change-Id: I5ba67583c835bcc00b075071411c0d6590a07f9a
---
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/thumbnailview.cxx
2 files changed, 104 insertions(+), 7 deletions(-)
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index efc5e78..95e6b53 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -202,6 +202,8 @@
void SelectItem( sal_uInt16 nItemId );
+void DeselectItem( sal_uInt16 nItemId );
+
bool IsItemSelected( sal_uInt16 nItemId ) const;
void deselectItem (const sal_uInt16 nItemId);
@@ -239,6 +241,8 @@
protected:
+virtual void KeyInput( const KeyEvent rKEvt );
+
virtual void MouseButtonDown( const MouseEvent rMEvt );
virtual void MouseButtonUp( const MouseEvent rMEvt );
@@ -272,8 +276,6 @@
using Control::ImplInitSettings;
using Window::ImplInit;
-void calculateColumnsRows ();
-
void CalculateItemPositions ();
SFX2_DLLPRIVATE void ImplInit();
@@ -294,6 +296,7 @@
protected:
ValueItemList mItemList;
+ValueItemList mFilteredItemList; /// Cache to store the filtered items
ScrollBar* mpScrBar;
Rectangle maItemListRect;
long mnHeaderHeight;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 63ba189..f78a308 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -214,6 +214,8 @@
WinBits nStyle = GetStyle();
ScrollBar* pDelScrBar = NULL;
+mFilteredItemList.clear();
+
// consider the scrolling
if ( nStyle WB_VSCROLL )
ImplInitScrollBar();
@@ -298,6 +300,7 @@
if (maFilterFunc(pItem))
{
+mFilteredItemList.push_back(pItem);
if ((nCurCount = nFirstItem) (nCurCount nLastItem))
{
if( !pItem-isVisible())
@@ -490,6 +493,73 @@
return 0;
}
+void ThumbnailView::KeyInput( const KeyEvent rKEvt )
+{
+// Get the last selected item in the list
+size_t nLastPos = 0;
+bool bFoundLast = false;
+for ( long i = mFilteredItemList.size() - 1; !bFoundLast i = 0; --i )
+{
+ThumbnailViewItem* pItem = mFilteredItemList[i];
+if ( pItem-isSelected() )
+{
+nLastPos = i;
+bFoundLast = true;
+}
+}
+
+KeyCode aKeyCode = rKEvt.GetKeyCode();
+ThumbnailViewItem* pNext = NULL;
+switch ( aKeyCode.GetCode() )
+{
+case KEY_RIGHT:
+{
+size_t nNextPos = nLastPos;
+if ( bFoundLast nLastPos mFilteredItemList.size( ) - 1 )
+nNextPos = nLastPos + 1;
+pNext = mFilteredItemList[nNextPos];
+}
+break;
+case KEY_LEFT:
+{
+size_t nNextPos = nLastPos;
+if ( nLastPos 0 )
+nNextPos = nLastPos - 1;
+pNext = mFilteredItemList[nNextPos];
+}
+break;
+case KEY_DOWN:
+{
+size_t nNextPos = nLastPos;
+if ( bFoundLast nLastPos mFilteredItemList.size( ) -
mnCols )
+nNextPos = nLastPos + mnCols;
+pNext = mFilteredItemList[nNextPos];
+}
+break;
+case KEY_UP:
+{
+size_t nNextPos = nLastPos;
+if ( nLastPos = mnCols )
+nNextPos = nLastPos - mnCols;
+pNext = mFilteredItemList[nNextPos];
+}
+break;
+case KEY_RETURN:
+{
+if ( bFoundLast )
+OnItemDblClicked( mFilteredItemList[nLastPos] );
+}
+default:
+Control::KeyInput( rKEvt );
+}
+
+if ( pNext pNext-isVisible() )
+{
+deselectItems();
+SelectItem(pNext-mnId);
+}
+}
+
void ThumbnailView::MouseButtonDown( const MouseEvent rMEvt )
{
if ( rMEvt.IsLeft() )
@@ -500,12 +570,17 @@
{
if ( rMEvt.GetClicks() == 1 )
{
-if (!pItem-isSelected() !rMEvt.IsMod1())
-deselectItems( );
-pItem-setSelection(true);
+if (pItem-isSelected() rMEvt.IsMod1())
+DeselectItem( pItem-mnId );
+else
+
[PATCH libreoffice-4-0] fdo#61390: Fixed the tabstop in the TemplateView.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2913
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/2913/1
fdo#61390: Fixed the tabstop in the TemplateView.
Change-Id: I887b11646efb9a839da11cd3e20cdf7e532caf3e
(cherry picked from commit 7a25aa2821ccf7318ce4a13efe171763989009d5)
---
M sfx2/inc/sfx2/templateview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templateview.cxx
M sfx2/source/control/templateview.src
4 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index 3e2a7c8..e219905 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -51,7 +51,6 @@
private:
TemplateAbstractView* mpMasterView;
-ControlmaButtons;
PushButton maAllButton;
FixedText maFTName;
sal_uInt16 mnId;
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index de2091f..14ab811 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -114,7 +114,7 @@
TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits
nWinStyle, bool bDisableTransientChildren)
: ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
- mpItemView(new TemplateView(this)),
+ mpItemView(new TemplateView(pParent)),
mbFilteredResults(false),
meFilterOption(FILTER_APP_WRITER)
{
@@ -123,7 +123,7 @@
TemplateAbstractView::TemplateAbstractView(Window *pParent, const ResId
rResId, bool bDisableTransientChildren)
: ThumbnailView(pParent,rResId,bDisableTransientChildren),
- mpItemView(new TemplateView(this)),
+ mpItemView(new TemplateView(pParent)),
mbFilteredResults(false),
meFilterOption(FILTER_APP_WRITER)
{
@@ -190,8 +190,14 @@
void TemplateAbstractView::showOverlay (bool bVisible)
{
+Show(!bVisible);
mpItemView-Show(bVisible);
+mpItemView-SetPosSizePixel(GetPosPixel(), GetSizePixel());
+mpItemView-SetStyle(GetStyle());
+
+mpItemView-GrabFocus();
+
// Clear items is the overlay is closed.
if (!bVisible)
{
diff --git a/sfx2/source/control/templateview.cxx
b/sfx2/source/control/templateview.cxx
index 615465d..46ebeaa 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -34,14 +34,13 @@
using namespace drawinglayer::primitive2d;
TemplateView::TemplateView (Window *pParent)
-: ThumbnailView(pParent,WB_VSCROLL),
+: ThumbnailView(pParent,WB_VSCROLL | WB_TABSTOP),
mpMasterView(NULL),
- maButtons(this, SfxResId(CONTROL_BUTTONS)),
- maAllButton(maButtons, SfxResId(BTN_ALL_TEMPLATES)),
- maFTName(maButtons, SfxResId(FT_NAME)),
+ maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)),
+ maFTName(this, SfxResId(FT_NAME)),
mnId(0)
{
-mnHeaderHeight = maButtons.GetSizePixel().getHeight();
+mnHeaderHeight = maAllButton.GetSizePixel().getHeight() +
maAllButton.GetPosPixel().Y() * 2;
maAllButton.SetStyle(maAllButton.GetStyle() | WB_FLATBUTTON);
}
@@ -88,13 +87,8 @@
Size aWinSize = GetOutputSize();
// Set the buttons panel and buttons size
-Size aPanelSize = maButtons.GetSizePixel();
-int nDeltaW = aWinSize.getWidth() - aPanelSize.getWidth();
-aPanelSize.setWidth(aWinSize.getWidth());
-maButtons.SetSizePixel(aPanelSize);
-
Size aNameSize = maFTName.GetSizePixel();
-aNameSize.setWidth(aNameSize.getWidth() + nDeltaW);
+aNameSize.setWidth( aWinSize.getWidth() - maFTName.GetPosPixel().X());
maFTName.SetSizePixel(aNameSize);
ThumbnailView::Resize();
diff --git a/sfx2/source/control/templateview.src
b/sfx2/source/control/templateview.src
index db4d575..8549c96 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -8,12 +8,6 @@
#include templateview.hrc
-Control CONTROL_BUTTONS
-{
-Size = MAP_APPFONT( 290, 17 );
-TabStop = False;
-};
-
PushButton BTN_ALL_TEMPLATES
{
Pos = MAP_APPFONT( 1, 1 );
--
To view, visit https://gerrit.libreoffice.org/2913
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I887b11646efb9a839da11cd3e20cdf7e532caf3e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template manager: moved the controls into a proper TabPage t...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2843
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2843/1
Template manager: moved the controls into a proper TabPage to avoid problems
Conflicts:
sfx2/inc/templatedlg.hxx
sfx2/source/doc/templatedlg.src
Change-Id: Ibff35bf24873a38c9a09d71fb3630a57e06f1a3c
---
M sfx2/inc/templatedlg.hxx
M sfx2/source/control/templateview.src
M sfx2/source/doc/doc.hrc
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/doc/templatedlg.src
5 files changed, 98 insertions(+), 74 deletions(-)
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 47c1989..095292e 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -15,6 +15,7 @@
#include vcl/dialog.hxx
#include vcl/button.hxx
#include vcl/tabctrl.hxx
+#include vcl/tabpage.hxx
class Edit;
class PopupMenu;
@@ -126,6 +127,7 @@
private:
TabControl maTabControl;
+TabPage maTabPage;
Control *mpToolbars;
Edit *mpSearchEdit;
diff --git a/sfx2/source/control/templateview.src
b/sfx2/source/control/templateview.src
index d2711a7..db4d575 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -11,7 +11,6 @@
Control CONTROL_BUTTONS
{
Size = MAP_APPFONT( 290, 17 );
-Border = True;
TabStop = False;
};
@@ -20,6 +19,7 @@
Pos = MAP_APPFONT( 1, 1 );
Size = MAP_APPFONT( 50, 14 );
Text [ en-US ] = All Templates;
+TabStop = True;
};
FixedText FT_NAME
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index f3edfa7..b56a473 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -39,6 +39,7 @@
#define DLG_DOC_TEMPLATE(RID_SFX_DOC_START+2)
#define DLG_ORGANIZE(RID_SFX_DOC_START+3)
#define DLG_TEMPLATE_MANAGER(RID_SFX_DOC_START+4)
+#define TAB_TEMPLATE_MANAGER(RID_SFX_DOC_START+5)
#define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0)
#define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7041966..1d52d45 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -99,22 +99,38 @@
OUString maKeyword;
};
+class TemplateManagerPage : public TabPage
+{
+private:
+FixedText maFixedText;
+
+public:
+TemplateManagerPage( Window* pParent );
+~TemplateManagerPage( ) { };
+};
+
SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
: ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
maTabControl(this,SfxResId(TAB_CONTROL)),
- mpToolbars( new Control(maTabControl,SfxResId(TOOLBARS))),
+ maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)),
+ mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))),
mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)),
mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
- mpSearchView(new TemplateSearchView(this)),
- maView(new TemplateLocalView(this,SfxResId(TEMPLATE_VIEW))),
- mpOnlineView(new TemplateRemoteView(this, WB_VSCROLL,false)),
+ mpSearchView(new TemplateSearchView(maTabPage)),
+ maView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
+ mpOnlineView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
mbIsSaveMode(false),
mxDesktop(comphelper::getProcessServiceFactory()-createInstance(
com.sun.star.frame.Desktop ),uno::UNO_QUERY ),
mbIsSynced(false),
maRepositories()
{
+maTabControl.SetTabPage( FILTER_DOCS, maTabPage );
+maTabControl.SetTabPage( FILTER_SHEETS, maTabPage );
+maTabControl.SetTabPage( FILTER_PRESENTATIONS, maTabPage );
+maTabControl.SetTabPage( FILTER_DRAWS, maTabPage );
+
// Create popup menus
mpActionMenu = new PopupMenu;
mpActionMenu-InsertItem(MNI_ACTION_SORT_NAME,SfxResId(STR_ACTION_SORT_NAME).toString(),SfxResId(IMG_ACTION_SORT));
@@ -293,20 +309,17 @@
Size aTabSize = maTabControl.GetSizePixel();
aTabSize.setWidth(aWinSize.getWidth());
maTabControl.SetSizePixel(aTabSize);
-Size aTabPageSize = maTabControl.GetTabPageSizePixel();
-Point aToolbarsPos(0, aTabSize.getHeight() - aTabPageSize.getHeight());
-mpToolbars-SetPosPixel(aToolbarsPos);
-aTabPageSize.setHeight(mpToolbars-GetSizePixel().getHeight() + 3);
-maTabControl.SetTabPageSizePixel(aTabPageSize);
-
-Size aToolbarsSize = mpToolbars-GetSizePixel();
-aToolbarsSize.setWidth(aWinSize.getWidth());
-mpToolbars-SetSizePixel(aToolbarsSize);
+maTabControl.SetTabPageSizePixel(aWinSize);
// Calculate toolboxes size and positions
Size aViewSize =
[PATCH libreoffice-4-0] Template Manager: fixed TabStops for the toolbars
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2845
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2845/1
Template Manager: fixed TabStops for the toolbars
Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650
(cherry picked from commit eff94128b8434501a6f9c26a5a47cfd7d408f472)
---
M sfx2/inc/templatedlg.hxx
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/doc/templatedlg.src
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 095292e..0d7eb78 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -128,7 +128,6 @@
TabControl maTabControl;
TabPage maTabPage;
-Control *mpToolbars;
Edit *mpSearchEdit;
ToolBox *mpViewBar;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f0a16b35..e9f85eb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -113,11 +113,10 @@
: ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
maTabControl(this,SfxResId(TAB_CONTROL)),
maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)),
- mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))),
mpSearchEdit(new Edit(maTabPage,WB_HIDE | WB_BORDER)),
- mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
- mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
- mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
+ mpViewBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_VIEW))),
+ mpActionBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_ACTION))),
+ mpTemplateBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_TEMPLATES))),
mpSearchView(new TemplateSearchView(maTabPage)),
maView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
mpOnlineView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
@@ -239,7 +238,6 @@
delete mpTemplateDefaultMenu;
delete mpActionMenu;
delete mpRepositoryMenu;
-delete mpToolbars;
}
void SfxTemplateManagerDlg::setSaveMode(bool bMode)
@@ -318,9 +316,6 @@
long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(),
aActionSize.getHeight()), aTemplateSize.getHeight());
-Size aToolbarsSize (aWinSize.getWidth(), nToolbarsHeight);
-mpToolbars-SetSizePixel(aToolbarsSize);
-
aActionSize.setWidth(3*aActionSize.getWidth());
aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar-GetPosPixel().X());
aTemplateSize.setWidth(aWinSize.getWidth());
@@ -334,7 +329,7 @@
// Set view position below toolbox
Point aViewPos = maView-GetPosPixel();
-aViewPos.setY(aToolbarsSize.getHeight());
+aViewPos.setY(nToolbarsHeight);
aViewPos.setX(0);
Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY());
maView-SetPosSizePixel(aViewPos, aThumbSize);
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 6928ef1..60c2857 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -106,12 +106,6 @@
Size = MAP_APPFONT( 290, 220 );
Hide = TRUE;
-Control TOOLBARS
-{
-Size = MAP_APPFONT( 290 , 20 );
-TabStop = False;
-};
-
Control TEMPLATE_VIEW
{
Pos = MAP_APPFONT( 0, 20 );
--
To view, visit https://gerrit.libreoffice.org/2845
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template Manager: fixed search edit field position
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2844 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/2844/1 Template Manager: fixed search edit field position Change-Id: Ic5ef64ba3ed4c98397b0c4911de491df4c79946a (cherry picked from commit b6ba04639b9922f6717f79ac4be215e09691d7a9) --- M sfx2/source/doc/templatedlg.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 1d52d45..f0a16b35 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -114,7 +114,7 @@ maTabControl(this,SfxResId(TAB_CONTROL)), maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)), mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))), - mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)), + mpSearchEdit(new Edit(maTabPage,WB_HIDE | WB_BORDER)), mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))), mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))), mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))), -- To view, visit https://gerrit.libreoffice.org/2844 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5ef64ba3ed4c98397b0c4911de491df4c79946a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove rtl:: namespace, fix minor spelling error in comment
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2726 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2726 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd04bfa61209277c57afe313d679b253aa241b7d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] rhbz#895690: Make GIO UCP less brittle, so saving docs works...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2697 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2697 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a9c0c094f5320456940e3af4c802711828ab5ac Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38246 Comment control on Writer ruler feature
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1785 -- To view, visit https://gerrit.libreoffice.org/1785 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib065043d05fe56fbfe6d00e0bb654966f046129b Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#61458, index should be flat
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2603 -- To view, visit https://gerrit.libreoffice.org/2603 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46db120fc5e7d616cd4c9eadee7fc4c502569e86 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use startsWith() instead of compareToAscii()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2621 -- To view, visit https://gerrit.libreoffice.org/2621 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#57950: Removed some chained appends from sw
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2643 -- To view, visit https://gerrit.libreoffice.org/2643 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b78b4a8f2fc0fb0c4a67042ac4924e375c2d63a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Ask for confirmation when deleting a template, fdo#61466
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2667 -- To view, visit https://gerrit.libreoffice.org/2667 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa499bfa5536d8df1d4e6d2aed3c350c588a0c46 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#47011 autosave feature
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2663 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2663 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I473154b21bab53bf595a5a59e87dc16e472dcbf9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] pptx import:supporting FilterData properties:PageRange and I...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2665 -- To view, visit https://gerrit.libreoffice.org/2665 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9da8455bb10e93f1ae6c4894d4f15ff7fbcdfa07 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sven Jacobi sven-jac...@gmx.de Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#47011 added autosave help description
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2668 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2668 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a0233ef834f55c4cd701f1d7292ada184abff2e Gerrit-PatchSet: 3 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] rhbz#915743: Avoid potentially blocking autocompletion for n...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2669 Approvals: Petr Mladek: Verified; Looks good to me, approved Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2669 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie82b9a70285b30fe88cf4c40992710087e86815e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove RTL_CONST* macros from codemaker - pt2
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2600 -- To view, visit https://gerrit.libreoffice.org/2600 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If55046a5a9ceb6c8c84f3fa190f26cc9e1dde352 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] It is safer to uncomment these checks in the postithelper
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2567 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2567 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84d96224dbe51ff25fcb6d96e0be9a8dff89b0a1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] CMIS: URL-decode username or it won't be shown properly in d...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2147 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/2147/1 CMIS: URL-decode username or it won't be shown properly in dialog Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 --- M ucb/source/ucp/cmis/cmis_url.cxx 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index eb779d8..40d7a25 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -52,12 +52,12 @@ m_sBindingUrl = aHostUrl.GetURLNoMark( ); m_sRepositoryId = aHostUrl.GetMark( ); -m_sUser = aUrl.GetUser( ); -m_sPass = aUrl.GetPass( ); +m_sUser = aUrl.GetUser( INetURLObject::DECODE_WITH_CHARSET ); +m_sPass = aUrl.GetPass( INetURLObject::DECODE_WITH_CHARSET ); // Store the path to the object m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); -m_sId = aUrl.GetMark( ); +m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET ); if ( !m_sId.isEmpty( ) ) m_sPath = rtl::OUString( ); -- To view, visit https://gerrit.libreoffice.org/2147 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] CMIS: made it work with Lotus Live
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2148
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/2148/1
CMIS: made it work with Lotus Live
Making libcmis and LibreOffice work with Lotus Live service needed a few
hacks to either better implement CMIS or workaround some bad
implementations.
As a general improvement, the CheckOut InfoBar isn't shown if the
document can't be checked out.
Change-Id: I7bb4211db0506998cef40ac1fb6375e647234085
---
M libcmis/UnpackedTarball_cmis.mk
A libcmis/libcmis-0.3.0-lotus-live-fix.patch
M sfx2/source/view/sfxbasecontroller.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/cmis/cmis_content.hxx
M ucb/source/ucp/cmis/cmis_url.cxx
6 files changed, 259 insertions(+), 35 deletions(-)
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
index a25c316..0a9f9f8 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -18,6 +18,7 @@
libcmis/libcmis-0.3.0-win.patch \
libcmis/libcmis-0.3.0.patch \
libcmis/libcmis-0.3.0-proxy.patch \
+ libcmis/libcmis-0.3.0-lotus-live-fix.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libcmis/libcmis-0.3.0-lotus-live-fix.patch
b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
new file mode 100644
index 000..2aca934
--- /dev/null
+++ b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
@@ -0,0 +1,122 @@
+diff --git src/libcmis/atom-folder.cxx src/libcmis/atom-folder.cxx
+index 68fb124..2756a5d 100644
+--- src/libcmis/atom-folder.cxx
src/libcmis/atom-folder.cxx
+@@ -57,8 +57,11 @@ vector libcmis::ObjectPtr AtomFolder::getChildren( )
throw ( libcmis::Excepti
+ {
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
++// Some servers aren't giving the GetChildren properly... if not defined,
we need to try
++// as we may have the right to proceed.
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren ) ) )
++( !getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren )
++ getAllowableActions()-isDefined(
libcmis::ObjectAction::GetChildren ) ) ) )
+ throw libcmis::Exception( string( GetChildren not allowed on node
) + getId() );
+
+ vector libcmis::ObjectPtr children;
+@@ -182,7 +185,8 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument ) ) )
++!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument )
++getAllowableActions()-isDefined(
libcmis::ObjectAction::CreateDocument ) ) )
+ throw libcmis::Exception( string( CreateDocument not allowed on
folder ) + getId() );
+
+ xmlBufferPtr buf = xmlBufferCreate( );
+@@ -210,9 +214,37 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ }
+
+ string respBuf = response-getStream( )-str( );
+-xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, 0 );
++xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
+ if ( NULL == doc )
+-throw libcmis::Exception( Failed to parse object infos );
++{
++// We may not have the created document entry in the response body:
this is
++// the behaviour of some servers, but the standard says we need to
look for
++// the Location header.
++map string, string headers = response-getHeaders( );
++map string, string ::iterator it = headers.find( Location );
++
++// Some servers like Lotus Live aren't sending Location header, but
Content-Location
++if ( it == headers.end( ) )
++it = headers.find( Content-Location );
++
++if ( it != headers.end() )
++{
++try
++{
++response = getSession( )-httpGetRequest( it-second );
++respBuf = response-getStream( )-str( );
++doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
++}
++catch ( const CurlException e )
++{
++throw e.getCmisException( );
++}
++}
++
++// if doc is still NULL after that, then throw an exception
++if ( NULL == doc )
++throw libcmis::Exception( Missing expected response from server
);
++}
+
+ libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc( doc
);
+ xmlFreeDoc( doc );
+diff --git src/libcmis/atom-object.cxx
[PATCH libreoffice-4-0] Fixed SfxDocTplService_Impl::setTitleForURL to keep all stre...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2107
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/2107/1
Fixed SfxDocTplService_Impl::setTitleForURL to keep all streams.
After commit 117fdb98, the setTitleForURL only wrote the meta.xml file
to the odf container, dropping all the other streams. Use storeToStorage
as in the old implementation to fix the problem.
Even though marginal, this problem is important for templates renaming.
Change-Id: Ia9b6abfc112f102e2bd2ae9d3080c4ed827200df
---
M sfx2/source/doc/doctemplates.cxx
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 1313fee..9720fab 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -32,6 +32,7 @@
#include comphelper/componentcontext.hxx
#include comphelper/processfactory.hxx
#include comphelper/sequenceashashmap.hxx
+#include comphelper/storagehelper.hxx
#include comphelper/string.hxx
#include com/sun/star/beans/PropertyAttribute.hpp
#include com/sun/star/beans/XPropertySet.hpp
@@ -646,8 +647,18 @@
try
{
m_xDocProps-loadFromMedium(rURL, SequencePropertyValue());
-m_xDocProps-setTitle(aTitle );
-m_xDocProps-storeToMedium(rURL, SequencePropertyValue());
+m_xDocProps-setTitle(aTitle);
+
+uno::Reference embed::XStorage xStorage =
::comphelper::OStorageHelper::GetStorageFromURL(
+rURL, embed::ElementModes::READWRITE);
+
+uno::Sequencebeans::PropertyValue medium(2);
+medium[0].Name = ::rtl::OUString(DocumentBaseURL);
+medium[0].Value = rURL;
+medium[1].Name = ::rtl::OUString(URL);
+medium[1].Value = rURL;
+
+m_xDocProps-storeToStorage(xStorage, medium);
return true;
}
catch ( Exception )
--
To view, visit https://gerrit.libreoffice.org/2107
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b6abfc112f102e2bd2ae9d3080c4ed827200df
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Templates Manager: UI for renaming templates and folders, fd...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2108
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/2108/1
Templates Manager: UI for renaming templates and folders, fdo#60579
After thinking this was a feature regression, I finally discovered that
the old template manager couldn't rename templates. This commit is
bringing back some previously unused code dropped in an ealier commit.
Even though this is a UI change, no new string is added by this commit.
Conflicts:
sfx2/inc/sfx2/templateview.hxx
sfx2/source/control/templatelocalview.cxx
sfx2/source/control/templateview.cxx
Change-Id: I2e4a89c2e68f7e04b0fca3fc161920505ac715b4
---
M sfx2/inc/sfx2/doctempl.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/templateview.hxx
M sfx2/inc/sfx2/templateviewitem.hxx
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/inc/sfx2/thumbnailviewitem.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateview.cxx
M sfx2/source/control/templateviewitem.cxx
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/control/thumbnailviewitem.cxx
M sfx2/source/doc/doctempl.cxx
12 files changed, 257 insertions(+), 5 deletions(-)
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 507117c..b9ca56d 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -96,6 +96,21 @@
sal_BoolInsertDir(const String rText, sal_uInt16 nRegion);
sal_BoolSetName(const String rName, sal_uInt16 nRegion,
sal_uInt16 nIdx);
+/** Change the name of an entry or a directory
+
+\param rName
+The new name to set
+\param nRegion
+The id of the region to rename or containing the template to rename
+\param nIdx
+The id of the template to rename or USHRT_MAX to rename the region.
+
+\return
+sal_True if the action could be performed, sal_False otherwise
+
+*/
+sal_BoolSetName(const rtl::OUString rName, sal_uInt16
nRegion, sal_uInt16 nIdx);
+
sal_BoolCopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const
String rName) const;
sal_BoolCopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String
rName);
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index e11c42b..dbf00ef 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -71,6 +71,8 @@
bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString
rName) const;
+virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+
private:
virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index 6e81ea4..07b8487 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -39,6 +39,8 @@
void setDblClickHdl (const Link rLink) { maDblClickHdl = rLink; }
void setCloseHdl (const Link rLink) { maAllButton.SetClickHdl(rLink); }
+void setMasterView(TemplateAbstractView* pMasterView) { mpMasterView =
pMasterView; }
+virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
protected:
@@ -47,6 +49,7 @@
virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
private:
+TemplateAbstractView* mpMasterView;
ControlmaButtons;
PushButton maAllButton;
diff --git a/sfx2/inc/sfx2/templateviewitem.hxx
b/sfx2/inc/sfx2/templateviewitem.hxx
index b19a060..0a3cb3e 100644
--- a/sfx2/inc/sfx2/templateviewitem.hxx
+++ b/sfx2/inc/sfx2/templateviewitem.hxx
@@ -42,6 +42,10 @@
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
+
+sal_uInt16mnRegionId;
+sal_uInt16mnDocId;
+
private:
rtl::OUString maPath;
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 9548bd1..a33e762 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -238,6 +238,8 @@
virtual void Resize();
+virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+
protected:
virtual void MouseButtonDown( const MouseEvent rMEvt );
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index 18b7eae..2acc8de 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -25,6 +25,7 @@
#include drawinglayer/primitive2d/baseprimitive2d.hxx
#include osl/mutex.hxx
#include vcl/bitmapex.hxx
+#include vcl/vclmedit.hxx
#include sfx2/dllapi.h
#include com/sun/star/accessibility/XAccessible.hpp
@@ -88,12 +89,17 @@
void setHighlight (bool state);
+void setEditTitle (bool edit, bool bChangeFocus = true);
+void updateTitleEditSize ();
+virtual void setTitle
[PATCH libreoffice-4-0] Templates Manager: if the title can't be edited, don't updat...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2109
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/2109/1
Templates Manager: if the title can't be edited, don't update it in UI
Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
---
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/templateview.hxx
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateview.cxx
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/control/thumbnailviewitem.cxx
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index dbf00ef..78cf547 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -71,7 +71,7 @@
bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString
rName) const;
-virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
private:
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index 07b8487..3e2a7c8 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -40,7 +40,7 @@
void setCloseHdl (const Link rLink) { maAllButton.SetClickHdl(rLink); }
void setMasterView(TemplateAbstractView* pMasterView) { mpMasterView =
pMasterView; }
-virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
protected:
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index a33e762..8eb9426 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -238,7 +238,7 @@
virtual void Resize();
-virtual void renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
+virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle);
protected:
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 2bbf0d0..ca8856e 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -605,7 +605,7 @@
showOverlay(true);
}
-void TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString
sNewTitle)
+bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString
sNewTitle)
{
sal_uInt16 nRegionId = 0;
sal_uInt16 nDocId = USHRT_MAX;
@@ -620,7 +620,7 @@
{
nRegionId = pContainerItem-mnId - 1;
}
-mpDocTemplates-SetName( sNewTitle, nRegionId, nDocId );
+return mpDocTemplates-SetName( sNewTitle, nRegionId, nDocId );
}
static void lcl_updateThumbnails (TemplateContainerItem *pItem)
diff --git a/sfx2/source/control/templateview.cxx
b/sfx2/source/control/templateview.cxx
index 90e86ec..615465d 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -105,10 +105,11 @@
maDblClickHdl.Call(pItem);
}
-void TemplateView::renameItem(ThumbnailViewItem* pItem, rtl::OUString
sNewTitle)
+bool TemplateView::renameItem(ThumbnailViewItem* pItem, rtl::OUString
sNewTitle)
{
if (mpMasterView)
-mpMasterView-renameItem(pItem, sNewTitle);
+return mpMasterView-renameItem(pItem, sNewTitle);
+return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 9a29381..c996f0f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -980,9 +980,10 @@
Invalidate();
}
-void ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString)
+bool ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString)
{
// Do nothing by default
+return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailviewitem.cxx
b/sfx2/source/control/thumbnailviewitem.cxx
index c228bab..2a83bc1 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -187,8 +187,8 @@
void ThumbnailViewItem::setTitle (const rtl::OUString rTitle)
{
-mrParent.renameItem(this, rTitle);
-maTitle = rTitle;
+if (mrParent.renameItem(this, rTitle))
+maTitle = rTitle;
}
uno::Reference accessibility::XAccessible ThumbnailViewItem::GetAccessible(
bool bIsTransientChildrenDisabled )
--
To view, visit https://gerrit.libreoffice.org/2109
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
[PATCH libreoffice-4-0] CMIS: proxy was setin to :-1 is no proxy is defined in the...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2120 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/2120/1 CMIS: proxy was setin to :-1 is no proxy is defined in the UI Don't output the port number if that one is not valid. (cherry picked from commit 12ea70362f9b1234b4b1613872c8f07735dd386b) Change-Id: Ia533d189117227a25c2df2e639b7fbd854e1bc45 --- M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/cmis/cmis_repo_content.cxx 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index a8b1c86..5f94d7a 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -262,7 +262,9 @@ INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) ); const ucbhelper::InternetProxyServer rProxy = aProxyDecider.getProxy( INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); -rtl::OUString sProxy = rProxy.aName + : + rtl::OUString::valueOf( rProxy.nPort ); +rtl::OUString sProxy = rProxy.aName; +if ( rProxy.nPort 0 ) +sProxy += : + rtl::OUString::valueOf( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); // Look for a cached session, key is binding url + repo id diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index afd503c..b76514c 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -144,7 +144,9 @@ INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) ); const ucbhelper::InternetProxyServer rProxy = aProxyDecider.getProxy( INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); -rtl::OUString sProxy = rProxy.aName + : + rtl::OUString::valueOf( rProxy.nPort ); +rtl::OUString sProxy = rProxy.aName; +if ( rProxy.nPort 0 ) +sProxy += : + rtl::OUString::valueOf( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); if ( m_aRepositories.empty() ) -- To view, visit https://gerrit.libreoffice.org/2120 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia533d189117227a25c2df2e639b7fbd854e1bc45 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Template Manager: show some icons if there is no thumbnail
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1948
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1948/1
Template Manager: show some icons if there is no thumbnail
Change-Id: I2686d6f1d29862878b5ee0f6ca0d2e746766ef21
---
M sfx2/inc/sfx2/sfx.hrc
M sfx2/inc/templatedlg.hxx
M sfx2/source/appl/sfx.src
M sfx2/source/control/templateview.cxx
M sfx2/source/doc/templatedlg.cxx
5 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 7173366..92bcf1f 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -177,6 +177,11 @@
#define BT_CHECKOUT (RID_SFX_START+126)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
+#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
+#define SFX_THUMBNAIL_SHEET (RID_SFX_START+159)
+#define SFX_THUMBNAIL_PRESENTATION (RID_SFX_START+160)
+#define SFX_THUMBNAIL_DRAWING (RID_SFX_START+161)
+
//=
// group ids
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 44a6653..47c1989 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -49,6 +49,8 @@
DECL_LINK(ActivatePageHdl, void*);
+static BitmapEx getDefaultThumbnail( const rtl::OUString rPath );
+
private:
virtual void MouseButtonDown( const MouseEvent rMEvt );
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 1103841..bffec2b 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -37,3 +37,23 @@
{
Text [ en-US ] = Password ;
};
+
+Bitmap ( SFX_THUMBNAIL_TEXT )
+{
+File = odt_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_SHEET )
+{
+File = ods_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_PRESENTATION )
+{
+File = odp_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_DRAWING )
+{
+File = odg_48_8.png;
+};
diff --git a/sfx2/source/control/templateview.cxx
b/sfx2/source/control/templateview.cxx
index 2efbbda..9758065 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include templatedlg.hxx
#include sfx2/templateview.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
@@ -63,6 +64,11 @@
pItem-maTitle = pCur-aName;
pItem-setPath(pCur-aPath);
pItem-maPreview1 = pCur-aThumbnail;
+if ( pCur-aThumbnail.IsEmpty() )
+{
+// Use the default thumbnail if we have nothing else
+pItem-maPreview1 = SfxTemplateManagerDlg::getDefaultThumbnail(
pItem-getPath() );
+}
pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
mItemList.push_back(pItem);
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bf51e37..c14a824 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1533,6 +1533,31 @@
}
}
+BitmapEx SfxTemplateManagerDlg::getDefaultThumbnail( const OUString rPath )
+{
+INetURLObject aUrl(rPath);
+OUString aExt = aUrl.getExtension();
+
+BitmapEx aImg;
+if ( aExt == ott || aExt == stw || aExt == oth || aExt == dot ||
aExt == dotx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_TEXT ) );
+}
+else if ( aExt == ots || aExt == stc || aExt == xlt || aExt ==
xltm || aExt == xltx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_SHEET ) );
+}
+else if ( aExt == otp || aExt == sti || aExt == pot || aExt ==
potm || aExt == potx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_PRESENTATION ) );
+}
+else if ( aExt == otg || aExt == std )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_DRAWING ) );
+}
+return aImg;
+}
+
static bool lcl_getServiceName ( const OUString rFileURL, OUString rName )
{
bool bRet = false;
--
To view, visit https://gerrit.libreoffice.org/1948
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2686d6f1d29862878b5ee0f6ca0d2e746766ef21
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Template Manager: focus in search edit when clicking search ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1916 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/1916/1 Template Manager: focus in search edit when clicking search action Change-Id: I91fa8463442d842ef9929a87fb22e5e1a0a869b5 --- M sfx2/source/doc/templatedlg.cxx 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 908fca9..bf51e37 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -963,6 +963,8 @@ mpSearchEdit-Show(!bVisible); mpSearchEdit-SetText(OUString()); +if (!bVisible) +mpSearchEdit-GrabFocus(); // display all templates if we hide the search bar if (bVisible mpCurView-isOverlayVisible()) -- To view, visit https://gerrit.libreoffice.org/1916 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91fa8463442d842ef9929a87fb22e5e1a0a869b5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#59798: MSI installer spurious space in version number
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1843 Approvals: Andras Timar: Verified; Looks good to me, but someone else must approve Eike Rathke: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1843 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1844 Approvals: Andras Timar: Verified; Looks good to me, but someone else must approve Eike Rathke: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1844 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Template Manager: don't show any tab and show all folders wh...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1902
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1902/1
Template Manager: don't show any tab and show all folders when saving template
Change-Id: Ib8f8dd66374a56a5c49155cde6420c865aa308f7
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 833e556..908fca9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -226,6 +226,8 @@
void SfxTemplateManagerDlg::setSaveMode(bool bMode)
{
mbIsSaveMode = bMode;
+maTabControl.Clear();
+mpCurView-filterTemplatesByApp(FILTER_APP_NONE);
if (bMode)
{
--
To view, visit https://gerrit.libreoffice.org/1902
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8f8dd66374a56a5c49155cde6420c865aa308f7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: Template Manager: remote repositories only for experimental ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1847
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1847/1
Template Manager: remote repositories only for experimental mode
Change-Id: I79501bdcd25f362065d9b95efd1a43f6be84577e
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f1e69f5..833e556 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -30,6 +30,7 @@
#include sfx2/thumbnailviewitem.hxx
#include sot/storage.hxx
#include svtools/imagemgr.hxx
+#include svtools/miscopt.hxx
#include svtools/PlaceEditDialog.hxx
#include tools/urlobj.hxx
#include unotools/moduleoptions.hxx
@@ -177,6 +178,13 @@
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
+SvtMiscOptions aMiscOptions;
+if ( !aMiscOptions.IsExperimentalMode() )
+{
+sal_uInt16 nPos = mpViewBar-GetItemId(TBI_TEMPLATE_REPOSITORY);
+mpViewBar-RemoveItem(nPos);
+}
+
mpViewBar-Show();
mpActionBar-Show();
--
To view, visit https://gerrit.libreoffice.org/1847
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79501bdcd25f362065d9b95efd1a43f6be84577e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: fdo#59779: Set the first page attributes on pooled styles cr...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1864 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/1864/1 fdo#59779: Set the first page attributes on pooled styles creation Change-Id: If599bc9d9b9a22c5500a0e39bcec76a6162bec3f --- M sw/source/core/doc/poolfmt.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 2820663..f33eee8 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1597,6 +1597,7 @@ if( bSetLeft ) pNewPgDsc-GetLeft().SetFmtAttr( aSet ); pNewPgDsc-GetMaster().SetFmtAttr( aSet ); +pNewPgDsc-GetFirst().SetFmtAttr( aSet ); } } return pNewPgDsc; -- To view, visit https://gerrit.libreoffice.org/1864 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If599bc9d9b9a22c5500a0e39bcec76a6162bec3f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#58204: PPT export: fix text rotation in shapes:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1862 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1862 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0-0]: Resolves: fdo#59586 Missing comma in particular PDF file
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1845 Approvals: Caolán McNamara: Verified; Looks good to me, but someone else must approve Joren De Cuyper: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1845 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Resolves fdo#46718 : UI: Delete multiple styles at once
Bosdonnat Cedric has abandoned this change. Change subject: Resolves fdo#46718 : UI: Delete multiple styles at once .. Patch Set 1: Abandoned Someone fixed in right before (and better patch quality) -- To view, visit https://gerrit.libreoffice.org/1730 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I88d0113d4d311f98de8e20a5f8c8ebc0e2025b6f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rushi Shukla rushbo...@gmail.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: curl: patched to read IE proxy settings on Windows
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1792
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/1792/1
curl: patched to read IE proxy settings on Windows
Change-Id: I46605f6c8dfacab0feb5a446db458eed8e5756ee
---
M curl/UnpackedTarball_curl.mk
A curl/curl-7.26.0_win-proxy.patch
2 files changed, 125 insertions(+), 0 deletions(-)
diff --git a/curl/UnpackedTarball_curl.mk b/curl/UnpackedTarball_curl.mk
index 4ff19f7..e6a8cac 100644
--- a/curl/UnpackedTarball_curl.mk
+++ b/curl/UnpackedTarball_curl.mk
@@ -23,6 +23,7 @@
curl/curl-aix.patch \
curl/curl-7.26.0_win.patch \
curl/curl-7.26.0_mingw.patch \
+ curl/curl-7.26.0_win-proxy.patch \
))
ifeq ($(OS),ANDROID)
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
new file mode 100644
index 000..766ef16
--- /dev/null
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -0,0 +1,124 @@
+--- curl-7.26.0/lib/Makefile.vc9
misc/build/curl-7.26.0/lib/Makefile.vc9
+@@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE)
+ SSLLIBS= libeay32.lib ssleay32.lib
+ ZLIBLIBSDLL= zdll.lib
+ ZLIBLIBS = zlib.lib
+-WINLIBS= ws2_32.lib wldap32.lib
++WINLIBS= ws2_32.lib wldap32.lib winhttp.lib
+ CFLAGS = $(CFLAGS) $(EXCFLAGS)
+
+ CFGSET = FALSE
+--- curl-7.26.0/lib/url.c
misc/build/curl-7.26.0/lib/url.c
+@@ -80,6 +80,10 @@ void idn_free (void *ptr);
+ int curl_win32_idn_to_ascii(const char *in, char **out);
+ #endif /* USE_LIBIDN */
+
++#ifdef WIN32
++#include WinHttp.h
++#endif
++
+ #include urldata.h
+ #include netrc.h
+
+@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char*
no_proxy)
+ return FALSE;
+ }
+
++#ifdef WIN32
++static char* wstrToCstr( LPWSTR wStr )
++{
++ int bufSize;
++ char* out = NULL;
++ if ( wStr != NULL )
++ {
++ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0,
NULL, NULL );
++ out = ( char* )malloc( bufSize * sizeof(char));
++ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL,
NULL );
++ }
++ return out;
++}
++#endif
++
+ /
+ * Detect what (if any) proxy to use. Remember that this selects a host
+ * name and is not limited to HTTP proxies only.
+@@ -4119,6 +4138,7 @@ static bool check_noproxy(const char* name, const char*
no_proxy)
+ static char *detect_proxy(struct connectdata *conn)
+ {
+ char *proxy = NULL;
++ char *no_proxy=NULL;
+
+ #ifndef CURL_DISABLE_HTTP
+ /* If proxy was not specified, we check for default proxy environment
+@@ -4138,7 +4158,57 @@ static char *detect_proxy(struct connectdata *conn)
+* For compatibility, the all-uppercase versions of these variables are
+* checked if the lowercase versions don't exist.
+*/
+- char *no_proxy=NULL;
++#ifdef WIN32
++ WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig;
++ ieProxyConfig =
(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*)malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG));
++ if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) {
++if(!ieProxyConfig-fAutoDetect) {
++ char *ieProxy;
++ char *ieNoProxy;
++char* pos;
++
++ ieProxy = wstrToCstr(ieProxyConfig-lpszProxy);
++ ieNoProxy = wstrToCstr(ieProxyConfig-lpszProxyBypass);
++
++ /* Convert the ieNoProxy into a proper no_proxy value */
++ no_proxy = strdup(ieNoProxy);
++ pos = strpbrk(no_proxy, ; );
++ while (NULL != pos) {
++no_proxy[pos-no_proxy] = ',';
++pos = strpbrk(no_proxy, ; );
++ }
++
++ if(!check_noproxy(conn-host.name, no_proxy)) {
++/* Look for the http proxy setting */
++char* tok;
++
++tok = strtok(ieProxy, ;);
++if(strchr(tok, '=') == NULL) {
++ proxy = strdup(ieProxy);
++}
++else {
++ do {
++if(strncmp(tok, http=, 5) == 0) {
++ /* We found HTTP proxy value, then use it */
++ proxy = strdup( tok + 5 );
++}
++ }
++ while(NULL != strtok(NULL, ;));
++}
++ }
++
++ free(ieProxy);
++ free(ieNoProxy);
++}
++else {
++ /* TODO Handle the Proxy config Auto Detection case */
++}
++
++GlobalFree( ieProxyConfig-lpszAutoConfigUrl );
++ GlobalFree( ieProxyConfig-lpszProxy );
++ GlobalFree( ieProxyConfig-lpszProxyBypass );
++ }
++#else /* !WIN32 */
+ char proxy_env[128];
+
+ no_proxy=curl_getenv(no_proxy);
+@@ -4189,9 +4259,9 @@ static char *detect_proxy(struct connectdata *conn)
+ }
+ } /* if(!check_noproxy(conn-host.name, no_proxy)) - it wasn't specified
+non-proxy */
++#endif /* WIN32 */
+ if(no_proxy)
+ free(no_proxy);
+-
+ #else /* !CURL_DISABLE_HTTP */
+
+
[PATCH] Change in core[libreoffice-4-0]: Tabs to spaces
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1799
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/1799/1
Tabs to spaces
Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f
---
M curl/curl-7.26.0_win-proxy.patch
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index 766ef16..cf6a277 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -29,15 +29,15 @@
+#ifdef WIN32
+static char* wstrToCstr( LPWSTR wStr )
+{
-+ int bufSize;
-+ char* out = NULL;
-+ if ( wStr != NULL )
-+ {
-+ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0,
NULL, NULL );
-+ out = ( char* )malloc( bufSize * sizeof(char));
-+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL,
NULL );
-+ }
-+ return out;
++int bufSize;
++char* out = NULL;
++if ( wStr != NULL )
++{
++bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL,
NULL );
++out = ( char* )malloc( bufSize * sizeof(char));
++WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
++}
++return out;
+}
+#endif
+
@@ -64,12 +64,12 @@
+if(!ieProxyConfig-fAutoDetect) {
+ char *ieProxy;
+ char *ieNoProxy;
-+char* pos;
++ char* pos;
+
+ ieProxy = wstrToCstr(ieProxyConfig-lpszProxy);
+ ieNoProxy = wstrToCstr(ieProxyConfig-lpszProxyBypass);
+
-+ /* Convert the ieNoProxy into a proper no_proxy value */
++ /* Convert the ieNoProxy into a proper no_proxy value */
+ no_proxy = strdup(ieNoProxy);
+ pos = strpbrk(no_proxy, ; );
+ while (NULL != pos) {
@@ -102,10 +102,10 @@
+else {
+ /* TODO Handle the Proxy config Auto Detection case */
+}
-+
++
+GlobalFree( ieProxyConfig-lpszAutoConfigUrl );
-+ GlobalFree( ieProxyConfig-lpszProxy );
-+ GlobalFree( ieProxyConfig-lpszProxyBypass );
++GlobalFree( ieProxyConfig-lpszProxy );
++GlobalFree( ieProxyConfig-lpszProxyBypass );
+ }
+#else /* !WIN32 */
char proxy_env[128];
--
To view, visit https://gerrit.libreoffice.org/1799
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: More massaging to avoid odd layout-related warnings/errors f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1800
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/1800/1
More massaging to avoid odd layout-related warnings/errors from GCC
(...whatever it is that causes them to be raised at least in my build).
Change-Id: I52889de876e448ae8e90ec328e65cda2025968e2
---
M curl/curl-7.26.0_win-proxy.patch
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index cf6a277..78cee02 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -22,7 +22,7 @@
#include urldata.h
#include netrc.h
-@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char*
no_proxy)
+@@ -4111,6 +4115,22 @@ static bool check_noproxy(const char* name, const char*
no_proxy)
return FALSE;
}
@@ -31,9 +31,10 @@
+{
+int bufSize;
+char* out = NULL;
-+if ( wStr != NULL )
++if( wStr != NULL )
+{
-+bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL,
NULL );
++bufSize = WideCharToMultiByte(
++CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL );
+out = ( char* )malloc( bufSize * sizeof(char));
+WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
+}
@@ -52,14 +53,15 @@
#ifndef CURL_DISABLE_HTTP
/* If proxy was not specified, we check for default proxy environment
-@@ -4138,7 +4158,57 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4138,7 +4158,58 @@ static char *detect_proxy(struct connectdata *conn)
* For compatibility, the all-uppercase versions of these variables are
* checked if the lowercase versions don't exist.
*/
- char *no_proxy=NULL;
+#ifdef WIN32
+ WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig;
-+ ieProxyConfig =
(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*)malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG));
++ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*)
++malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG));
+ if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) {
+if(!ieProxyConfig-fAutoDetect) {
+ char *ieProxy;
@@ -72,7 +74,7 @@
+ /* Convert the ieNoProxy into a proper no_proxy value */
+ no_proxy = strdup(ieNoProxy);
+ pos = strpbrk(no_proxy, ; );
-+ while (NULL != pos) {
++ while(NULL != pos) {
+no_proxy[pos-no_proxy] = ',';
+pos = strpbrk(no_proxy, ; );
+ }
--
To view, visit https://gerrit.libreoffice.org/1800
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52889de876e448ae8e90ec328e65cda2025968e2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: ...and some more curl code layout massaging
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1801
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1801/1
...and some more curl code layout massaging
Change-Id: Ifbd7dcc3fa8d18192d2ac2fc5faca1b0637c93c2
---
M curl/curl-7.26.0_win-proxy.patch
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index 78cee02..61badc7 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -22,23 +22,22 @@
#include urldata.h
#include netrc.h
-@@ -4111,6 +4115,22 @@ static bool check_noproxy(const char* name, const char*
no_proxy)
+@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char*
no_proxy)
return FALSE;
}
+#ifdef WIN32
+static char* wstrToCstr( LPWSTR wStr )
+{
-+int bufSize;
-+char* out = NULL;
-+if( wStr != NULL )
-+{
-+bufSize = WideCharToMultiByte(
-+CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL );
-+out = ( char* )malloc( bufSize * sizeof(char));
-+WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
-+}
-+return out;
++ int bufSize;
++ char* out = NULL;
++ if(wStr != NULL) {
++bufSize = WideCharToMultiByte(
++ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL );
++out = ( char* )malloc( bufSize * sizeof(char));
++WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
++ }
++ return out;
+}
+#endif
+
--
To view, visit https://gerrit.libreoffice.org/1801
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbd7dcc3fa8d18192d2ac2fc5faca1b0637c93c2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: curl: fixed crashers in curl patch for system proxy
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1802
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1802/1
curl: fixed crashers in curl patch for system proxy
Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f2
---
M curl/curl-7.26.0_win-proxy.patch
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index 61badc7..810438f 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -52,7 +52,7 @@
#ifndef CURL_DISABLE_HTTP
/* If proxy was not specified, we check for default proxy environment
-@@ -4138,7 +4158,58 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4138,7 +4158,62 @@ static char *detect_proxy(struct connectdata *conn)
* For compatibility, the all-uppercase versions of these variables are
* checked if the lowercase versions don't exist.
*/
@@ -71,29 +71,33 @@
+ ieNoProxy = wstrToCstr(ieProxyConfig-lpszProxyBypass);
+
+ /* Convert the ieNoProxy into a proper no_proxy value */
-+ no_proxy = strdup(ieNoProxy);
-+ pos = strpbrk(no_proxy, ; );
-+ while(NULL != pos) {
-+no_proxy[pos-no_proxy] = ',';
++ if(NULL != no_proxy) {
++no_proxy = strdup(ieNoProxy);
+pos = strpbrk(no_proxy, ; );
++while(NULL != pos) {
++ no_proxy[pos-no_proxy] = ',';
++ pos = strpbrk(no_proxy, ; );
++}
+ }
+
+ if(!check_noproxy(conn-host.name, no_proxy)) {
+/* Look for the http proxy setting */
+char* tok;
+
-+tok = strtok(ieProxy, ;);
-+if(strchr(tok, '=') == NULL) {
-+ proxy = strdup(ieProxy);
-+}
-+else {
-+ do {
-+if(strncmp(tok, http=, 5) == 0) {
-+ /* We found HTTP proxy value, then use it */
-+ proxy = strdup( tok + 5 );
-+}
++if (NULL != ieProxy) {
++ tok = strtok(ieProxy, ;);
++ if(strchr(tok, '=') == NULL) {
++proxy = strdup(ieProxy);
+ }
-+ while(NULL != strtok(NULL, ;));
++ else {
++do {
++ if(strncmp(tok, http=, 5) == 0) {
++/* We found HTTP proxy value, then use it */
++proxy = strdup( tok + 5 );
++ }
++}
++while(NULL != strtok(NULL, ;));
++ }
+}
+ }
+
@@ -112,7 +116,7 @@
char proxy_env[128];
no_proxy=curl_getenv(no_proxy);
-@@ -4189,9 +4259,9 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4189,9 +4264,9 @@ static char *detect_proxy(struct connectdata *conn)
}
} /* if(!check_noproxy(conn-host.name, no_proxy)) - it wasn't specified
non-proxy */
--
To view, visit https://gerrit.libreoffice.org/1802
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: show names on several lines
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1715
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/1715/1
Template Manager: show names on several lines
Change-Id: I6990bb6ac52889de36f3ec2cce33e4dc2f3da2ea
---
M sfx2/inc/sfx2/thumbnailviewitem.hxx
M sfx2/source/control/templatecontaineritem.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateviewitem.cxx
M sfx2/source/control/thumbnailviewitem.cxx
5 files changed, 70 insertions(+), 76 deletions(-)
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index 9609667..18b7eae 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -22,6 +22,7 @@
#include basegfx/vector/b2dvector.hxx
#include drawinglayer/attribute/fontattribute.hxx
+#include drawinglayer/primitive2d/baseprimitive2d.hxx
#include osl/mutex.hxx
#include vcl/bitmapex.hxx
#include sfx2/dllapi.h
@@ -106,6 +107,7 @@
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
+void addTextPrimitives (const rtl::OUString rText, const
ThumbnailItemAttributes *pAttrs, Point aPos,
drawinglayer::primitive2d::Primitive2DSequence rSeq);
static drawinglayer::primitive2d::PolygonHairlinePrimitive2D*
createBorderLine (const basegfx::B2DPolygon rPolygon);
diff --git a/sfx2/source/control/templatecontaineritem.cxx
b/sfx2/source/control/templatecontaineritem.cxx
index 25fa5fe..febd87f 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -84,8 +84,6 @@
Size aThumbSize( ( maThumbnailArea.getWidth() - 3 * nThumbPadding ) / 2, (
maThumbnailArea.getHeight() - 3* nThumbPadding ) / 2 );
// Draw thumbnail
-Point aPos = maPrev1Pos;
-
for (int i=0; i4; ++i)
{
long nPosX = 0;
@@ -153,21 +151,7 @@
}
}
-// Draw centered text below thumbnail
-aPos = maTextPos;
-
-// Create the text primitive
-basegfx::B2DHomMatrix aTextMatrix( createScaleTranslateB2DHomMatrix(
-pAttrs-aFontSize.getX(), pAttrs-aFontSize.getY(),
-double( aPos.X() ), double( aPos.Y() ) ) );
-
-aSeq[nCount++] = Primitive2DReference(
-new TextSimplePortionPrimitive2D(aTextMatrix,
- maTitle,0,maTitle.getLength(),
- std::vector double ( ),
- pAttrs-aFontAttr,
-
com::sun::star::lang::Locale(),
- Color(COL_BLACK).getBColor()
) );
+addTextPrimitives(maTitle, pAttrs, maTextPos, aSeq);
pProcessor-process(aSeq);
}
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 7956101..76516d7 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -51,12 +51,6 @@
{
OUString aRegionName(mpDocTemplates-GetFullRegionName(i));
-if ((sal_uInt32)aRegionName.getLength() mpItemAttrs-nMaxTextLenght)
-{
-aRegionName = aRegionName.copy(0,mpItemAttrs-nMaxTextLenght-3);
-aRegionName += ...;
-}
-
TemplateContainerItem* pItem = new TemplateContainerItem( *this );
pItem-mnId = i+1;
pItem-maTitle = aRegionName;
@@ -68,12 +62,6 @@
{
OUString aName = mpDocTemplates-GetName(i,j);
OUString aURL = mpDocTemplates-GetPath(i,j);
-
-if ((sal_uInt32)aName.getLength() mpItemAttrs-nMaxTextLenght)
-{
-aName = aName.copy(0,mpItemAttrs-nMaxTextLenght-3);
-aName += ...;
-}
TemplateItemProperties aProperties;;
aProperties.nId = j+1;
@@ -181,12 +169,6 @@
return false;
OUString aRegionName = rName;
-
-if ((sal_uInt32)aRegionName.getLength() mpItemAttrs-nMaxTextLenght)
-{
-aRegionName = aRegionName.copy(0,mpItemAttrs-nMaxTextLenght-3);
-aRegionName += ...;
-}
TemplateContainerItem* pItem = new TemplateContainerItem( *this );
pItem-mnId = nRegionId+1;
diff --git a/sfx2/source/control/templateviewitem.cxx
b/sfx2/source/control/templateviewitem.cxx
index 51a2862..9f06ebb 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -108,34 +108,11 @@
// draw thumbnail borders
aSeq[3] = Primitive2DReference(createBorderLine(aBounds));
-// Draw centered text below thumbnail
-
-// Create the text primitive
-basegfx::B2DHomMatrix aTitleMatrix( createScaleTranslateB2DHomMatrix(
-pAttrs-aFontSize.getX(), pAttrs-aFontSize.getY(),
-
[PATCH] Change in core[libreoffice-4-0]: Template Manager: delete popup menus in the proper order
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1689 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/1689/1 Template Manager: delete popup menus in the proper order Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9 --- M sfx2/source/doc/templatedlg.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 388f0cb..f1e69f5 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -209,9 +209,9 @@ delete mpSearchView; delete maView; delete mpOnlineView; +delete mpTemplateDefaultMenu; delete mpActionMenu; delete mpRepositoryMenu; -delete mpTemplateDefaultMenu; delete mpToolbars; } -- To view, visit https://gerrit.libreoffice.org/1689 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: removed All category
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1674
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/1674/1
Template Manager: removed All category
Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca
---
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/doc/templatedlg.hrc
M sfx2/source/doc/templatedlg.src
3 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bff2dc1..7bd3741 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -253,9 +253,6 @@
case FILTER_DRAWS:
eFilter = FILTER_APP_DRAW;
break;
-default:
-case FILTER_ALL:
-;
}
mpCurView-filterTemplatesByApp(eFilter);
return 0;
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index 02c6702..672575c 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -7,7 +7,6 @@
*/
#define TAB_CONTROL 1
-#define FILTER_ALL 2
#define FILTER_DOCS 3
#define FILTER_PRESENTATIONS4
#define FILTER_SHEETS 5
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 2480862..a351431 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -121,11 +121,6 @@
{
PageItem
{
-Identifier = FILTER_ALL;
-Text [ en-US ] = All;
-};
-PageItem
-{
Identifier = FILTER_DOCS;
Text [ en-US ] = Documents;
};
--
To view, visit https://gerrit.libreoffice.org/1674
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: filter the results when opening the dialog
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1675
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/1675/1
Template Manager: filter the results when opening the dialog
Conflicts:
sfx2/source/control/templateabstractview.cxx
Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6
---
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/doc/templatedlg.cxx
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index f8f20f5..182d833 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -102,7 +102,7 @@
: ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
mpItemView(new TemplateView(this)),
mbFilteredResults(false),
- meFilterOption(FILTER_APP_NONE)
+ meFilterOption(FILTER_APP_WRITER)
{
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
}
@@ -111,7 +111,7 @@
: ThumbnailView(pParent,rResId,bDisableTransientChildren),
mpItemView(new TemplateView(this)),
mbFilteredResults(false),
- meFilterOption(FILTER_APP_NONE)
+ meFilterOption(FILTER_APP_WRITER)
{
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
}
@@ -174,6 +174,23 @@
}
}
+void TemplateAbstractView::showOverlay (bool bVisible)
+{
+mpItemView-Show(bVisible);
+
+// Clear items is the overlay is closed.
+if (!bVisible)
+{
+// Check if the folder view needs to be filtered
+if (mbFilteredResults)
+{
+filterItems(ViewFilter_Application(meFilterOption));
+}
+
+mpItemView-Clear();
+}
+}
+
void TemplateAbstractView::filterTemplatesByKeyword(const OUString rKeyword)
{
if (mpItemView-IsVisible())
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7bd3741..388f0cb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -190,6 +190,8 @@
maView-Populate();
maView-Show();
+mpCurView-filterTemplatesByApp(FILTER_APP_WRITER);
+
FreeResource();
}
--
To view, visit https://gerrit.libreoffice.org/1675
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: show folders with 4 previews inside a roun...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1678
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/1678/1
Template Manager: show folders with 4 previews inside a rounded rect
The previous display had the inconvenient to be misleading if there was
one or no template inside a folder.
Change-Id: I16faa2556ca02380bd4dac0d821ecac45b98b8c3
---
M sfx2/inc/sfx2/templatecontaineritem.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatecontaineritem.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/thumbnailviewitem.cxx
5 files changed, 131 insertions(+), 63 deletions(-)
diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx
b/sfx2/inc/sfx2/templatecontaineritem.hxx
index 2c2d18b..4768604 100644
--- a/sfx2/inc/sfx2/templatecontaineritem.hxx
+++ b/sfx2/inc/sfx2/templatecontaineritem.hxx
@@ -18,19 +18,26 @@
public:
BitmapEx maPreview2;
+BitmapEx maPreview3;
+BitmapEx maPreview4;
std::vectorTemplateItemProperties maTemplates;
TemplateContainerItem (ThumbnailView rView);
virtual ~TemplateContainerItem ();
-const Point getPrev2Pos () const { return maPrev2Pos; }
-
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
+
+virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
+
+bool HasMissingPreview( );
+
private:
-Point maPrev2Pos;
+Rectangle maThumbnailArea;
};
#endif // TEMPLATEFOLDERVIEWITEM_HXX
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index f8f20f5..4439725 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -65,8 +65,10 @@
// Clear thumbnails
pContainerItem-maPreview1.Clear();
pContainerItem-maPreview2.Clear();
+pContainerItem-maPreview3.Clear();
+pContainerItem-maPreview4.Clear();
-for (size_t i = 0, n = rTemplates.size(); i n; ++i)
+for (size_t i = 0, n = rTemplates.size(); i n
pContainerItem-HasMissingPreview(); ++i)
{
if (isValid(rTemplates[i].aPath))
{
@@ -83,6 +85,18 @@
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
}
+else if ( pContainerItem-maPreview3.IsEmpty() )
+{
+pContainerItem-maPreview3 =
TemplateAbstractView::scaleImg(rTemplates[i].aThumbnail,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
+}
+else if ( pContainerItem-maPreview4.IsEmpty() )
+{
+pContainerItem-maPreview4 =
TemplateAbstractView::scaleImg(rTemplates[i].aThumbnail,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
+}
}
}
diff --git a/sfx2/source/control/templatecontaineritem.cxx
b/sfx2/source/control/templatecontaineritem.cxx
index d63ce8a..25fa5fe 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -8,6 +8,7 @@
*/
#include sfx2/templatecontaineritem.hxx
+#include sfx2/templateabstractview.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -35,16 +36,31 @@
{
}
+void TemplateContainerItem::calculateItemsPosition (const long
nThumbnailHeight, const long nDisplayHeight,
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes *pAttrs)
+{
+ThumbnailViewItem::calculateItemsPosition( nThumbnailHeight,
nDisplayHeight, nPadding, nMaxTextLenght, pAttrs);
+Point aPos (maDrawArea.getX() + nPadding, maDrawArea.getY() + nPadding);
+maThumbnailArea = Rectangle(aPos, Size(maDrawArea.GetWidth() - 2 *
nPadding, nThumbnailHeight));
+}
+
void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D
*pProcessor,
const ThumbnailItemAttributes *pAttrs)
{
int nCount = 0;
-int nSeqSize = 2;
+int nSeqSize = 3;
if (!maPreview1.IsEmpty())
nSeqSize += 3;
if
[PATCH] Change in core[libreoffice-4-0]: Template Manager: don't deselect item after setting default ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1611
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1611/1
Template Manager: don't deselect item after setting default template
Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 282372d..bff2dc1 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1069,19 +1069,17 @@
void SfxTemplateManagerDlg::OnTemplateAsDefault ()
{
-assert(!maSelTemplates.empty());
-
-const TemplateViewItem *pItem = static_castconst
TemplateViewItem*(*(maSelTemplates.begin()));
-
-OUString aServiceName;
-if (lcl_getServiceName(pItem-getPath(),aServiceName))
+if (!maSelTemplates.empty())
{
-SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
+const TemplateViewItem *pItem = static_castconst
TemplateViewItem*(*(maSelTemplates.begin()));
-createDefaultTemplateMenu();
+OUString aServiceName;
+if (lcl_getServiceName(pItem-getPath(),aServiceName))
+{
+
SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
-// clear selection and display view/action toolbars
-maView-deselectOverlayItem(pItem-mnId);
+createDefaultTemplateMenu();
+}
}
}
--
To view, visit https://gerrit.libreoffice.org/1611
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: double click on the whole item instead of ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1610 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1610/1 Template Manager: double click on the whole item instead of only thumbnail Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1 --- M sfx2/source/control/thumbnailview.cxx 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index c3957f0..62324a7 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -517,7 +517,6 @@ maItemStateHdl.Call(pItem); Rectangle aRect(pItem-getDrawArea()); -aRect.SetSize(Size(mnItemWidth,mnThumbnailHeight)); if (aRect.IsInside(rMEvt.GetPosPixel())) OnItemDblClicked(pItem); -- To view, visit https://gerrit.libreoffice.org/1610 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Modify the default Style list in Writer, give them a custom ...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1248 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1248 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I780eaecc29c88493f09194399dfc00be1484c549 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#34897 numbers were wrong, code unnecessary
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1165 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1165 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b1cac78e549c2126d7e45298629e28fc76ac95d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Lennard Wasserthal wassert...@nefkom.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#48317 - Support jumping to next/previous change
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1156 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1156 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03d583bef4225409f69934f16db1854564c2db5f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Muhammad Haggag mhag...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
