[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit f232b831d439bac53a662c32032c7a0abd430d5e
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 16 13:53:30 2013 +0100
m_bHasActive must be false after last visible entry is removed
...otherwise, ExtensionBox_Impl::RecalcAll would crash in
CalcActiveHeight(-1).
Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850
(cherry picked from commit 661f7bdefc8215f742951727b93395d47293cf0e)
Reviewed-on: https://gerrit.libreoffice.org/7097
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 19d2749..0d48d55 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries()
if ( nPos m_nActive )
m_nActive -= 1;
else if ( ( nPos == m_nActive ) ( nPos == (long)
m_vEntries.size() - 1 ) )
+{
m_nActive -= 1;
+if (m_nActive == -1)
+{
+m_bHasActive = false;
+}
+}
m_vRemovedEntries.push_back( *iIndex );
m_vEntries.erase( iIndex );
iIndex = m_vEntries.begin() + nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source
desktop/source/app/cmdlineargs.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1c13898b804e837e202de85244934d7057e695e2
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 19 14:03:54 2013 +0100
rhbz#1031989 Accept --pt in addition to deprecated -pt
Change-Id: I3593b3fc7e0ad405612216fb07e8632050b75cee
(cherry picked from commit 5cb10c4c99e46c97984e4e1c1bca5915f83f0a1d)
Reviewed-on: https://gerrit.libreoffice.org/6723
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index ca92a8d..f9baa07 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -186,7 +186,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier
supplier )
bStartEvent = false;
bDisplaySpec= false;
}
-else if ( aArg.equalsIgnoreAsciiCase(-pt))
+else if ( oArg.equalsIgnoreAsciiCase(pt))
{
// Print to special printer
bPrintToEvent = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source
desktop/source/app/cmdlinehelp.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 29ef37395884c72898c77185e5e00898ad98f2c7 Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 21 00:51:10 2013 -0700 fdo#51639 soffice.exe --version displays a dialog box with the version number Change-Id: I3656c005a23d291bc7cde2bc461e584df342babf Reviewed-on: https://gerrit.libreoffice.org/6362 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 41a9f30..a9ed3df 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -187,6 +187,9 @@ namespace desktop // Just re-use the help dialog for now. CmdlineHelpDialog aDlg; aDlg.m_pftHead-SetText(aVersionMsg); +aDlg.m_pftLeft-SetText(); +aDlg.m_pftRight-SetText(); +aDlg.m_pftBottom-SetText(); aDlg.Execute(); #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source
desktop/source/deployment/misc/dp_version.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b6842e227d979c24b50fe5971d183f58df4788e3
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 15 11:50:47 2013 +0100
intermittent crash with failed empty response during update check
version1 is empty and version2 is not, so on second segment of version2 the
i1
is already -1 from the first segment check - kaboom
Change-Id: Ic19511a3b150f40d3cd9cf66bf9d86c94f3f9187
(cherry picked from commit 3bb28b5aaef5e85a981dc9411db1f05524aeedf6)
Reviewed-on: https://gerrit.libreoffice.org/5436
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/desktop/source/deployment/misc/dp_version.cxx
b/desktop/source/deployment/misc/dp_version.cxx
index b6595a4..51add94 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -43,8 +43,8 @@ namespace dp_misc {
OUString const version1, OUString const version2)
{
for (::sal_Int32 i1 = 0, i2 = 0; i1 = 0 || i2 = 0;) {
-OUString e1(getElement(version1, i1));
-OUString e2(getElement(version2, i2));
+OUString e1(i1 = 0 ? getElement(version1, i1) : OUString());
+OUString e2(i2 = 0 ? getElement(version2, i2) : OUString());
if (e1.getLength() e2.getLength()) {
return ::dp_misc::LESS;
} else if (e1.getLength() e2.getLength()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source include/sfx2 include/vcl sfx2/source vcl/aqua
desktop/source/app/app.cxx | 24 +++-
include/sfx2/app.hxx|1
include/vcl/svapp.hxx | 40
sfx2/source/appl/appdde.cxx | 78 ++--
vcl/aqua/source/app/salinst.cxx |3 -
vcl/aqua/source/app/vclnsapp.mm | 30 +++
6 files changed, 113 insertions(+), 63 deletions(-)
New commits:
commit d5266a9e3f367752e2b2099e542518078271edcc
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Jul 27 19:47:01 2013 +0200
fdo#54264: Fix multi-argument ApplicationEvent::TYPE_OPEN/PRINT
...that had been broken when 5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5
Cleaned
up CommandLineArgs changed the representation of those multi-arguments
from a
single string with \n delimiters to vectorstring in
desktop/soruce/app/cmdlineargs.hxx, but missed updating other producers of
such ApplicationEvents.
(cherry picked from commit 787940e0ac285aa1101ca8964d252faaab3ea8c1, plus
04f4d4bfb708ef477618fa47d5f17779f4e4cf3c Add TODO comment expressing doubts
about existing code)
Conflicts:
sfx2/source/appl/appdde.cxx
Change-Id: I527d620c60a87f3a01d970927c521163fb6df192
Reviewed-on: https://gerrit.libreoffice.org/5192
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 195776f..5bda373 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2645,7 +2645,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
case ApplicationEvent::TYPE_ACCEPT:
// every time an accept parameter is used we create an acceptor
// with the corresponding accept-string
-createAcceptor(rAppEvent.GetData());
+createAcceptor(rAppEvent.GetStringData());
break;
case ApplicationEvent::TYPE_APPEAR:
if ( !GetCommandLineArgs().IsInvisible() )
@@ -2694,7 +2694,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
}
break;
case ApplicationEvent::TYPE_HELP:
-displayCmdlineHelp(rAppEvent.GetData());
+displayCmdlineHelp(rAppEvent.GetStringData());
break;
case ApplicationEvent::TYPE_VERSION:
displayVersion();
@@ -2706,7 +2706,9 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
{
ProcessDocumentsRequest* pDocsRequest = new
ProcessDocumentsRequest(
rCmdLine.getCwdUrl());
-pDocsRequest-aOpenList.push_back(rAppEvent.GetData());
+std::vectorOUString const data(rAppEvent.GetStringsData());
+pDocsRequest-aOpenList.insert(
+pDocsRequest-aOpenList.end(), data.begin(), data.end());
pDocsRequest-pcProcessed = NULL;
OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest );
@@ -2716,7 +2718,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
break;
case ApplicationEvent::TYPE_OPENHELPURL:
// start help for a specific URL
-Application::GetHelp()-Start(rAppEvent.GetData(), NULL);
+Application::GetHelp()-Start(rAppEvent.GetStringData(), NULL);
break;
case ApplicationEvent::TYPE_PRINT:
{
@@ -2725,7 +2727,9 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
{
ProcessDocumentsRequest* pDocsRequest = new
ProcessDocumentsRequest(
rCmdLine.getCwdUrl());
-pDocsRequest-aPrintList.push_back(rAppEvent.GetData());
+std::vectorOUString const data(rAppEvent.GetStringsData());
+pDocsRequest-aPrintList.insert(
+pDocsRequest-aPrintList.end(), data.begin(), data.end());
pDocsRequest-pcProcessed = NULL;
OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest );
@@ -2771,10 +2775,10 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
Reference css::util::XURLTransformer xParser =
css::util::URLTransformer::create(xContext);
css::util::URL aCommand;
-if( rAppEvent.GetData() == OUString(PREFERENCES) )
-aCommand.Complete = OUString( .uno:OptionsTreeDialog );
-else if( rAppEvent.GetData() == OUString(ABOUT) )
-aCommand.Complete = OUString( .uno:About );
+if( rAppEvent.GetStringData() == PREFERENCES )
+aCommand.Complete = .uno:OptionsTreeDialog;
+else if( rAppEvent.GetStringData() == ABOUT )
+aCommand.Complete = .uno:About;
if( !aCommand.Complete.isEmpty() )
{
xParser-parseStrict(aCommand);
@@ -2789,7 +2793,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source desktop/uiconfig
desktop/source/deployment/gui/dp_gui_dialog2.cxx |7 +++
desktop/uiconfig/ui/extensionmanager.ui |2 --
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 93a0b9aac9ce55bb6d04f00bb817bb1da1566838
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jun 5 13:25:58 2013 +0100
Related: fdo#65407 set a default size related to font size rather than
pixels
Change-Id: I97ff54de97ca1e02aff2a94dc01f2e4991600cd5
(cherry picked from commit 65df76208a8ad5d7b6de22b7bcae14148271dc54)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 2a439da..5c66a36 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -148,6 +148,8 @@ public:
virtual voidMouseButtonDown( const MouseEvent rMEvt );
virtual longNotify( NotifyEvent rNEvt );
+virtual SizeGetOptimalSize() const;
+
virtual voidRecalcAll();
virtual voidselectEntry( const long nPos );
//-
@@ -164,6 +166,11 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(Window* pParent)
{
}
+Size ExtBoxWithBtns_Impl::GetOptimalSize() const
+{
+return LogicToPixel(Size(250, 150), MapMode(MAP_APPFONT));
+}
+
//--
void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
{
diff --git a/desktop/uiconfig/ui/extensionmanager.ui
b/desktop/uiconfig/ui/extensionmanager.ui
index d949957..2f10a0b 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -89,8 +89,6 @@
property name=spacing12/property
child
object class=deploymentgui-ExtBoxWithBtns id=extensions
-property name=width_request600/property
-property name=height_request320/property
property name=visibleTrue/property
property name=can_focusFalse/property
/object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
