[Libreoffice-commits] core.git: Changes to 'refs/changes/32/8432/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/8432/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/2725/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooxml/source
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
| 93 +++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
| 97 +++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionManager.java
| 142
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionTrigger.java
| 10
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/AttributeManager.java
|8
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/AttributeValues.java
| 49 +
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ElementContext.java
| 65 ++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/IAction.java
| 27
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/NameMap.java
| 17
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/OOXMLParser.java
| 287 +++---
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java
| 203 +++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/StateMachine.java
| 138 +++-
12 files changed, 905 insertions(+), 231 deletions(-)
New commits:
commit 038e3ce8001ba3dc821f921fda731c8d49e68858
Author: Andre Fischer
Date: Thu Jun 12 11:01:20 2014 +
125035: Added support for actions to the experimental Java parser.
diff --git
a/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
new file mode 100644
index 000..fe3bae7
--- /dev/null
+++
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
@@ -0,0 +1,93 @@
+package org.apache.openoffice.ooxml.parser;
+
+import java.util.Vector;
+
+/** Container of all actions that are associated with a single state.
+ */
+public class ActionDescriptor
+{
+public ActionDescriptor (
+final int nStateId,
+final String sName)
+{
+msStateName = sName;
+
+maElementStartActions = null;
+maElementEndActions = null;
+maTextActions = null;
+}
+
+
+
+
+public void AddAction (
+final IAction aAction,
+final ActionTrigger eTrigger)
+{
+GetActionsForTrigger(eTrigger, true).add(aAction);
+}
+
+
+
+
+public Iterable GetActions (
+final ActionTrigger eTrigger)
+{
+return GetActionsForTrigger(eTrigger, false);
+}
+
+
+
+
+@Override
+public String toString ()
+{
+return "actions for state "+msStateName;
+}
+
+
+
+
+private Vector GetActionsForTrigger (
+final ActionTrigger eTrigger,
+final boolean bCreateWhenMissing)
+{
+Vector aActions = null;
+switch(eTrigger)
+{
+case ElementStart:
+aActions = maElementStartActions;
+if (bCreateWhenMissing && aActions==null)
+{
+aActions = new Vector<>();
+maElementStartActions = aActions;
+}
+break;
+case ElementEnd:
+aActions = maElementEndActions;
+if (bCreateWhenMissing && aActions==null)
+{
+aActions = new Vector<>();
+maElementEndActions = aActions;
+}
+break;
+case Text:
+aActions = maTextActions;
+if (bCreateWhenMissing && aActions==null)
+{
+aActions = new Vector<>();
+maTextActions = aActions;
+}
+break;
+}
+return aActions;
+}
+
+
+
+
+private final String msStateName;
+private Vector maElementStartActions;
+private Vector maElementEndActions;
+private Vector maTextActions;
+}
diff --git
a/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
new file mode 100644
index 000..0b6307f
--- /dev/null
+++
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
@@ -0,0 +1,97 @@
+package org.apache.openoffice.ooxml.parser;
+
+import java.util.Iterator;
+
+/** Iterate over two sources of actions, both given as an Iterable
+ * object that can be null.
+*/
+public class ActionIterator implements Iterable
+{
+public ActionIterator (
+final Iterable aOneStateActions,
+final Iterable
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source solenv/bin
filter/source/msfilter/msdffimp.cxx | 27 +++
solenv/bin/modules/installer/windows/msiglobal.pm | 30 +++---
2 files changed, 42 insertions(+), 15 deletions(-)
New commits:
commit e167ff39c21afe06197a0364b20fe211acb8267d
Author: Andre Fischer
Date: Tue Apr 15 11:28:55 2014 +
i124682: Use the right upgrade code for lanaguage sets.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index db07914..52ab428 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1567,10 +1567,12 @@ sub get_source_codes ($)
Determine values for the product code and upgrade code of the target
version.
-As perparation for building a Windows patch, certain conditions have to be
fullfilled.
- - The upgrade code changes from old to new version
+As preparation for building a Windows patch, certain conditions have to be
fulfilled.
+ - The upgrade code remains the same
- The product code remains the same
- In order to inforce that we have to access information about the source
version.
+ [this is still to be determined. For patches to work we need the same
product codes but
+the install sets install only when the product codes differ.]
+In order to enforce that we have to access information about the source
version.
The resulting values are stored as global variables
$installer::globals::productcode
@@ -1631,6 +1633,28 @@ sub set_global_code_variables ($$)
$installer::logger::Lang->printf("there is no source version =>
created new guids\n");
}
+# Keep the upgrade code constant between versions. Read it from the
codes.txt file.
+# Note that this handles regular installation sets and language packs.
+my $onelanguage = ${$languagesref}[0];
+$installer::logger::Lang->printf("reading upgrade code for language %s
from %s\n",
+$onelanguage,
+$installer::globals::codefilename);
+if (defined $installer::globals::codefilename)
+{
+my $code_filename = $installer::globals::codefilename;
+installer::files::check_file($code_filename);
+my $codefile = installer::files::read_file($code_filename);
+my $searchstring = "UPGRADECODE";
+my $codeblock =
installer::windows::idtglobal::get_language_block_from_language_file(
+$searchstring,
+$codefile);
+$target_upgrade_code =
installer::windows::idtglobal::get_language_string_from_language_block(
+$codeblock,
+$onelanguage,
+"");
+}
+# else use the previously generated upgrade code.
+
$installer::globals::productcode = $target_product_code;
$installer::globals::upgradecode = $target_upgrade_code;
$allvariableshashref->{'PRODUCTCODE'} = $target_product_code;
commit 48653aa3a1cc24ed9ad8a14ae035b38a751e561d
Author: Steve Yin
Date: Tue Apr 15 10:12:14 2014 +
Issue 124661 - crash when loading and re-saving attached ppt file with a
single customshape
check the equation array element number. If the number is greater than 128,
the equation array will not be imported.
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 3066357..430aae9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1996,20 +1996,23 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( SeekToContent( DFF_Prop_pFormulas, rIn ) )
rIn >> nNumElem >> nNumElemMem >> nElemSize;
-sal_Int16 nP1, nP2, nP3;
-sal_uInt16 nFlags;
-
-uno::Sequence< rtl::OUString > aEquations( nNumElem );
-for ( i = 0; i < nNumElem; i++ )
+if ( nNumElem <= 128 )
{
-rIn >> nFlags >> nP1 >> nP2 >> nP3;
-aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags, nP1,
nP2, nP3 );
+sal_Int16 nP1, nP2, nP3;
+sal_uInt16 nFlags;
+
+uno::Sequence< rtl::OUString > aEquations( nNumElem );
+for ( i = 0; i < nNumElem; i++ )
+{
+rIn >> nFlags >> nP1 >> nP2 >> nP3;
+aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags,
nP1, nP2, nP3 );
+}
+// pushing the whole Equations element
+const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM (
"Equations" ) );
+aProp.Name = sEquations;
+aProp.Value <<= aEquations;
+aPropVec.push_back( aProp );
}
-// pushing the whole Equations element
-const rtl::OUStr
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source padmin/source
desktop/source/app/app.cxx |2 +-
padmin/source/pamain.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 19cfea5843b4d992f9117925b8c1b070417a3d4f
Author: Andre Fischer
Date: Tue Apr 1 13:49:43 2014 +
i124573: Initialize flags to allow acess bridge initialization to fail
gracefully (Merged from branch AOO410).
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b8fb316..6360e96 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1917,7 +1917,7 @@ void Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
if(
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
-sal_Bool bQuitApp;
+sal_Bool bQuitApp (sal_False);
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index a9070c2..ca40ea5 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -145,7 +145,7 @@ void MyApp::Main()
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
-sal_Bool bQuitApp;
+sal_Bool bQuitApp (sal_False);
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sw/source vcl/unx
sw/source/core/access/acccell.cxx| 31 +--
sw/source/core/access/acccell.hxx|6 +++---
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 +++-
3 files changed, 15 insertions(+), 26 deletions(-)
New commits:
commit 577c82545201b0b736a21cd22b2bc9404e89ee44
Author: Andre Fischer
Date: Tue Apr 1 11:44:40 2014 +
i124482: Special handling of input field backgrounds of Adwaita theme
(Merged from branch AOO410).
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 1ecc667..6dbe23f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3615,7 +3615,9 @@ void GtkSalGraphics::updateSettings( AllSettings&
rSettings )
bNeedButtonStyleAsEditBackgroundWorkaround = false;
// setup some workarounds for "blueprint" theme
-if( pThemeName && strncasecmp( pThemeName, "blueprint", 9 ) == 0 )
+if( pThemeName
+&& ( strncasecmp( pThemeName, "blueprint", 9 ) == 0
+|| strncasecmp( pThemeName, "Adwaita", 7 ) == 0 ))
{
bNeedButtonStyleAsEditBackgroundWorkaround = true;
if( GetX11SalData()->GetDisplay()->GetServerVendor() == vendor_sun )
commit 4f34412da1ed29d51ba24fb4e33ecd9088811a08
Author: Oliver-Rainer Wittmann
Date: Tue Apr 1 10:00:47 2014 +
124553: - correct initialization
of new members introduced for IA2
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index d3e747e..f92e807 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -114,17 +114,21 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap
*pInitMap,
: SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm )
, aSelectionHelper( *this )
, bIsSelected( sal_False )
+, m_xTableReference( NULL )
+, m_pAccTable( NULL )
{
-vos::OGuard aGuard(Application::GetSolarMutex());
+vos::OGuard aGuard( Application::GetSolarMutex() );
OUString sBoxName( pCellFrm->GetTabBox()->GetName() );
SetName( sBoxName );
bIsSelected = IsSelected();
-//Need not assign the pointer of accessible table object to m_pAccTable,
-//for it already done in SwAccessibleCell::GetTable(); Former codes:
-//m_pAccTable= GetTable();
-GetTable();
+m_xTableReference = getAccessibleParent();
+#if OSL_DEBUG_LEVEL > 1
+uno::Reference< XAccessibleContext > xContextTable( m_xTableReference,
uno::UNO_QUERY );
+OSL_ASSERT( xContextTable.is() && xContextTable->getAccessibleRole() ==
AccessibleRole::TABLE );
+#endif
+m_pAccTable = static_cast< SwAccessibleTable * >( m_xTableReference.get()
);
}
sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
@@ -556,20 +560,3 @@ void SwAccessibleCell::deselectAccessibleChild(
aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex);
}
-SwAccessibleTable *SwAccessibleCell::GetTable()
-{
-if (!m_pAccTable)
-{
-if (!xTableReference.is())
-{
-xTableReference = getAccessibleParent();
-#ifdef OSL_DEBUG_LEVEL
-uno::Reference xContextTable(xTableReference,
uno::UNO_QUERY);
-OSL_ASSERT(xContextTable.is() &&
xContextTable->getAccessibleRole() == AccessibleRole::TABLE);
-#endif
-//SwAccessibleTable aTable = *(static_cast(xTable.get()));
-}
-m_pAccTable = static_cast(xTableReference.get());
-}
-return m_pAccTable;
-}
diff --git a/sw/source/core/access/acccell.hxx
b/sw/source/core/access/acccell.hxx
index 50152d2..7f32318 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -47,6 +47,9 @@ class SwAccessibleCell : public SwAccessibleContext,
SwAccessibleSelectionHelper aSelectionHelper;
sal_BoolbIsSelected;// protected by base class mutex
+::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > m_xTableReference;
+SwAccessibleTable *m_pAccTable;
+
sal_BoolIsSelected();
sal_Bool _InvalidateMyCursorPos();
@@ -171,9 +174,6 @@ public:
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
-SwAccessibleTable *GetTable();
-::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > xTableReference;
-SwAccessibleTable *m_pAccTable;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sot/source
sot/source/sdstor/stgdir.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be3e9eb3656451b3091f45011f33d701f13b3c13
Author: Andre Fischer
Date: Mon Mar 31 16:08:32 2014 +
i124461: Allow slightly larger nesting depth of SetupEntry call (merged
from branch AOO410).
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index e08281c..d861f2c 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -846,7 +846,7 @@ void StgDirStrm::SetupEntry (
const sal_Int32 nEntryCount,
const sal_Int32 nDepth)
{
-if (nDepth >= nEntryCount)
+if (nDepth > nEntryCount)
{
// Tree grew higher than there are different nodes. Looks like
// something is wrong with the file. Return now to avoid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - splitbuild/base.lst splitbuild/bm splitbuild/build.lst splitbuild/calc.lst splitbuild/common.lst splitbuild/content.lst splitbuild/draw.lst splitbu
splitbuild/base.lst |1 - splitbuild/bm |4 splitbuild/build.lst |1 - splitbuild/calc.lst |1 - splitbuild/common.lst |1 - splitbuild/content.lst|1 - splitbuild/draw.lst |1 - splitbuild/extensions.lst |1 - splitbuild/filter.lst |1 - splitbuild/framework.lst |1 - splitbuild/gui.lst|1 - splitbuild/prj/build.lst |1 - splitbuild/prj/d.lst |1 - splitbuild/start.lst |1 - splitbuild/uno.lst|1 - splitbuild/writer.lst |1 - 16 files changed, 19 deletions(-) New commits: commit 0864fe93d8e146cc2406013a004f6acdf5d2817b Author: Andre Fischer Date: Mon Mar 17 14:47:09 2014 + 124449: Removed unused module main/splitbuild. diff --git a/splitbuild/base.lst b/splitbuild/base.lst deleted file mode 100644 index cda4527..000 --- a/splitbuild/base.lst +++ /dev/null @@ -1 +0,0 @@ -reportdesign dbaccess diff --git a/splitbuild/bm b/splitbuild/bm deleted file mode 100755 index 16872f1..000 --- a/splitbuild/bm +++ /dev/null @@ -1,4 +0,0 @@ -build --genconf --clear -build --genconf --add `cat $1` -build --all $2 $3 $4 - diff --git a/splitbuild/build.lst b/splitbuild/build.lst deleted file mode 100644 index e19d9ce..000 --- a/splitbuild/build.lst +++ /dev/null @@ -1 +0,0 @@ -crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst deleted file mode 100644 index d9e4a9f..000 --- a/splitbuild/calc.lst +++ /dev/null @@ -1 +0,0 @@ -chart2 scaddins sccomp sc diff --git a/splitbuild/common.lst b/splitbuild/common.lst deleted file mode 100644 index 5367cd5..000 --- a/splitbuild/common.lst +++ /dev/null @@ -1 +0,0 @@ -basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards diff --git a/splitbuild/content.lst b/splitbuild/content.lst deleted file mode 100644 index dd8d40c..000 --- a/splitbuild/content.lst +++ /dev/null @@ -1 +0,0 @@ -dictionaries extras helpcontent2 diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst deleted file mode 100644 index 6f83eca..000 --- a/splitbuild/draw.lst +++ /dev/null @@ -1 +0,0 @@ -animations sd slideshow diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst deleted file mode 100644 index 86fe24b..000 --- a/splitbuild/extensions.lst +++ /dev/null @@ -1 +0,0 @@ -migrationanalysis reportbuilder sdext swext diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst deleted file mode 100644 index e69de29..000 diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst deleted file mode 100644 index 9659e01..000 --- a/splitbuild/filter.lst +++ /dev/null @@ -1 +0,0 @@ -filter hwpfilter oox writerfilter writerperfect xmerge \ No newline at end of file diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst deleted file mode 100644 index 30a9d55..000 --- a/splitbuild/framework.lst +++ /dev/null @@ -1 +0,0 @@ -automation avmedia basic basctl cui desktop drawinglayer svgio extensions forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst deleted file mode 100644 index d642843..000 --- a/splitbuild/gui.lst +++ /dev/null @@ -1 +0,0 @@ -accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst deleted file mode 100644 index 0356e8b..000 --- a/splitbuild/prj/build.lst +++ /dev/null @@ -1 +0,0 @@ -spl splitbuild :: postprocess NULL diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst deleted file mode 100644 index b87dd52..000 --- a/splitbuild/prj/d.lst +++ /dev/null @@ -1 +0,0 @@ -#dummy d.lst file diff --git a/splitbuild/start.lst b/splitbuild/start.lst deleted file mode 100644 index 3838044..000 --- a/splitbuild/start.lst +++ /dev/null @@ -1 +0,0 @@ -soltools diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst deleted file mode 100644 index db0ed74..000 --- a/splitbuild/uno.lst +++ /dev/null @@ -1 +0,0 @@ -autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools ucpp idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst deleted file mode 100644 index 28bd99c..000 --- a/splitbuild/writer.lst +++ /dev/null @@ -1 +0,0 @@ -hwpfilter starmath sw writerfilter writerperfect ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/templdlg.hxx|2 +-
sfx2/source/inc/templdgi.hxx |2 +-
sfx2/source/sidebar/SidebarDockingWindow.cxx |6 ++
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 8ad74d8866c77ca52f8c2562b728fc876c23f1c0
Author: Andre Fischer
Date: Wed Mar 12 14:21:27 2014 +
Related: #i124392# fill in SidebarDockingWindow::DoDispose
(cherry picked from commit 952f581cb77f52e9aaa974496dc8d86b335cb424)
Conflicts:
sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
Change-Id: Idf06437dfc45e02d9e2303df84d52ba0837de108
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 25b152a..96a03df 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public
DockingWindow
{
public:
SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow);
-~SfxTemplatePanelControl (void);
+virtual ~SfxTemplatePanelControl();
virtual voidUpdate();
virtual voidDataChanged( const DataChangedEvent& _rDCEvt );
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8a4dfdc..f064bba 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -276,7 +276,7 @@ public:
TYPEINFO();
SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool );
-~SfxCommonTemplateDialog_Impl();
+virtual ~SfxCommonTemplateDialog_Impl();
DECL_LINK( MenuSelectHdl, Menu * );
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 259123d..1fb9f0a 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -66,6 +66,12 @@ SidebarDockingWindow::~SidebarDockingWindow (void)
void SidebarDockingWindow::DoDispose (void)
{
+Reference xComponent
(static_cast(mpSidebarController.get()), UNO_QUERY);
+mpSidebarController.clear();
+if (xComponent.is())
+{
+xComponent->dispose();
+}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/inc sfx2/source
sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx |1 +
sfx2/inc/sfx2/templdlg.hxx |2 +-
sfx2/source/dialog/templdlg.cxx | 26 +-
sfx2/source/inc/templdgi.hxx |2 +-
sfx2/source/sidebar/SidebarChildWindow.cxx |7 +++
sfx2/source/sidebar/SidebarDockingWindow.cxx |6 ++
6 files changed, 37 insertions(+), 7 deletions(-)
New commits:
commit 952f581cb77f52e9aaa974496dc8d86b335cb424
Author: Andre Fischer
Date: Wed Mar 12 14:21:27 2014 +
124392: Avoid crash on close after assigning style.
diff --git a/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
b/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
index 4562f41..b41e907 100644
--- a/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
@@ -42,6 +42,7 @@ public:
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo);
+virtual ~SidebarChildWindow (void);
SFX_DECL_CHILDWINDOW(SidebarChildWindow);
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index e86e458..e8b9cb9 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/templdlg.hxx
@@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public
DockingWindow
{
public:
SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow);
-~SfxTemplatePanelControl (void);
+virtual ~SfxTemplatePanelControl (void);
virtual voidUpdate();
virtual voidDataChanged( const DataChangedEvent& _rDCEvt );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e2754ad..3490510 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1849,16 +1849,36 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
pItems[ nCount++ ] = 0;
+// This unbelievably crude technique is used to detect and handle
+// destruction of this during the synchronous slot call: store a
+// pointer to a local bool, initialize it to false and set that it
+// to true in the destructor.
Deleted aDeleted;
pbDeleted = &aDeleted;
+
sal_uInt16 nModi = pModifier ? *pModifier : 0;
const SfxPoolItem* pItem = rDispatcher.Execute(
nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
pItems, nModi );
// FIXME: Dialog can be destroyed while in Execute() check stack variable
for dtor flag!
-if ( !pItem || aDeleted() )
+if (aDeleted())
+{
+// this has been deleted in the previous synchronous slot
+// call. Exit without touching anything.
+return sal_False;
+}
+else
+{
+// this has not been deleted. Reset pbDeleted to prevent the
+// destructor to access the local bool at a later and rather
+// inconvenient time. See bugs 124392 and 100110 for more information.
+pbDeleted = NULL;
+}
+if (pItem == NULL)
+{
return sal_False;
+}
if ( nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId )
{
@@ -1880,10 +1900,6 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
}
}
-// Reset destroyed flag otherwise we use the pointer in the dtor
-// where the local stack object is already destroyed. This would
-// overwrite objects on the stack!! See #i100110
-pbDeleted = NULL;
return sal_True;
}
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index dcfaef3..90b3cd3 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -243,7 +243,7 @@ public:
SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool );
SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* );
-~SfxCommonTemplateDialog_Impl();
+virtual ~SfxCommonTemplateDialog_Impl();
DECL_LINK( MenuSelectHdl, Menu * );
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 484a53a..aaf0fa7 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -64,6 +64,13 @@ SidebarChildWindow::SidebarChildWindow (
+SidebarChildWindow::~SidebarChildWindow (void)
+{
+}
+
+
+
+
sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow)
{
if (pWindow != NULL)
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index b6b56a1..e19e2bd 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -71,6 +71,12 @@ SidebarDockingWindow::~SidebarDockingWindow (void)
void SidebarDockingWindow::DoDispose (void)
{
+Reference xComponent
(static_cast(mpSidebarController.get()), UNO_QUERY);
+mpSidebarController.clear();
+if (xComponent.is())
+{
+xComponent->dispose();
+}
}
___
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - stlport/systemstl sw/source
stlport/systemstl/list | 17 +
sw/source/core/crsr/swcrsr.cxx | 40 ++--
2 files changed, 35 insertions(+), 22 deletions(-)
New commits:
commit c739861cc38b09a1f99c3d91f879bfd8ee1ea43a
Author: Andre Fischer
Date: Wed Mar 5 13:52:22 2014 +
124361: Avoid MSVC warning 4555 while including list.
diff --git a/stlport/systemstl/list b/stlport/systemstl/list
index 283880b..1fa1dc5 100644
--- a/stlport/systemstl/list
+++ b/stlport/systemstl/list
@@ -23,16 +23,17 @@
#define SYSTEM_STL_LIST
#ifdef HAVE_STL_INCLUDE_PATH
- // TODO: use computed include file name
- #include_next
+// TODO: use computed include file name
+#include_next
#elif defined(_MSC_VER)
- #include <../../VC/include/list>
- // MSVC's list would cause a lot of expression-result-unused warnings
- // unless it is compiled in iterator-debugging mode. Silence this noise
- #pragma warning(disable:4555)
+// MSVC's list would cause a lot of expression-result-unused warnings
+// unless it is compiled in iterator-debugging mode. Silence this noise
temporarily.
+#pragma warning(push)
+#pragma warning(disable:4555)
+#include <../../VC/include/list>
+#pragma warning(pop)
#else // fall back to boost/tr1
- #include
+#include
#endif
#endif
-
commit 83510855eff12832682adfb0c1093ccb5cfc7b13
Author: Oliver-Rainer Wittmann
Date: Wed Mar 5 13:24:23 2014 +
123979: method - treat application of new position
due to content frame without height to next/previous content frame as restore
to saved position, if new position equals the saved one.
This avoid cursor traveling loops due to hidden content at the
beginning/end of the text document.
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 6922b16..b81ea04 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -343,7 +343,8 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
if( pNd->IsCntntNode() && !dynamic_cast(this) )
{
const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->getLayoutFrm(
pDoc->GetCurrentLayout() );
-if( pFrm && pFrm->IsValid()
+if( pFrm != NULL
+&& pFrm->IsValid()
&& 0 == pFrm->Frm().Height()
&& 0 != ( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags ) )
{
@@ -356,40 +357,51 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
// --> LIJIAN/FME 2007-11-27 #i72394# skip to prev /next valid
paragraph
// with a layout in case the first search did not succeed:
-if( !pFrm )
+if ( pFrm == NULL )
{
bGoNxt = !bGoNxt;
pFrm = ((SwCntntNode*)pNd)->getLayoutFrm(
pDoc->GetCurrentLayout() );
-while ( pFrm && 0 == pFrm->Frm().Height() )
+while ( pFrm != NULL
+&& 0 == pFrm->Frm().Height() )
{
-pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
-: pFrm->GetPrevCntntFrm();
+pFrm = bGoNxt ? pFrm->GetNextCntntFrm() :
pFrm->GetPrevCntntFrm();
}
}
// <--
-SwCntntNode* pCNd;
-if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) )
+SwCntntNode* pCNd = (pFrm != NULL) ? (SwCntntNode*)pFrm->GetNode()
: NULL;
+if ( pCNd != NULL )
{
// set this cntntNode as new position
rPtIdx = *pCNd;
pNd = pCNd;
-// ContentIndex noch anmelden:
-xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len();
+// assign corresponding ContentIndex
+const xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len();
GetPoint()->nContent.Assign( pCNd, nTmpPos );
-// sollten wir in einer Tabelle gelandet sein?
-if( IsInProtectTable( sal_True ) )
-pFrm = 0;
+if ( rPtIdx.GetIndex() == pSavePos->nNode
+ && nTmpPos == pSavePos->nCntnt )
+{
+// new position equals saved one
+// --> trigger restore of saved pos by setting to
NULL - see below
+pFrm = NULL;
+}
+
+if ( IsInProtectTable( sal_True ) )
+{
+// new position in protected table
+// --> trigger restore of saved pos by setting to
NULL - see below
+pFrm = NULL;
+}
}
}
-if( !pFrm )
+if( pFrm ==
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/inc stlport/systemstl
sc/inc/refdata.hxx |2 +-
stlport/systemstl/hash_map | 17 ++---
2 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit fddfd6e97750acacf667fc195456d33af8828a46
Author: Andre Fischer
Date: Wed Mar 5 11:51:34 2014 +
124361: Avoid warning by not assigning from sal_Int32 to sal_Int16.
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 9550b82..b3352faa 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -78,7 +78,7 @@ struct SC_DLLPUBLIC ScSingleRefData// Single
reference (one address) int
inline void InitFlags() { bFlags = 0; }// all FALSE
// #123870# Make it possible to init members to some defined values
-inline void InitMembers() { nCol = nRow = nTab = nRelCol = nRelRow =
nRelTab = 0; }
+inline void InitMembers() { nRow = nRelRow = 0; nCol = nRelCol = 0; nTab =
nRelTab = 0; }
// InitAddress: InitFlags and set address
inline void InitAddress( const ScAddress& rAdr );
commit 6fbf6653bebf3dfb6998233dff386d2ae977b152
Author: Andre Fischer
Date: Wed Mar 5 10:51:54 2014 +
124361: Avoid MSVC warning 4555 while including unordered_map.
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 198b055..9ebcb44 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -23,16 +23,19 @@
#define SYSTEM_STL_HASHMAP
#ifdef HAVE_STL_INCLUDE_PATH
- // TODO: use computed include file name
- #include_next
+// TODO: use computed include file name
+#include_next
#elif defined(__cplusplus) && (__cplusplus >= 201103L)
- #include
+#include
#elif defined(_MSC_VER)
- #include <../../VC/include/unordered_map>
- #define STLP4_EMUBASE_NS ::std::tr1
+#pragma warning(push)
+#pragma warning(disable:4555)
+#include <../../VC/include/unordered_map>
+#pragma warning(pop)
+#define STLP4_EMUBASE_NS ::std::tr1
#else // fall back to boost/tr1
- #include
- #define STLP4_EMUBASE_NS ::boost
+#include
+#define STLP4_EMUBASE_NS ::boost
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit 1cbec9cd986100de185f6dc10301a54f6604e6af
Author: Andre Fischer
Date: Mon Jul 9 11:10:26 2012 +
Resolves: #i119480# Fixed import of curves from PPT
Reported by: Du Jing
Patch by: SunYing
Review by: Andre Fischer
(cherry picked from commit 7d4fbffcf83ae6cbd01485320c2f21155c3dd4de)
Change-Id: I1ca3caf3aaec255ab204a4a687ed8434fbdb234a
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 679388c..f759592 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4393,6 +4393,7 @@ SdrObject* SvxMSDffManager::ImportShape( const
DffRecordHeader& rHd, SvStream& r
// before clearing the GeometryItem we have to store
the current Coordinates
const uno::Any* pAny =
((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath,
sCoordinates );
Rectangle aPolyBoundRect;
+Point aStartPt( 0,0 );
if ( pAny && ( *pAny >>= seqCoordinates ) && (
seqCoordinates.getLength() >= 4 ) )
{
sal_Int32 nPtNum, nNumElemVert =
seqCoordinates.getLength();
@@ -4408,6 +4409,11 @@ SdrObject* SvxMSDffManager::ImportShape( const
DffRecordHeader& rHd, SvStream& r
aXP[ (sal_uInt16)nPtNum ] = aP;
}
aPolyBoundRect = Rectangle( aXP.GetBoundRect() );
+if ( nNumElemVert >= 3 )
+{ // arc first command is always wr -- clockwise
arc
+// the parameters are :
(left,top),(right,bottom),start(x,y),end(x,y)
+aStartPt = aXP[2];
+}
}
else
aPolyBoundRect = Rectangle( -21600, 0, 21600,
43200 ); // defaulting
@@ -4432,6 +4438,18 @@ SdrObject* SvxMSDffManager::ImportShape( const
DffRecordHeader& rHd, SvStream& r
else
{
fNumber = 270.0;
+//normal situation:if endAngle != 90,there
will be a direct_value,but for damaged curve,the endAngle need to recalculate.
+Point cent = aPolyBoundRect.Center();
+if ( aStartPt.Y() == cent.Y() )
+fNumber = ( aStartPt.X() >= cent.X() ) ?
0:180.0;
+else if ( aStartPt.X() == cent.X() )
+fNumber = ( aStartPt.Y() >= cent.Y() ) ?
90.0: 270.0;
+else
+{
+fNumber = atan2( double( aStartPt.X() -
cent.X() ),double( aStartPt.Y() - cent.Y() ) )+ F_PI; // 0..2PI
+fNumber /= F_PI180; // 0..360.0
+}
+nEndAngle = NormAngle360( - (sal_Int32)fNumber
* 100 );
seqAdjustmentValues[ 0 ].Value <<= fNumber;
seqAdjustmentValues[ 0 ].State =
com::sun::star::beans::PropertyState_DIRECT_VALUE; // so this value will
properly be stored
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util setup_nati
cui/source/dialogs/about.cxx|2
+-
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/util/openoffice.lst|2
+-
setup_native/source/win32/nsis/ooobitmap.bmp|binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
solenv/bin/modules/installer/globals.pm |2
+-
8 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 66f974e05bfa78dbfafb4283dd79bca1eaf47f1d
Author: Andre Fischer
Date: Mon Mar 3 17:04:10 2014 +
124272: Wrong initialization of (merged from branch AOO410).
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index e9cf323..e8eb679 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -156,7 +156,7 @@ BEGIN
$fontsfoldername = "Fonts";
$fontsdirparent = "";
$fontsdirhostname = "truetype";
-$fontsdirname = $fontsdirhostname;
+$fontsdirname = "";
$officefolder = "OfficeFolder";
$officemenufolder = "OfficeMenuFolder";
$startupfolder = "StartupFolder";
commit ad9eed7acf5b693b641cf6d130739e04aa5e
Author: Jürgen Schmidt
Date: Mon Mar 3 16:37:25 2014 +
#124311# merge fixes from AOO410 branch
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 7dfe13d..13b87e3 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId &
rId ) :
sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2013") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
index da145cb..5e1a944 100644
Binary files
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp differ
diff --git
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index da145cb..5e1a944 100644
Binary files
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
index 51f8892..5d89ff4 100644
Binary files
a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 6621328..2017ef0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -321,7 +321,7 @@ Apache_OpenOffice_Beta_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
-AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Beta-SDK
+AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta-SDK
STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp
b/setup_native/source/win32/nsis/ooobitmap.bmp
index 57ca123..5e1a944 100644
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and
b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
index b2a3f3e..5d89ff4 100644
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/framework default_images/introabout desktop/prj desktop/zipintro instsetoo_native/util solenv/bin
default_images/framework/res/beta/backing-beta.png |binary default_images/framework/res/beta/backing.png |binary default_images/framework/res/beta/backing_hc.png|binary default_images/framework/res/beta/backing_rtl_left-beta.png |binary default_images/framework/res/beta/backing_rtl_left.png |binary default_images/framework/res/beta/backing_rtl_left_hc.png |binary default_images/introabout/beta/about.png|binary default_images/introabout/beta/intro.png|binary desktop/prj/d.lst |2 desktop/zipintro/makefile.mk| 13 + instsetoo_native/util/makefile.mk | 30 instsetoo_native/util/openoffice.lst| 60 solenv/bin/replace_in_zip.pl| 87 13 files changed, 191 insertions(+), 1 deletion(-) New commits: commit 44cca168c8a086cb779e1981c14bfccc318f5339 Author: Andre Fischer Date: Thu Feb 27 09:53:06 2014 + 124311: Merge in revision 1572480 from AOO410: adding 'beta' to product names and images. diff --git a/default_images/framework/res/beta/backing-beta.png b/default_images/framework/res/beta/backing-beta.png new file mode 100755 index 000..4ff3f6d Binary files /dev/null and b/default_images/framework/res/beta/backing-beta.png differ diff --git a/default_images/framework/res/beta/backing.png b/default_images/framework/res/beta/backing.png new file mode 100755 index 000..069dace Binary files /dev/null and b/default_images/framework/res/beta/backing.png differ diff --git a/default_images/framework/res/beta/backing_hc.png b/default_images/framework/res/beta/backing_hc.png new file mode 100755 index 000..f9c2561 Binary files /dev/null and b/default_images/framework/res/beta/backing_hc.png differ diff --git a/default_images/framework/res/beta/backing_rtl_left-beta.png b/default_images/framework/res/beta/backing_rtl_left-beta.png new file mode 100755 index 000..d4d123b Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left-beta.png differ diff --git a/default_images/framework/res/beta/backing_rtl_left.png b/default_images/framework/res/beta/backing_rtl_left.png new file mode 100755 index 000..1bab1e7 Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left.png differ diff --git a/default_images/framework/res/beta/backing_rtl_left_hc.png b/default_images/framework/res/beta/backing_rtl_left_hc.png new file mode 100755 index 000..696a0ca Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left_hc.png differ diff --git a/default_images/introabout/beta/about.png b/default_images/introabout/beta/about.png new file mode 100755 index 000..83f0b35 Binary files /dev/null and b/default_images/introabout/beta/about.png differ diff --git a/default_images/introabout/beta/intro.png b/default_images/introabout/beta/intro.png new file mode 100755 index 000..10f6d6c Binary files /dev/null and b/default_images/introabout/beta/intro.png differ diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 074f2c3..c37aea2 100644 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -116,10 +116,12 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_nologo +mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_beta ..\%__SRC%\bin\intro\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip ..\%__SRC%\bin\dev\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.zip ..\%__SRC%\bin\dev_nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo\intro.zip ..\%__SRC%\bin\nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_nologo\intro.zip +..\%__SRC%\bin\beta\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_beta\intro.zip ..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index 2db5c49..9ff1751 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -29,7 +29,7 @@ TARGET=zipintro .INCLUDE : settings.mk -DEFAULT_FLAVOURS=dev dev_nologo nologo intro +DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \ @@ -47,6 +47,10 @@ ZIP4LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) \ $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png +ZIP5LIST= \ +$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/intro.png $(INTRO_BITMAPS)) \ +$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/about.png $(ABOUT_BITMAPS)) \ +$(MISC)$/$
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - graphite/graphite-2.3.1.patch sd/source
graphite/graphite-2.3.1.patch | 25 ++
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 12 +--
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx |5 +
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx| 40
++
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx|2
sd/source/ui/slidesorter/model/SlideSorterModel.cxx| 31 ++-
sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx |4 -
7 files changed, 89 insertions(+), 30 deletions(-)
New commits:
commit 163d414311b0c8bcb1b0ad7c7cbf364e0ad4e4c4
Author: Andre Fischer
Date: Fri Feb 21 11:55:33 2014 +
123197: Fixed selection problems when switching between normal and master
mode.
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 83650d7..5b59595 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -946,6 +946,8 @@ void SlideSorterController::FinishEditModeChange (void)
{
if (mrModel.GetEditMode() == EM_MASTERPAGE)
{
+mpPageSelector->DeselectAllPages();
+
// Search for the master page that was determined in
// PrepareEditModeChange() and make it the current page.
PageEnumeration aAllPages
(PageEnumerationProvider::CreateAllPagesEnumeration(mrModel));
@@ -955,16 +957,20 @@ void SlideSorterController::FinishEditModeChange (void)
if (pDescriptor->GetPage() == mpEditModeChangeMasterPage)
{
GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
+mpPageSelector->SelectPage(pDescriptor);
break;
}
}
}
else
{
+PageSelector::BroadcastLock aBroadcastLock (*mpPageSelector);
+
SharedPageDescriptor pDescriptor
(mrModel.GetPageDescriptor(mnCurrentPageBeforeSwitch));
GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
// Restore the selection.
+mpPageSelector->DeselectAllPages();
::std::vector::iterator iPage;
for (iPage=maSelectionBeforeSwitch.begin();
iPage!=maSelectionBeforeSwitch.end();
@@ -1049,12 +1055,6 @@ void SlideSorterController::SetDocumentSlides (const
ReferenceDeselectAllPages();
-mpPageSelector->SelectPage(mpCurrentSlideManager->GetCurrentSlide());
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 0aa9f08..9676c5e 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -86,11 +86,14 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const
sal_Int32 nSlideIndex)
{
if (mnCurrentSlideIndex != nSlideIndex)
{
+PageSelector::BroadcastLock aBroadcastLock
(mrSlideSorter.GetController().GetPageSelector());
+
+mrSlideSorter.GetController().GetPageSelector().DeselectAllPages();
+
ReleaseCurrentSlide();
AcquireCurrentSlide(nSlideIndex);
// Update the selection.
-mrSlideSorter.GetController().GetPageSelector().DeselectAllPages();
if (mpCurrentSlide)
{
mrSlideSorter.GetController().GetPageSelector().SelectPage(mpCurrentSlide);
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index e03e202..8a17124 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -65,7 +65,7 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter)
mpSelectionAnchor(),
mpCurrentPage(),
mnUpdateLockCount(0),
- mbIsUpdateCurrentPagePending(false)
+ mbIsUpdateCurrentPagePending(true)
{
CountSelectedPages ();
}
@@ -393,27 +393,39 @@ void PageSelector::UpdateCurrentPage (const bool
bUpdateOnlyWhenPending)
mbIsUpdateCurrentPagePending = false;
// Make the first selected page the current page.
+SharedPageDescriptor pCurrentPageDescriptor;
const sal_Int32 nPageCount (GetPageCount());
for (sal_Int32 nIndex=0; nIndexHasState(PageDescriptor::ST_Selected))
+if ( ! pDescriptor)
+continue;
+if (pDescriptor->HasState(PageDescriptor::ST_Selected))
{
-// Switching the current slide normally sets also the selection
-// to just the new current slide. To prevent that, we store
-// (and at the end of this scope restore) the current selection.
-::boost::shared_ptr pSelection (GetPageSelection());
-
-
mrController.GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
-
-
[Libreoffice-commits] core.git: 4 commits - framework/source sw/source
framework/source/layoutmanager/layoutmanager.cxx |1 +
sw/source/filter/ww8/rtfsdrexport.cxx|1 +
sw/source/filter/ww8/ww8par.hxx |1 -
sw/source/ui/inc/cfgitems.hxx|1 -
4 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ce96f8b02e490b74bff57ca57a2c6a86c3041e32
Author: Andre Fischer
Date: Tue Feb 18 09:21:55 2014 +
Resolves: #i122576# Reset the docking area acceptor in the destructor
(cherry picked from commit 0e90517f3dd568cfe2be4bf8c256b94c9401d046)
Conflicts:
framework/source/layoutmanager/layoutmanager.cxx
Change-Id: Ib053a1b474434f81608a04ca0d30dd32fe410e5a
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index d1267dbe..2b570dd 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -155,6 +155,7 @@ LayoutManager::~LayoutManager()
{
Application::RemoveEventListener( LINK( this, LayoutManager,
SettingsChanged ) );
m_aAsyncLayoutTimer.Stop();
+setDockingAreaAcceptor(NULL);
delete m_pGlobalSettings;
}
commit 5bb7c0ab476ca108aecb5bf43ec9adc6d173f13b
Author: Caolán McNamara
Date: Wed Feb 19 10:21:10 2014 +
coverity#738892 Uninitialized scalar field
Change-Id: I4eecd759cf22f91a98830fc51b394ac959d6dc8a
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9a2f051..86989b8 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -39,6 +39,7 @@ RtfSdrExport::RtfSdrExport( RtfExport &rExport )
m_rAttrOutput( (RtfAttributeOutput&)m_rExport.AttrOutput() ),
m_pSdrObject( NULL ),
m_nShapeType( ESCHER_ShpInst_Nil ),
+ m_nShapeFlags ( 0 ) ,
m_pShapeStyle( new OStringBuffer( 200 ) ),
m_pShapeTypeWritten( new bool[ ESCHER_ShpInst_COUNT ] )
{
commit 03fb400dc3900d0ca063d9a25b5265ba4e451486
Author: Caolán McNamara
Date: Wed Feb 19 10:19:46 2014 +
coverity#738895 unused member
Change-Id: I6bca0a36708e4e8fd3a22a23d76a89525b6d75bc
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d98eb0a..ba6ec23 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -640,7 +640,6 @@ public:
sal_uInt16 hpsCheckBox;
sal_uInt16 nChecked;
-sal_uInt16 nDefaultChecked;
OUString sTitle;
OUString sDefault;
commit 285d1d1a5df5398d78bd45e6641cea371f9bbc17
Author: Caolán McNamara
Date: Wed Feb 19 10:18:14 2014 +
coverity#738899 unused member
Change-Id: I3f96d50709c9a6832192b97d4174b9cea07c5057
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index af77a76..e78f850 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -91,7 +91,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
bool bSmoothScroll :1;
//visual aids
bool bCrosshair :1;
-bool bHandles :1;
//display
bool bTable :1;
bool bGraphic :1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - filter/source slideshow/source svx/source sw/source unotools/source
filter/source/msfilter/msdffimp.cxx|4
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 42
++
svx/source/sidebar/possize/PosSizePropertyPanel.cxx| 23
+
svx/source/sidebar/possize/PosSizePropertyPanel.hxx| 12
++
svx/source/svdraw/svdopath.cxx | 33
++-
sw/source/ui/config/usrpref.cxx|4
sw/source/ui/docvw/edtwin.cxx | 18
+++-
sw/source/ui/inc/edtwin.hxx| 16
+--
sw/source/ui/inc/gloslst.hxx |6 +
unotools/source/config/securityoptions.cxx |6 +
10 files changed, 135 insertions(+), 29 deletions(-)
New commits:
commit 5b9003372effe4ee4bc34f34ee20138ac6a6050f
Author: Andre Fischer
Date: Tue Feb 18 14:17:32 2014 +
Resolves: #i124216# Detect changes of the UI scale.
(cherry picked from commit 7e5783030c82f8ec87b88899869e9152cf5c3271)
Conflicts:
svx/source/sidebar/possize/PosSizePropertyPanel.hxx
Change-Id: Ia31d5645694ca9b9ebb36f38c650103905b346a8
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 291d71b..f320e3e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -811,6 +811,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
case SID_ATTR_METRIC:
MetricState( eState, pState );
+UpdateUIScale();
break;
default:
@@ -1162,4 +1163,26 @@ void PosSizePropertyPanel::DisableControls()
}
+
+
+void PosSizePropertyPanel::UpdateUIScale()
+{
+const Fraction aUIScale (mpView->GetModel()->GetUIScale());
+if (maUIScale != aUIScale)
+{
+// UI scale has changed.
+
+// Remember the new UI scale.
+maUIScale = aUIScale;
+
+// The content of the position and size boxes is only updated when
item changes are notified.
+// Request such notifications without changing the actual item values.
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_X, sal_True,
sal_False);
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_Y, sal_True,
sal_False);
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_WIDTH, sal_True,
sal_False);
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_HEIGHT, sal_True,
sal_False);
+}
+}
+
+
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index f789282..5649a49 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -173,6 +173,18 @@ private:
void MetricState( SfxItemState eState, const SfxPoolItem* pState );
FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
void DisableControls();
+
+/** Check if the UI scale has changed and handle such a change.
+UI scale is an SD only feature. The UI scale is represented by items
+ATTR_OPTIONS_SCALE_X and
+ATTR_OPTIONS_SCALE_Y.
+As we have no direct access (there is no dependency of svx on sd) we
have to
+use a small trick (aka hack):
+a) call this method whenever a change of the metric item is notified,
+b) check if the UI scale has changed (strangely, the UI scale value is
available at the SdrModel.
+c) invalidate the items for position and size to trigger notifications
of their current values.
+*/
+void UpdateUIScale();
};
commit aad580af924d477f90264d6d1a2365d8e0cf8c9c
Author: Caolán McNamara
Date: Wed Feb 19 09:41:49 2014 +
coverity#738900 Uninitialized scalar field
Change-Id: I71eef3a4ffddac418b79866c0080c2d2d58a8226
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index acdcac3..e848580 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -50,7 +50,8 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
bIsHScrollMetricSet(sal_False),
bIsVScrollMetricSet(sal_False),
nDefTab( MM50 * 4 ),
-bIsSquaredPageMode(sal_False),
+bIsSquaredPageMode(false),
+bIsAlignMathObjectsToBaseline(false),
aContentConfig(bWeb, *this),
aLayoutConfig(bWeb, *this),
aGridConfig(bWeb, *this),
@@ -60,6 +61,7 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
{
MeasurementSystem eSystem =
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+eHScrollMetric = eVScrollMetric = eUserMetric;
aContentConfig.Load();
aLayoutCon
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util solenv/bin
instsetoo_native/util/aoo-410-release.xml | 258 ++
solenv/bin/build_release.pl | 1116 ++
2 files changed, 1374 insertions(+)
New commits:
commit 0746de95538d71c4f5cc531e77bbd4e367ca17b8
Author: Andre Fischer
Date: Wed Jan 29 10:51:35 2014 +
124142: Added initial version of PERL script for building releases in a
batch process.
diff --git a/instsetoo_native/util/aoo-410-release.xml
b/instsetoo_native/util/aoo-410-release.xml
new file mode 100644
index 000..c87107e
--- /dev/null
+++ b/instsetoo_native/util/aoo-410-release.xml
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://people.apache.org/~hdu/developer-snapshots/snapshot/win32";
+archive-platform="Win_x86"
+word-size="32"
+package-types="exe"
+/>
+http://people.apache.org/~hdu/developer-snapshots/snapshot/linux_x86";
+archive-platform="Linux_x86"
+word-size="32"
+package-types="rpm;deb"
+extension="tar.gz"
+/>
+http://people.apache.org/~hdu/developer-snapshots/snapshot/linux_x86-64";
+archive-platform="Linux_x86-64"
+word-size="64"
+package-types="rpm;deb"
+extension="tar.gz"
+/>
+http://people.apache.org/~hdu/developer-snapshots/snapshot/osx_x86-64";
+archive-platform="unxmaccx_x86-64"
+word-size="64"
+package-types="dmg"
+/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.openoffice.org/download/other.html#notes";
+language-list="en-US"
+platform-list="all"
+table="secondary"
+/>
+
+
+
diff --git a/solenv/bin/build_release.pl b/solenv/bin/build_release.pl
new file mode 100755
index 000..a2ae5fe
--- /dev/null
+++ b/solenv/bin/build_release.pl
@@ -0,0 +1,1116 @@
+#!/usr/bin/perl
+#**
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**
+
+use strict;
+use XML::LibXML;
+use open OUT => ":utf8";
+use LWP::Simple;
+use Digest;
+use Digest::MD5;
+use Digest::SHA;
+
+use Carp::always;
+
+=head1 NAME
+
+build_release.pl - Tool for batch release builds and uploads and the
creation of wiki pages that list install sets.
+
+=head1 SYNOPSIS
+
+build_release.pl {option}
+
+comands:
+build builds all install sets as requested by the XML file and
supported by the platform.
+upload upload install sets to a local or remote (via ssh with
public/private key)
+ directory structure. Uploads install sets that where build
on other platforms.
+wiki create a wiki (MediaWiki syntax) snippet that references
all install sets at the upload
+ location. Includes install sets that where built and/or
uploaded from other
+ platforms and machines.
+options:
+-j maximum number of build processes
+-kkeep going if there are recoverable errors
+-u upload destination
+-lcheck links on wiki page, write broken links as plain
text
+-ld check links on wiki page, mark broken links
+-o filename of the output (wiki: wiki page, build: makefile)
+
+=head1 XML file format
+
+
+
+
+... more languages
+
+http://people.apache.org/~hdu/developer-snapshots/snapshot/win32";
+archive-platform="Win_x86"
+word-size="32"
+package-types="exe"
+/>
+... more platforms
+
+
+
+ ... more build entries
+
+
+
+# Each wiki package will generate one row per language.
+# For each language there will be one package block.
+
+... more pack
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source
chart2/source/view/axes/DateHelper.cxx | 17 ++---
chart2/source/view/axes/Tickmarks_Dates.cxx |6 ++
2 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 58a2b4a7f9f495eaf058e577ad3419f5a6c93d84
Author: Andre Fischer
Date: Fri Jan 24 10:36:16 2014 +
124069: Prevent infinite loop when looking too far into the future.
diff --git a/chart2/source/view/axes/DateHelper.cxx
b/chart2/source/view/axes/DateHelper.cxx
index d007209..3545435 100644
--- a/chart2/source/view/axes/DateHelper.cxx
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -78,9 +78,20 @@ Date DateHelper::GetDateSomeMonthsAway( const Date& rD, long
nMonthDistance )
Date DateHelper::GetDateSomeYearsAway( const Date& rD, long nYearDistance )
{
Date aRet(rD);
-aRet.SetYear( static_cast(rD.GetYear()+nYearDistance) );
-while(!aRet.IsValid())
-aRet--;
+const long nFutureYear (rD.GetYear()+nYearDistance);
+aRet.SetYear(static_cast(nFutureYear));
+if ( ! aRet.IsValid())
+{
+// The Date class has the nasty property to store years modulo
+// 1. In order to handle (probably invalid) very large
+// year values more gracefully than with an infinite loop we
+// check that condition and return an invalid date.
+if (nFutureYear < 1)
+{
+while ( ! aRet.IsValid())
+--aRet;
+}
+}
return aRet;
}
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx
b/chart2/source/view/axes/Tickmarks_Dates.cxx
index a6ec18f..749a7be 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -105,6 +105,7 @@ void DateTickFactory::getAllTicks( ::std::vector<
::std::vector< TickInfo > >& r
break;
//find next major date
+const Date aTmpDate (aDate);
switch( m_aIncrement.MajorTimeInterval.TimeUnit )
{
case DAY:
@@ -118,6 +119,8 @@ void DateTickFactory::getAllTicks( ::std::vector<
::std::vector< TickInfo > >& r
aDate = DateHelper::GetDateSomeMonthsAway( aDate,
m_aIncrement.MajorTimeInterval.Number );
break;
}
+if ( ! aDate.IsValid() || aDate == aTmpDate)
+break;
}
//create minor date tickinfos
@@ -136,6 +139,7 @@ void DateTickFactory::getAllTicks( ::std::vector<
::std::vector< TickInfo > >& r
break;
//find next minor date
+const Date aTmpDate (aDate);
switch( m_aIncrement.MinorTimeInterval.TimeUnit )
{
case DAY:
@@ -149,6 +153,8 @@ void DateTickFactory::getAllTicks( ::std::vector<
::std::vector< TickInfo > >& r
aDate = DateHelper::GetDateSomeMonthsAway( aDate,
m_aIncrement.MinorTimeInterval.Number );
break;
}
+if ( ! aDate.IsValid() || aDate == aTmpDate)
+break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source slideshow/source solenv/bin sw/source writerfilter/source
sd/source/ui/slidesorter/view/SlsButtonBar.cxx |2 +-
slideshow/source/engine/animatedsprite.cxx |2 +-
slideshow/source/engine/shapes/viewshape.cxx |2 +-
slideshow/source/engine/shapesubset.cxx|2 +-
slideshow/source/engine/slide/slideanimations.cxx |2 +-
slideshow/source/inc/shapeattributelayer.hxx |2 +-
slideshow/source/inc/shapeattributelayerholder.hxx |2 +-
solenv/bin/patch_tool.pl |9 -
sw/source/core/inc/bookmrk.hxx |2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx|2 +-
10 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 821f66510a7851e6e6835e0f6c86dc443482caf0
Author: Andre Fischer
Date: Tue Jan 21 14:21:45 2014 +
123531: Changed name of MSP to contain product name and source and target
version.
diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index f7cc82d..7f2d4de 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -1549,7 +1549,14 @@ sub CreatePcp ($$%)
# Create filenames.
my $pcp_filename = File::Spec->catfile($msp_path, "openoffice.pcp");
-my $msp_filename = File::Spec->catfile($msp_path, "openoffice.msp");
+# Create basename to include product name and source and target version.
+# Hard code platform because that is the only platform supported at the
moment.
+my $msp_basename = sprintf("%s_%s-%s_Win_x86_patch_%s.msp",
+$context->{'product-name'},
+$source_msi->{'version'},
+$target_msi->{'version'},
+$context->{'language'});
+my $msp_filename = File::Spec->catfile($msp_path, $msp_basename);
# Setup msp path and filename.
unlink($pcp_filename) if -f $pcp_filename;
commit 1ceda390389a3e7bf4b7bb72b533a355a0fa060d
Author: Herbert Dürr
Date: Tue Jan 21 14:09:37 2014 +
#i123817# boost::shared_ptr doesn't have an implicit conversion to bool
Constructs that expect it fail at least in XCode4's clang in C++11 mode.
An implicit conversion from pointer to bool is already suspicious enough
and a shared_ptr->pointer->bool conversion is even worse. Cleaning up
the code fixes the build breaker seen in boost/libc++/clang environments.
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index ff088bf..003e3b6 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -469,7 +469,7 @@ void ButtonBar::Paint (
bool ButtonBar::IsMouseOverButton (void) const
{
-return mpButtonUnderMouse;
+return (mpButtonUnderMouse.get() != NULL);
}
diff --git a/slideshow/source/engine/animatedsprite.cxx
b/slideshow/source/engine/animatedsprite.cxx
index 22b2cc1..0b6e612 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -157,7 +157,7 @@ namespace slideshow
}
}
-return mpSprite;
+return (mpSprite.get() != NULL);
}
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize&
rPixelOffset )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx
b/slideshow/source/engine/shapes/viewshape.cxx
index 46f0f2e..0265acb 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -184,7 +184,7 @@ namespace slideshow
}
}
-return io_rCacheEntry.mpRenderer;
+return (io_rCacheEntry.mpRenderer.get() != NULL);
}
bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr&
rDestinationCanvas,
diff --git a/slideshow/source/engine/shapesubset.cxx
b/slideshow/source/engine/shapesubset.cxx
index 77e76a4..f6783a8 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -110,7 +110,7 @@ namespace slideshow
maTreeNode );
}
-return mpSubsetShape;
+return (mpSubsetShape.get() != NULL);
}
void ShapeSubset::disableSubsetShape()
diff --git a/slideshow/source/engine/slide/slideanimations.cxx
b/slideshow/source/engine/slide/slideanimations.cxx
index 55db7e5..16e16a0 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -80,7 +80,7 @@ namespace slideshow
SHOW_NODE_TREE( mpRootNode );
-return mpRootNode;
+return (mpRootNode.get() != NULL);
}
bool SlideAnimations::isAnimated() const
diff --git a/slideshow/source/inc/shapeattributelayer.hxx
b/slideshow/source/inc/shapeattributelayer.hxx
index ede31f9..a41ab35 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slide
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/core/data/table2.cxx | 26 --
1 file changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 3551c988e2757394dadce776515fccdef78f0214
Author: Andre Fischer
Date: Mon Jan 20 14:11:17 2014 +
124033: Made the update of maColManualBreaks more conservative.
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 544a265..5b96472 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -267,18 +267,24 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW
nStartRow, SCROW nEndRow, SCSIZE
if (!maColManualBreaks.empty())
{
-std::set::reverse_iterator rit = maColManualBreaks.rbegin();
-while (rit != maColManualBreaks.rend())
+std::vector aUpdatedBreaks;
+
+while ( ! maColManualBreaks.empty())
{
-SCCOL nCol = *rit;
-if (nCol < nStartCol)
-break; // while
-else
-{
-maColManualBreaks.erase( (++rit).base());
-maColManualBreaks.insert( static_cast( nCol +
nSize));
-}
+std::set::iterator aLast (--maColManualBreaks.end());
+
+// Check if there are more entries that have to be processed.
+if (*aLast < nStartRow)
+break;
+
+// Remember the updated break location and erase the entry.
+aUpdatedBreaks.push_back(static_cast(*aLast + nSize));
+maColManualBreaks.erase(aLast);
}
+
+// Insert the updated break locations.
+if ( ! aUpdatedBreaks.empty())
+maColManualBreaks.insert(aUpdatedBreaks.begin(),
aUpdatedBreaks.end());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/svdraw/svdoashp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bb94c19d2c7df1c468d38b7744e0d34e8ac27a99 Author: Andre Fischer Date: Fri Jan 17 15:45:31 2014 + 105491: Switched update of vertical flag and setting the item set to avoid infinite recursion. diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index a82c5cc..771f158 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2598,10 +2598,10 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) case SDRTEXTHORZADJUST_BLOCK: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break; } -SetObjectItemSet( aNewSet ); pOutlinerParaObject = GetOutlinerParaObject(); if ( pOutlinerParaObject ) pOutlinerParaObject->SetVertical(bVertical); +SetObjectItemSet( aNewSet ); // restore object size SetSnapRect(aObjectRect); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - oox/source sc/source
oox/source/ppt/timenodelistcontext.cxx | 17 +++--
sc/source/core/data/table2.cxx | 26 --
2 files changed, 27 insertions(+), 16 deletions(-)
New commits:
commit 1ae5f9052eb3d60d644533a0581cd3db39218455
Author: Andre Fischer
Date: Thu Jan 16 09:54:36 2014 +
123166: Made the update of maRowManualBreaks more conservative.
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 114c384..544a265 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -155,18 +155,24 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol,
SCROW nStartRow, SCSIZE
if (!maRowManualBreaks.empty())
{
-std::set::reverse_iterator rit = maRowManualBreaks.rbegin();
-while (rit != maRowManualBreaks.rend())
+std::vector aUpdatedBreaks;
+
+while ( ! maRowManualBreaks.empty())
{
-SCROW nRow = *rit;
-if (nRow < nStartRow)
-break; // while
-else
-{
-maRowManualBreaks.erase( (++rit).base());
-maRowManualBreaks.insert( static_cast( nRow +
nSize));
-}
+std::set::iterator aLast (--maRowManualBreaks.end());
+
+// Check if there are more entries that have to be processed.
+if (*aLast < nStartRow)
+break;
+
+// Remember the updated break location and erase the entry.
+aUpdatedBreaks.push_back(static_cast(*aLast + nSize));
+maRowManualBreaks.erase(aLast);
}
+
+// Insert the updated break locations.
+if ( ! aUpdatedBreaks.empty())
+maRowManualBreaks.insert(aUpdatedBreaks.begin(),
aUpdatedBreaks.end());
}
}
commit 641aa4b583e27369b404584d094e0758a93ce5b5
Author: Steve Yin
Date: Thu Jan 16 08:29:37 2014 +
Bug 119578 - [From Symphony]Lighten special effect in .PPTX won't display
diff --git a/oox/source/ppt/timenodelistcontext.cxx
b/oox/source/ppt/timenodelistcontext.cxx
index 0112889..e99d9fa 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -76,27 +76,32 @@ namespace oox { namespace ppt {
{
}
-sal_Int32 get()
+Any get()
{
sal_Int32 nColor;
+Sequence< double > aHSL( 3 );
+Any aColor;
switch( colorSpace )
{
case AnimationColorSpace::HSL:
-nColor = ( ( ( one * 128 ) / 360 ) & 0xff ) << 16
-| ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8
-| ( ( ( three * 128 ) / 1000 ) & 0xff );
+aHSL[ 0 ] = double(one) / 10;
+aHSL[ 1 ] = double(two) / 10;
+aHSL[ 2 ] = double(three) / 10;
+aColor = Any(aHSL);
break;
case AnimationColorSpace::RGB:
nColor = ( ( ( one * 128 ) / 1000 ) & 0xff ) << 16
| ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8
| ( ( ( three * 128 ) / 1000 ) & 0xff );
+aColor = Any(nColor);
break;
default:
nColor = 0;
+aColor = Any( nColor );
break;
}
-return nColor;
+return aColor;
}
sal_Int16 colorSpace;
@@ -504,7 +509,7 @@ namespace oox { namespace ppt {
if( maFromClr.isUsed() )
mpNode->setFrom( Any( maFromClr.getColor(
rGraphicHelper ) ) );
if( mbHasByColor )
-mpNode->setBy( Any ( m_byColor.get() ) );
+mpNode->setBy( m_byColor.get() );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin vcl/aqua vcl/inc vcl/os2 vcl/unx vcl/win
solenv/bin/patch_tool.pl| 28
vcl/aqua/source/gdi/salgdi.cxx |6 +++---
vcl/aqua/source/gdi/salprn.cxx |2 +-
vcl/aqua/source/window/salframe.cxx |4 ++--
vcl/inc/aqua/salframe.h |2 +-
vcl/inc/aqua/salgdi.h |2 +-
vcl/inc/os2/salgdi.h|2 +-
vcl/inc/win/salgdi.h|2 +-
vcl/os2/source/gdi/salgdi.cxx |9 ++---
vcl/unx/generic/gdi/salgdi3.cxx |6 ++
vcl/win/source/gdi/salgdi.cxx |2 +-
11 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit 1d5583df9bdad2b61f05dd504b30944851fe64a7
Author: Andre Fischer
Date: Tue Dec 17 15:47:29 2013 +
123531: Create log path before using it.
diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index c82806c..f7cc82d 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -2203,9 +2203,9 @@ sub UpdateReleasesXML($$)
sub main ()
{
my $context = ProcessCommandline();
-installer::logger::starttime();
-$installer::logger::Global->add_timestamp("starting logging");
-#installer::logger::SetupSimpleLogging(undef);
+#installer::logger::starttime();
+#$installer::logger::Global->add_timestamp("starting logging");
+installer::logger::SetupSimpleLogging(undef);
die "ERROR: list file is not defined, please use --lst-file option"
unless defined $context->{'lst-file'};
@@ -,15 +,19 @@ sub main ()
if ($context->{'command'} =~ /create|check/)
{
-$installer::logger::Lang->set_filename(
-File::Spec->catfile(
-$context->{'output-path'},
-$context->{'product-name'},
-"msp",
-$context->{'source-version-dash'} . "_" .
$context->{'target-version-dash'},
-$context->{'language'},
-"log",
-"patch-creation.log"));
+my $filename = File::Spec->catfile(
+$context->{'output-path'},
+$context->{'product-name'},
+"msp",
+$context->{'source-version-dash'} . "_" .
$context->{'target-version-dash'},
+$context->{'language'},
+"log",
+"patch-creation.log");
+my $dirname = dirname($filename);
+File::Path::make_path($dirname) unless -d $dirname;
+printf("directing output to $filename\n");
+
+$installer::logger::Lang->set_filename($filename);
$installer::logger::Lang->copy_lines_from($installer::logger::Global);
$installer::logger::Lang->set_forward(undef);
$installer::logger::Info->set_forward($installer::logger::Lang);
commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436
Author: Herbert Dürr
Date: Tue Dec 17 15:01:25 2013 +
#i123840# normalize SalFrame resolution type to sal_Int32
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index a45ae9f..76f13a6 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -430,13 +430,13 @@ void AquaSalGraphics::initResolution( NSWindow* )
mfFakeDPIScale = 1.0;
}
-void AquaSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
if( !mnRealDPIY )
initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
-rDPIX = static_cast(mfFakeDPIScale * mnRealDPIX);
-rDPIY = static_cast(mfFakeDPIScale * mnRealDPIY);
+rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
+rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
}
void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 0a652c6..6bb3a057 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -407,7 +407,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
{
if( mpPrintInfo )
{
-long nDPIX = 72, nDPIY = 72;
+sal_Int32 nDPIX = 72, nDPIY = 72;
mpGraphics->GetResolution( nDPIX, nDPIY );
const double fXScaling = static_cast(nDPIX)/72.0,
fYScaling = static_cast(nDPIY)/72.0;
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index 63c0447..715a6fd 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1219,7 +1219,7 @@ static Font getFont( NSFont* pFont, long nDPIY, const
Font& rDefault )
return aResult;
}
-void AquaSalFrame::getResolution( long& o_rDPIX, long& o_
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util tools/inc vcl/unx
instsetoo_native/util/makefile.mk |6 ++--
tools/inc/tools/prex.h|9 --
vcl/unx/generic/app/i18n_xkb.cxx | 54 +++---
3 files changed, 15 insertions(+), 54 deletions(-)
New commits:
commit 9d4445e4ca17b09ddc6c6fe774dc064884b0193a
Author: Andre Fischer
Date: Tue Dec 17 13:49:43 2013 +
123532: Added list of known package formats.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 27b5bc3..d995239 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -90,10 +90,12 @@ help .PHONY :
@echo "patch-checkcheck if patch can be created (part of
patch-create)"
@echo
@echo "Most targets (all except aoo_srcrelease and updatepack) accept
suffixes"
-@echo "add _ to build a target for one language only"
+@echo "append _ to build a target for one language only"
@echo "the default set of languages is alllangiso=$(alllangiso)"
-@echo "add . to build a target for one package format
only"
+@echo "append . to build a target for one package
format only"
@echo "the default set of package formats is archive and
PKGFORMAT=$(PKGFORMAT)"
+@echo "known package formats are: "
+@echo "archive, bsd, deb, dmg, installed, msi, native, osx, pkg,
portable, rpm"
LOCALPYFILES= \
commit ed609e7d76aa27d82818a405afd1c58fe5136d1e
Author: Herbert Dürr
Date: Tue Dec 17 12:31:19 2013 +
#i123865# enable XKB for all X11-based display targets
diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index 3204ddb..846d7aa 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.h
@@ -39,20 +39,13 @@
extern "C" {
#endif
-#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really
check for xfree86 or for X11R6.1 and higher
-#define __XKeyboardExtension__ 1
-#else
-#define __XKeyboardExtension__ 0
-#endif
-
#include
#include
#include
#include
#include
-#if __XKeyboardExtension__
#include
-#endif
+
typedef unsigned long Pixel;
#undef DestroyAll
diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index 50be5437..951eb88 100644
--- a/vcl/unx/generic/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -31,16 +31,10 @@
#include "unx/saldata.hxx"
#include "unx/i18n_xkb.hxx"
-SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display*
-#if __XKeyboardExtension__
-pDisplay
-#endif
-)
-: mbUseExtension( (sal_Bool)__XKeyboardExtension__ ),
- mnDefaultGroup( 0 )
+SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay)
+: mbUseExtension( true ),
+, mnDefaultGroup( 0 )
{
-#if __XKeyboardExtension__
-
mpDisplay = pDisplay;
// allow user to set the default keyboard group idx or to disable the usage
@@ -89,19 +83,11 @@ pDisplay
XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord );
mnGroup = aStateRecord.group;
}
-
-#endif // __XKeyboardExtension__
}
void
-SalI18N_KeyboardExtension::Dispatch( XEvent*
-#if __XKeyboardExtension__
-pEvent
-#endif
-)
+SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent)
{
-#if __XKeyboardExtension__
-
// must the event be handled?
if ( !mbUseExtension
|| (pEvent->type != mnEventBase) )
@@ -119,41 +105,21 @@ pEvent
default:
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Got unrequested XkbAnyEvent %#x/%i\n",
-static_cast(nXKBType),
static_cast(nXKBType) );
-#endif
+static_cast(nXKBType),
static_cast(nXKBType) );
+#endif
break;
}
-#endif // __XKeyboardExtension__
}
-#if __XKeyboardExtension__
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
- sal_uInt32 nGroup ) const
-#else
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup(
sal_uInt32,sal_uInt32,sal_uInt32 ) const
-#endif
+sal_uInt32 SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
+sal_uInt32 nShiftState, sal_uInt32 nGroup ) const
{
-#if __XKeyboardExtension__
-
-if ( !mbUseExtension )
-return NoSymbol;
-
nShiftState &= ShiftMask;
-KeySym nKeySymbol;
-nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState
);
+KeySym nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup,
nShiftState );
return nKeySymbol;
-
-#else
-
-return NoSymbol;
-
-#endif // __XKeyboardExtension__
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/download.pm | 78 +--
1 file changed, 44 insertions(+), 34 deletions(-)
New commits:
commit 80830a5bcbfd006c72cfcb57ce6bca0758db76b9
Author: Andre Fischer
Date: Fri Dec 13 12:02:58 2013 +
123531: Cleanup: use strict, no hard-coded values.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 8c540fa..de73339 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -32,6 +32,8 @@ use installer::pathanalyzer;
use installer::remover;
use installer::systemactions;
+use strict;
+
BEGIN { # This is needed so that cygwin's perl evaluates ACLs
# (needed for correctly evaluating the -x test.)
if( $^O =~ /cygwin/i ) {
@@ -157,7 +159,7 @@ sub call_md5sum
{
my ($filename) = @_;
-$md5sumfile = "/usr/bin/md5sum";
+my $md5sumfile = "/usr/bin/md5sum";
if ( ! -f $md5sumfile ) { installer::exiter::exit_program("ERROR: No file
/usr/bin/md5sum", "call_md5sum"); }
@@ -191,7 +193,7 @@ sub call_md5sum
sub get_md5sum
{
-($md5sumoutput) = @_;
+my ($md5sumoutput) = @_;
my $md5sum;
@@ -357,7 +359,7 @@ sub create_tar_gz_file_from_package
}
$alldirs = installer::systemactions::get_all_directories($installdir);
-$packagename = ${$alldirs}[0]; # only taking the first Solaris package
+my $packagename = ${$alldirs}[0]; # only taking the first Solaris package
if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could
not find package in directory $installdir!", "determine_packagename"); }
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
@@ -368,8 +370,8 @@ sub create_tar_gz_file_from_package
my $ldpreloadstring = "";
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" .
$getuidlibrary; }
-$systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename |
gzip > $targzname";
-print "... $systemcall ...\n";
+my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename
| gzip > $targzname";
+$installer::logger::Info->printf("... %s ...\n", $systemcall);
my $returnvalue = system($systemcall);
@@ -799,7 +801,7 @@ sub create_tar_gz_file_from_directory
$installer::globals::downloadfilename = $downloadfilename .
$installer::globals::downloadfileextension;
my $targzname = $downloaddir . $installer::globals::separator .
$installer::globals::downloadfilename;
-$systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip >
$targzname";
+my $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir |
gzip > $targzname";
my $returnvalue = system($systemcall);
@@ -827,16 +829,13 @@ sub resolve_variables_in_downloadname
# Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
-my $productversion = "";
-if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion =
$allvariables->{'PRODUCTVERSION'}; }
+my $productversion = $allvariables->{'PRODUCTVERSION'} // "";
$downloadname =~ s/\{productversion\}/$productversion/;
-my $ppackageversion = "";
-if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion =
$allvariables->{'PACKAGEVERSION'}; }
+my $packageversion = $allvariables->{'PACKAGEVERSION'} // "";
$downloadname =~ s/\{packageversion\}/$packageversion/;
-my $extension = "";
-if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension =
$allvariables->{'SHORT_PRODUCTEXTENSION'}; }
+my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'} // "";
$extension = lc($extension);
$downloadname =~ s/\{extension\}/$extension/;
@@ -1046,11 +1045,11 @@ sub put_setup_ico_into_template
# Windows: Including the publisher into nsi template
##
-sub put_publisher_into_template
+sub put_publisher_into_template ($$)
{
-my ($templatefile) = @_;
+my ($templatefile, $variables) = @_;
-my $publisher = "Sun Microsystems, Inc.";
+my $publisher = $variables->{'OOOVENDOR'} // "";
replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher);
}
@@ -1059,11 +1058,11 @@ sub put_publisher_into_template
# Windows: Including the web site into nsi template
##
-sub put_website_into_template
+sub put_website_into_template ($$)
{
-my ($templatefile) = @_;
+my ($templatefile, $variables) = @_;
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - instsetoo_native/util sal/inc solenv/bin
instsetoo_native/util/makefile.mk | 115 +-
sal/inc/rtl/allocator.hxx | 17 ---
solenv/bin/modules/installer/languages.pm | 13 ++
solenv/bin/modules/installer/windows/msiglobal.pm | 13 +-
4 files changed, 89 insertions(+), 69 deletions(-)
New commits:
commit 3b3b8ea325ab7de75f9f17794ba3159522fa442c
Author: Andre Fischer
Date: Tue Dec 10 08:52:07 2013 +
123532: Prevent more silly warnings.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index b223ea4..e084559 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -125,7 +125,7 @@ ALLTAR : updatepack
# Independent of PKGFORMAT, always build a default-language openoffice product
# also in archive format, so that tests that require an OOo installation (like
# smoketestoo_native) have one available:
-#openoffice_$(defaultlangiso) : $$@.archive
+openoffice_$(defaultlangiso) : $$@.archive
.IF "$(VERBOSE)"=="TRUE"
VERBOSESWITCH=-verbose
@@ -161,20 +161,21 @@ aoo_srcrelease: $(SOLARENV)$/bin$/srcrelease.xml
updatepack:
$(PERL) -w $(SOLARENV)$/bin$/packager.pl
+
+# The naming schema of targets is this: target_language.package
+# where 'target' is the target base name (as openoffice or sdkoo)
+# 'language' is the language name (like en-US or fr)
+# 'package' is the package format (like msi or deb)
+
.IF "$(alllangiso)"!=""
+# Add dependencies of basic targets on language specific targets.
openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-
openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
-
ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
-
ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
-
sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
-
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
patch-create: $(foreach,i,$(alllangiso) patch-create_$i)
@@ -201,22 +202,20 @@ adddeps : local_python_files
updatepack : local_python_files
.ENDIF # "$(LOCALPYFILES)"!=""
-
-$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
-openoffice_$(defaultlangiso).archive : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-
+# Add dependencies on 'adddeps' where necessary.
+$(foreach,i,$(alllangiso) openoffice_$i) : adddeps
+openoffice_$(defaultlangiso).archive : adddeps
+$(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
+$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
+$(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoo_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
+
+# Create targets that take the package formats into account. Together with
language dependency we
+# get this transformation: target -> target_$language ->
target_$language.$package
+# where $language ranges over all languages in $(alllangiso)
+# and $package ranges over all package formats in $(PKGFORMAT)
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
@@ -249,7 +248,8 @@ GEN_UPDATE_INFO_COMMAND=
\
--lstfile $(PRJ)$/util$/openoffice.lst \
--languages $(subst,$(@:s/_/ /:1)_, $(@:b))
-openoffice_%{$(PKGFORMAT:^".")} :
+#openoffice_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openoffice_$L.$P))
.PHONY :
$(MAKE_INSTALLER_COMMAND) \
-p Apache_OpenOffice \
-msitemplate $(MSIOFFICETEMPLATEDIR) \
@@ -259,7 +259,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
$(PRJ)$/util$/update.xml \
> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-openoffice_%{.archive} :
+$(foreach,L,$(alllangiso) openoffice_$L.archive) :
$(MAKE_INSTALLER_COMMAND) \
-p Apache_OpenOffice \
-msitemplate $(MSIOFFICETEMPLATEDIR)
@@ -268,10 +268,12 @@ openoffice_%{.archive} :
$(PRJ)$/util$/update.xml \
> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-openofficewithjre_%{$(PKGFORMAT:^".")} :
+#openofficewithjre_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllang
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin
solenv/bin/modules/installer/download.pm | 32 ++
solenv/bin/modules/installer/languages.pm | 25 ++
solenv/bin/modules/installer/patch/InstallationSet.pm |2 -
solenv/bin/modules/installer/patch/Msi.pm | 11 +-
solenv/bin/modules/installer/simplepackage.pm |2 -
solenv/bin/modules/installer/worker.pm|6 ++-
solenv/bin/srcrelease.xml |2 -
solenv/bin/update_module_ignore_lists.pl |4 +-
8 files changed, 57 insertions(+), 27 deletions(-)
New commits:
commit 0bcdf29f92417baed014fca55932727f31260174
Author: Andre Fischer
Date: Mon Dec 9 08:43:20 2013 +
123531: Handle languages that are internally prefixed with 'en-US_'
diff --git a/solenv/bin/modules/installer/languages.pm
b/solenv/bin/modules/installer/languages.pm
index 0b19c1f..260e96c 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -462,4 +462,29 @@ sub get_key_language ($)
}
}
+
+
+
+=head2 get_normalized_language ($language)
+
+Transform "..._" into "".
+The ... part, if it exists, is typically en-US.
+
+If $language does not contain a '_' then $language is returned unmodified.
+
+=cut
+sub get_normalized_language ($)
+{
+my ($language) = @_;
+
+if ($language =~ /^.*?_(.*)$/)
+{
+return $1;
+}
+else
+{
+return $language;
+}
+}
+
1;
diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm
b/solenv/bin/modules/installer/patch/InstallationSet.pm
index e30adc4..876bfb8 100644
--- a/solenv/bin/modules/installer/patch/InstallationSet.pm
+++ b/solenv/bin/modules/installer/patch/InstallationSet.pm
@@ -253,7 +253,7 @@ sub GetUnpackedPath ($)
$package_format,
installer::patch::Version::ArrayToDirectoryName(
installer::patch::Version::StringToNumberArray($version)),
-$language);
+installer::languages::get_normalized_language($language));
}
diff --git a/solenv/bin/modules/installer/patch/Msi.pm
b/solenv/bin/modules/installer/patch/Msi.pm
index 5cefda8..e5b47f6 100644
--- a/solenv/bin/modules/installer/patch/Msi.pm
+++ b/solenv/bin/modules/installer/patch/Msi.pm
@@ -51,7 +51,7 @@ sub FindAndCreate($)
$path = installer::patch::InstallationSet::GetUnpackedExePath(
$version,
$is_current_version,
-$language,
+installer::languages::get_normalized_language($language),
"msi",
$product_name);
@@ -75,6 +75,7 @@ sub FindAndCreate($)
If construction fails then IsValid() will return false.
=cut
+
sub new ($$)
{
my ($class, $filename, $version, $is_current_version, $language,
$product_name) = @_;
@@ -122,6 +123,7 @@ sub IsValid ($)
Write all modified tables back into the databse.
=cut
+
sub Commit ($)
{
my $self = shift;
@@ -159,6 +161,7 @@ sub Commit ($)
call for the same table is very cheap.
=cut
+
sub GetTable ($$)
{
my ($self, $table_name) = @_;
@@ -197,6 +200,7 @@ sub GetTable ($$)
Write the given table back to the databse.
=cut
+
sub PutTable ($$)
{
my ($self, $table) = @_;
@@ -243,6 +247,7 @@ sub PutTable ($$)
to their last modification times (mtime).
=cut
+
sub EnsureAYoungerThanB ($$)
{
my ($filename_a, $filename_b) = @_;
@@ -276,6 +281,7 @@ sub EnsureAYoungerThanB ($$)
Returns long and short name (in this order) as array.
=cut
+
sub SplitLongShortName ($)
{
my ($name) = @_;
@@ -300,6 +306,7 @@ sub SplitLongShortName ($)
table.
=cut
+
sub SplitTargetSourceLongShortName ($)
{
my ($name) = @_;
@@ -322,6 +329,7 @@ sub SplitTargetSourceLongShortName ($)
to hashes that contains short and long source and target names.
=cut
+
sub GetDirectoryMap ($)
{
my ($self) = @_;
@@ -423,6 +431,7 @@ sub GetDirectoryMap ($)
calls but the first are cheap.
=cut
+
sub GetFileMap ($)
{
my ($self) = @_;
commit f63ec98285ba6fbe47927967798a109e62be94c9
Author: Andre Fischer
Date: Mon Dec 9 08:37:41 2013 +
123729: Reapply changes that where accidentally merged out.
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index c7058f4..b7db099 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -733,8 +733,10 @@ sub remove_all_items_with_special_flag
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
if ( $styles =~ /\b$flag\b/ )
{
-my $infoline = "Attention: Removing from collector:
$oneitem->{'Name'} !\n";
-$installer::logger::Lang->print($infoline);
+$installer::logger::Lang->printf(
+"Attention: Removing from collector '%s&#x
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util solenv/bin solenv/inc
instsetoo_native/util/makefile.mk | 18 -
solenv/bin/deliver.pl |5
solenv/bin/macosx-change-install-names.pl |8
solenv/bin/macosx-dylib-link-list.pl |2
solenv/bin/modules/installer/patch/InstallationSet.pm | 53 ++-
solenv/bin/modules/installer/patch/ReleasesList.pm| 237 ---
solenv/bin/modules/macosxotoolhelper.pm |4
solenv/bin/patch_tool.pl | 284 +-
solenv/inc/_tg_app.mk | 43 +-
solenv/inc/tg_app.mk |6
10 files changed, 565 insertions(+), 95 deletions(-)
New commits:
commit c3ff86d01d4a862f036914243663f40e6dcf9172
Author: Andre Fischer
Date: Thu Dec 5 09:10:55 2013 +
123531: patch_tool.pl can now extend releases.xml.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 5e6cc6e..67272a7 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -75,6 +75,7 @@ help .PHONY :
@echo "experimental targets:"
@echo "patch_create create a patch for updating an installed
office (Windows only)"
@echo "patch_applyapply a previously created patch"
+@echo "patch_update_releases_xml"
@echo
@echo "Most targets (all except aoo_srcrelease and updatepack) accept
suffixes"
@echo "add _ to build a target for one language only"
@@ -307,14 +308,25 @@ $(BIN)$/dev$/intro.zip :
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
.IF "$(OS)" == "WNT"
patch_create .PHONY : $(PRJ)$/data
-perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_create.pl \
+perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+create \
--product-name Apache_OpenOffice \
--output-path $(OUT) \
--data-path $(PRJ)$/data \
--lst-file $(PRJ)$/util$/openoffice.lst
patch_apply .PHONY :
-perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_apply.pl \
-
../wntmsci12.pro/Apache_OpenOffice/msp/v-4-0-1_v-4-1-0/en-US/openoffice.msp
+perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+apply \
+--product-name Apache_OpenOffice \
+--output-path $(OUT) \
+--lst-file $(PRJ)$/util$/openoffice.lst
+patch_update_releases_xml .PHONY:
+perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+update-releases-xml\
+--product-name Apache_OpenOffice \
+--output-path $(OUT) \
+--lst-file $(PRJ)$/util$/openoffice.lst\
+--target-version 4.0.1
$(PRJ)$/data :
mkdir $@
diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm
b/solenv/bin/modules/installer/patch/InstallationSet.pm
index 7d6647d..e30adc4 100644
--- a/solenv/bin/modules/installer/patch/InstallationSet.pm
+++ b/solenv/bin/modules/installer/patch/InstallationSet.pm
@@ -304,21 +304,27 @@ sub Download ($$$)
$installer::logger::Info->printf("downloading %s\n", $basename);
$installer::logger::Info->printf("from '%s'\n", $location);
my $filesize = $release_data->{'file-size'};
-$installer::logger::Info->printf("expected size is %d\n", $filesize);
-my $temporary_filename = $filename . ".part";
-my $resume_size = 0;
-if ( -f $temporary_filename)
+if (defined $filesize)
+{
+$installer::logger::Info->printf("expected size is %d\n",
$filesize);
+}
+else
{
-$resume_size = -s $temporary_filename;
-$installer::logger::Info->printf(" trying to resume at %d/%d bytes\n",
$resume_size, $filesize);
+$installer::logger::Info->printf("file size is not yet known\n");
}
+my $temporary_filename = $filename . ".part";
+my $resume_size = 0;
# Prepare checksum.
my $checksum = undef;
my $checksum_type = $release_data->{'checksum-type'};
my $checksum_value = $release_data->{'checksum-value'};
my $digest = undef;
-if ($checksum_type eq "sha256")
+if ( ! defined $checksum_value)
+{
+# No checksum available. Skip test.
+}
+elsif ($checksum_type eq "sha256")
{
$digest = Digest->new("SHA-2
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin vcl/source
solenv/bin/make_installer.pl | 11 --
solenv/bin/modules/installer/control.pm | 11 --
solenv/bin/modules/installer/converter.pm |2
solenv/bin/modules/installer/languages.pm | 109 +-
solenv/bin/modules/installer/packagepool.pm |9 --
solenv/bin/modules/installer/systemactions.pm | 11 --
vcl/source/window/dockwin.cxx |5 +
7 files changed, 106 insertions(+), 52 deletions(-)
New commits:
commit 064c425f69e15091cfd9078ad120447f69f0b021
Author: Andre Fischer
Date: Mon Dec 2 14:16:32 2013 +
123729: Factored out the creation of directory names the depend on build
languages.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1495890..def1bf0 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1645,15 +1645,8 @@ for (;1;last)
if ( $installer::globals::updatepack ) { $logminor =
$installer::globals::lastminor; }
else { $logminor = $installer::globals::minor; }
-my $loglanguagestring = $$languagestringref;
-my $loglanguagestring_orig = $loglanguagestring;
-if (length($loglanguagestring) > $installer::globals::max_lang_length)
-{
-my $number_of_languages =
installer::systemactions::get_number_of_langs($loglanguagestring);
-chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/
.*//g"`);
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-$loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;
-}
+my $loglanguagestring_orig = $$languagestringref;
+my $loglanguagestring =
installer::languages::get_language_directory_name($$languagestringref);
# Setup the directory where the language dependent log file will be stored.
$loggingdir = $loggingdir . $loglanguagestring .
$installer::globals::separator;
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 51edf8d..8db26b2 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -428,16 +428,7 @@ sub determine_ship_directory
my $shipdrive = $ENV{'SHIPDRIVE'};
-my $languagestring = $$languagesref;
-
-if (length($languagestring) > $installer::globals::max_lang_length )
-{
-my $number_of_languages =
installer::systemactions::get_number_of_langs($languagestring);
-chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/
.*//g"`);
-# $languagestring = $shorter;
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-$languagestring = "lang_" . $number_of_languages . "_id_" . $id;
-}
+my $languagestring =
installer::languages::get_language_directory_name($$languagesref);
my $productstring = $installer::globals::product;
my $productsubdir = "";
diff --git a/solenv/bin/modules/installer/converter.pm
b/solenv/bin/modules/installer/converter.pm
index 5ef25e4..c6d2b79 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -305,7 +305,7 @@ sub make_path_conform
sub copy_collector
{
-my ($oldcollector) = @_;
+my ( $oldcollector ) = @_;
my @newcollector = ();
diff --git a/solenv/bin/modules/installer/languages.pm
b/solenv/bin/modules/installer/languages.pm
index 030956d..0b19c1f 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -29,6 +29,10 @@ use installer::exiter;
use installer::globals;
use installer::remover;
use installer::ziplist;
+use Digest::MD5;
+
+use strict;
+
=head2 analyze_languagelist()
@@ -70,6 +74,33 @@ sub analyze_languagelist()
+=head2 get_language_directory_name ($language_string)
+
+Create a directory name that contains the given set of languages.
+When $language_string exceeds a certain length then it is shortened.
+
+=cut
+sub get_language_directory_name ($)
+{
+my ($language_string) = @_;
+
+if (length($language_string) > $installer::globals::max_lang_length)
+{
+my $number_of_languages = ($language_string =~ tr/_//);
+my $digest = new Digest::MD5();
+$digest->add($language_string);
+my $short_digest = substr($digest->hexdigest(), 0, 8);
+return "lang_" . $number_of_languages . "_id_" . $short_digest;
+}
+else
+{
+return $language_string;
+}
+}
+
+
+
+
# Reading languages from zip list file
@@ -123,27 +154,23 @@ sub all_elements_of_array1_in_array2
# All languages defined for one product
#
-sub get_all_languages_for_one_product
-{
-my ( $languagestring, $allvariables ) = @_;
+=head2 g
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin
solenv/bin/make_installer.pl | 92 ---
solenv/bin/modules/installer/globals.pm |5
solenv/bin/modules/installer/scriptitems.pm |6
solenv/bin/modules/installer/windows/directory.pm |1
solenv/bin/modules/installer/windows/property.pm | 12 -
solenv/bin/modules/installer/ziplist.pm | 134 +-
6 files changed, 182 insertions(+), 68 deletions(-)
New commits:
commit 7bb645484e11308be6c6de5b5de7079cd532a662
Author: Andre Fischer
Date: Fri Nov 22 09:36:12 2013 +
123729: Factored out reading of openoffice.lst to its own function.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 400949c..463f2d4f9 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -87,6 +87,58 @@ use installer::worker;
use installer::xpdinstaller;
use installer::ziplist;
+use strict;
+
+sub GetSetupScriptLines ($$$)
+{
+my ($allsettingsarrayref, $allvariableshashref, $includepatharrayref) = @_;
+
+if ($installer::globals::setupscript_defined_in_productlist)
+{
+installer::setupscript::set_setupscript_name($allsettingsarrayref,
$includepatharrayref);
+}
+
+$installer::logger::Info->print( "... analyzing script:
$installer::globals::setupscriptname ... \n" );
+installer::logger::globallog("setup script file:
$installer::globals::setupscriptname");
+$installer::logger::Info->print( "... analyzing script:
$installer::globals::setupscriptname ... \n" );
+
+# Reading the setup script file
+my $setupscriptref =
installer::files::read_file($installer::globals::setupscriptname);
+
+# Resolving variables defined in the zip list file into setup
+# script. All the variables are defined in $allvariablesarrayref
+
installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref,
$allvariableshashref);
+
+# Resolving %variables defined in the installation object
+my $allscriptvariablesref =
installer::setupscript::get_all_scriptvariables_from_installation_object(
+$setupscriptref,
+$installer::globals::setupscriptname);
+
installer::setupscript::add_lowercase_productname_setupscriptvariable($allscriptvariablesref);
+
installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscriptvariablesref);
+
+$setupscriptref =
installer::setupscript::replace_all_setupscriptvariables_in_script(
+$setupscriptref,
+$allscriptvariablesref);
+
+# Adding all variables defined in the installation object into the
+# hash of all variables. This is needed if variables are defined
+# in the installation object, but not in the zip list file. If
+# there is a definition in the zip list file and in the
+# installation object, the installation object is more important
+
installer::setupscript::add_installationobject_to_variables($allvariableshashref,
$allscriptvariablesref);
+
+# Adding also all variables, that must be included into the
$allvariableshashref.
+installer::setupscript::add_forced_properties($allvariableshashref);
+
+# Replacing preset properties, not using the default mechanisms (for
example for UNIXPRODUCTNAME)
+installer::setupscript::replace_preset_properties($allvariableshashref);
+
+# We did this already. Can this or the other one be removed.
+
installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref,
$allvariableshashref);
+
+return $setupscriptref;
+}
+
#
# Main program
#
@@ -334,43 +386,7 @@
installer::control::check_java_for_xpd($allvariableshashref);
# Analyzing the setup script
#
-if ($installer::globals::setupscript_defined_in_productlist) {
installer::setupscript::set_setupscript_name($allsettingsarrayref,
$includepatharrayref); }
-
-installer::logger::globallog("setup script file:
$installer::globals::setupscriptname");
-
-$installer::logger::Info->print( "... analyzing script:
$installer::globals::setupscriptname ... \n" );
-
-my $setupscriptref =
installer::files::read_file($installer::globals::setupscriptname); # Reading
the setup script file
-
-# Resolving variables defined in the zip list file into setup script
-# All the variables are defined in $allvariablesarrayref
-
-installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref,
$allvariableshashref);
-
-# Resolving %variables defined in the installation object
-
-my $allscriptvariablesref =
installer::setupscript::get_all_scriptvariables_from_installation_object($setupscriptref);
-
-installer::setupscript::add_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-
-installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscript
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - autodoc/source instsetoo_native/util solenv/bin
autodoc/source/ary/cpp/namechain.cxx |4 -
autodoc/source/display/html/easywri.cxx|2
autodoc/source/display/inc/toolkit/outputstack.hxx |2
autodoc/source/parser/cpp/sownstck.hxx |4 -
autodoc/source/parser_i/idl/distrib.cxx|2
autodoc/source/parser_i/idl/pe_excp.cxx|2
autodoc/source/parser_i/idl/pe_iface.cxx |2
autodoc/source/parser_i/idl/pe_servi.cxx |2
autodoc/source/parser_i/idl/pe_singl.cxx |2
autodoc/source/parser_i/idl/pe_struc.cxx |2
instsetoo_native/util/openoffice.lst | 44 -
solenv/bin/modules/installer/windows/directory.pm |5 --
12 files changed, 12 insertions(+), 61 deletions(-)
New commits:
commit 28bfac1cfd0d53afb4104ec71cfdab0c9de00e91
Author: Andre Fischer
Date: Thu Nov 21 09:27:16 2013 +
123729: Removed more (now unused) references to building URE.
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 3b0bb5d..0d82994 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -239,48 +239,6 @@ Apache_OpenOffice_Dev
}
}
-URE
-{
-Settings
-{
-downloadname URE_{productversion}_{os}_install_{languages}
-variables
-{
-FULLPRODUCTNAME URE
-PRODUCTNAME URE
-PRODUCTVERSION 4.1.0
-PACKAGEVERSION 4.1
-PACKAGEREVISION 1
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION
-LICENSENAME ALv2
-SETSTATICPATH 1
-NOVERSIONINDIRNAME 1
-PCPFILENAME ure.pcp
-POOLPRODUCT 0
-GLOBALFILEGID gid_File_Dl_Cppu
-DOWNLOADBANNER urebanner.bmp
-DOWNLOADBITMAP urebitmap.bmp
-DOWNLOADSETUPICO ooosetup.ico
-DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
-NOLANGUAGESELECTIONPRODUCT 1
-AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE
-STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
-STARTCENTER_INFO_URL http://www.openoffice.org
-STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
-STARTCENTER_LAYOUT_STYLE 0
-ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,version.lst
-PACKAGEMAP package_names_ext.txt
-DICT_REPO_URL http://extensions.openoffice.org/dictionaries
-}
-active 1
-compression 5
-script ure
-include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS
-}
-}
Apache_OpenOffice_SDK
{
@@ -307,7 +265,6 @@ Apache_OpenOffice_SDK
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
-NOVERSIONINDIRNAME 0
NOSPACEINDIRECTORYNAME 1
NOLANGUAGESELECTIONPRODUCT 1
CHANGETARGETDIR 1
@@ -362,7 +319,6 @@ Apache_OpenOffice_Dev_SDK
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
-NOVERSIONINDIRNAME 0
NOSPACEINDIRECTORYNAME 1
NOLANGUAGESELECTIONPRODUCT 1
CHANGETARGETDIR 1
diff --git a/solenv/bin/modules/installer/windows/directory.pm
b/solenv/bin/modules/installer/windows/directory.pm
index 5c9e5c7..e1ee953 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -468,11 +468,6 @@ sub add_root_directories
$productkey = $productkey . " " .
$allvariableshashref->{'POSTVERSIONEXTENSION'};
$realproductkey = $realproductkey . " " .
$allvariableshashref->{'POSTVERSIONEXTENSION'};
}
-if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} )
-{
-$productkey = $productname;
-$realproductkey = $realproductname;
-}
if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} )
{
$productkey =~ s/\ /\_/g;
commit 0a9937223c150bd685460b0baa0c9803e0a1db39
Author: Jürgen Schmidt
Date: Thu Nov 21 08:11:47 2013 +
#122853# replace slist size>0 with not empty
diff --git a/autodoc/source/ary/cpp/namechain.cxx
b/autodoc/source/ary/cpp/namechain.cxx
index 9a8df2e..549a5c8 100644
--- a/autodoc/source/ary/cpp/namechain.cxx
+++ b/autodoc/source/ary/cpp/namechain.cxx
@@ -129,7 +129,7 @@ NameChain::Add_Segment( const char * i_sSeg )
List_TplParameter &
NameChain::Templatize_LastSegment()
{
-csv_assert( aSegments.size() > 0 );
+csv_assert( ! aSegments.empty() );
return aSegments.back().AddTemplate();
}
@@ -15
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/make_installer.pl| 10 ++---
solenv/bin/modules/installer/control.pm |2 -
solenv/bin/modules/installer/globals.pm |2 -
solenv/bin/modules/installer/languages.pm | 47 ++--
solenv/bin/modules/installer/parameter.pm |3 -
solenv/bin/modules/installer/scriptitems.pm | 14 +++-
6 files changed, 45 insertions(+), 33 deletions(-)
New commits:
commit 44de3926bd631b005ec20b57a576bbee43d7d62a
Author: Andre Fischer
Date: Thu Nov 14 14:03:43 2013 +
123686: Removed support for building multiple languages in one run.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 0837e56..7258912 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -612,10 +612,11 @@ if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::glo
if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1b:
The language dependent part\n"); }
-
-for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
+# Run the following code block exactly once.
+# This strange version of a do{}while(false) loop exists only to allow
(legacy) next statements.
+for (;1;last)
{
-my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
$allvariableshashref);
+my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproduct,
$allvariableshashref);
if ( $installer::globals::globallogging ) {
installer::files::save_file($loggingdir . "languages.log" ,$languagesarrayref);
}
$installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
@@ -2259,8 +2260,7 @@ for ( my $n = 0; $n <=
$#installer::globals::languageproducts; $n++ )
# saving file_info file for later analysis
my $speciallogfilename = "fileinfo_" . $installer::globals::product .
"\.log";
installer::files::save_array_of_hashes($loggingdir . $speciallogfilename,
$filesinproductlanguageresolvedarrayref);
-
-} # end of iteration for one language group
+}
# saving debug info at end
if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::globals::exitlog); }
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index a188073..51edf8d 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -497,7 +497,7 @@ sub check_updatepack
# try to write into $shipdrive
-my $directory = $installer::globals::product . "_" .
$installer::globals::compiler . "_" . $installer::globals::buildid . "_" .
$installer::globals::languageproducts[0] . "_test_$$";
+my $directory = $installer::globals::product . "_" .
$installer::globals::compiler . "_" . $installer::globals::buildid . "_" .
$installer::globals::languageproduct . "_test_$$";
$directory =~ s/\,/\_/g;# for the list of languages
$directory =~ s/\-/\_/g;# for en-US, pt-BR, ...
$directory = $shipdrive . $installer::globals::separator .
$directory;
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index e545da8..de3887e 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -113,7 +113,7 @@ BEGIN
$required_dotnet_version = "2.0.0.0";
$productextension = "";
-@languageproducts = ();
+$languageproduct = undef;
$build = "";
$minor = "";
$lastminor = "";
diff --git a/solenv/bin/modules/installer/languages.pm
b/solenv/bin/modules/installer/languages.pm
index d184ff7..030956d 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -30,31 +30,46 @@ use installer::globals;
use installer::remover;
use installer::ziplist;
-#
-# Analyzing the laguage list parameter and language list from zip list file
-#
+=head2 analyze_languagelist()
-sub analyze_languagelist
-{
-my $first = $installer::globals::languagelist;
+Convert $installer::globals::languagelist into
$installer::globals::languageproduct.
+
+That is now just a replacement of '_' with ','.
+
+$installer::globals::languageproduct (specified by the -l option
+on the command line) can contain multiple languages separated by
+'_' to specify multilingual builds.
-$first =~ s/\_/\,/g;# substituting "_" by ",", in case of
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source
scp2/source/ooo/ure.scp | 71
1 file changed, 71 deletions(-)
New commits:
commit 01a71171575c3d616ea0d2d30992a350f22f21af
Author: Andre Fischer
Date: Wed Nov 13 08:29:37 2013 +
123531: Removed CompID lines (already commented out).
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 5545ab8..c5f9b9d 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -66,7 +66,6 @@ File gid_File_Exe_Uno
//Dir = gid_Dir_Ure_Bin;
Name = EXENAME(uno);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "C66A9E2B-B16D-46A9-B9EC-772D9D3837F5";
End
#endif
@@ -91,7 +90,6 @@ File gid_File_Exe_Regcomp
//Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regcomp);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "D51FA672-7C24-4E24-A282-872C4BF690A1";
End
#endif
@@ -119,7 +117,6 @@ File gid_File_Exe_Regmerge
//Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regmerge);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B";
End
File gid_File_Exe_Regview
@@ -132,7 +129,6 @@ File gid_File_Exe_Regview
//Dir = gid_Dir_Ure_Bin;
Name = EXENAME(regview);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2";
End
#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA && !defined OS2
@@ -142,7 +138,6 @@ File gid_File_Exe_Javaldx
//Dir = gid_Dir_Ure_Bin;
Name = EXENAME(javaldx);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
End
#endif
@@ -159,7 +154,6 @@ File gid_File_Exe_StartupSh
//Dir = gid_Dir_Ure_Bin;
Name = "/ure/startup.sh";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE";
End
#endif
@@ -174,7 +168,6 @@ File gid_File_Exe_UnoBin
//Dir = gid_Dir_Ure_Bin;
Name = "uno.bin";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9";
End
#endif
@@ -189,7 +182,6 @@ File gid_File_Exe_RegcompBin
//Dir = gid_Dir_Ure_Bin;
Name = "regcomp.bin";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "70FBE546-A228-455F-BCBB-716BF03AD5C6";
End
#endif
@@ -200,7 +192,6 @@ File gid_File_Dl_Cppu
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER("cppu", "3");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
End
File gid_File_Dl_Cppuhelper
@@ -212,7 +203,6 @@ File gid_File_Dl_Cppuhelper
Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
End
File gid_File_Dl_PurpEnvHelper
@@ -224,7 +214,6 @@ File gid_File_Dl_PurpEnvHelper
Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
End
File gid_File_Dl_Sal
@@ -232,7 +221,6 @@ File gid_File_Dl_Sal
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER("sal", "3");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End
File gid_File_Dl_Salhelper
@@ -244,25 +232,15 @@ File gid_File_Dl_Salhelper
Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
End
// Private Dynamic Libraries:
-//File gid_File_Dl_Profile_Uno
-//TXT_FILE_BODY;
-//Dir = SCP2_URE_DL_DIR;
-//Name = PROFILENAME(/ure/uno);
-//Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-//// CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
-//End
-
File gid_File_Dl_Reg
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_VER("reg", "3");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
End
File gid_File_Dl_Store
@@ -270,7 +248,6 @@ File gid_File_Dl_Store
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_VER("store", "3");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
End
File gid_File_Dl_Xmlreader
@@ -293,7 +270,6 @@ File gid_File_Dl_Jvmaccess
Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/windows/media.pm | 37 --
solenv/bin/modules/installer/windows/msiglobal.pm |4 +-
3 files changed, 2 insertions(+), 40 deletions(-)
New commits:
commit 41e4096dd00c29aff7dbbac2ab0fad38bc3509bc
Author: Andre Fischer
Date: Tue Nov 12 12:04:47 2013 +
123678: Removed ::globals::one_cab_file
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index f4dcd0f..c5909db 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -420,7 +420,6 @@ BEGIN
$one_cab_file = 0;
$fix_number_of_cab_files = 1;
-$cab_file_per_component = 0;
$cabfilecompressionlevel = 2;
$number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
diff --git a/solenv/bin/modules/installer/windows/media.pm
b/solenv/bin/modules/installer/windows/media.pm
index 0dc57b3..bebacd4 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -304,43 +304,6 @@ sub create_media_table
}
}
-elsif ( $installer::globals::cab_file_per_component )
-{
-for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-{
-my $onefile = ${$filesref}[$i];
-my $nextfile = ${$filesref}[$i+1];
-
-my $filecomponent = "";
-my $nextcomponent = "";
-
-if ( $onefile->{'componentname'} ) { $filecomponent =
$onefile->{'componentname'}; }
-if ( $nextfile->{'componentname'} ) { $nextcomponent =
$nextfile->{'componentname'}; }
-
-if ( $filecomponent eq $nextcomponent )
-{
-next; # nothing to do, this is not the last file of a
component
-}
-
-my %media = ();
-$diskid++;
-
-$media{'DiskId'} = get_media_diskid($diskid);
-$media{'LastSequence'} = get_media_lastsequence($onefile);
-$media{'DiskPrompt'} = get_media_diskprompt();
-$media{'Cabinet'} = get_media_cabinet($diskid);
-$media{'VolumeLabel'} = get_media_volumelabel();
-$media{'Source'} = get_media_source();
-
-my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} .
"\t" . $media{'DiskPrompt'} . "\t"
-. $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t"
. $media{'Source'} . "\n";
-
-push(@mediatable, $oneline);
-
-$media{'Cabinet'} =~ s/^\s*\#//;# removing leading hash
-
set_cabinetfilename_for_component_in_file_collector($media{'Cabinet'},
$filesref, $filecomponent, $i);
-}
-}
elsif ( $installer::globals::fix_number_of_cab_files )
{
# number of cabfiles
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 2434293..e6a1d26 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -259,7 +259,7 @@ sub generate_cab_file_list
push(@installer::globals::allddffiles, $ddffilename);
}
}
-elsif ((( $installer::globals::cab_file_per_component ) || (
$installer::globals::fix_number_of_cab_files )) && (
$installer::globals::updatedatabase ))
+elsif (( $installer::globals::fix_number_of_cab_files ) && (
$installer::globals::updatedatabase ))
{
my $sequenceorder = get_sequenceorder($filesref);
@@ -352,7 +352,7 @@ sub generate_cab_file_list
push(@installer::globals::allddffiles, $ddffilename);
}
}
-elsif (( $installer::globals::cab_file_per_component ) || (
$installer::globals::fix_number_of_cab_files ))
+elsif ( $installer::globals::fix_number_of_cab_files )
{
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/epmfile.pm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a75055eb48ce419ab4bbbd4c975c54b3af09784a Author: Andre Fischer Date: Thu Nov 7 14:38:12 2013 + 123595: RPM output lines need no printf diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index e877595..38cff5d 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2312,7 +2312,7 @@ sub log_rpm_info $infoline = "$rpmout\n"; $infoline =~ s/error/e_r_r_o_r/gi; # avoiding log problems -$installer::logger::Lang->printf($infoline); +$installer::logger::Lang->print($infoline); } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 8 commits - cui/source drawinglayer/source instsetoo_native/util svx/source
cui/source/tabpages/tpbitmap.cxx | 33 +-
drawinglayer/source/processor2d/vclprocessor2d.cxx | 15 -
instsetoo_native/util/makefile.mk | 286 +
svx/source/xoutdev/xattrbmp.cxx|6
4 files changed, 273 insertions(+), 67 deletions(-)
New commits:
commit ebdc37c7a1371d1d6ed75f0c10c1d4cdc88e630f
Author: Andre Fischer
Date: Wed Oct 30 08:34:46 2013 +
123532: Hide one warning about changes of %-target handling in dmake 4.5.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index d28b7cf..c608103 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -203,7 +203,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
# This macro makes calling the make_installer.pl script a bit easier.
# Just add -p and -msitemplate switches.
MAKE_INSTALLER_COMMAND=\
-$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
+@$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl\
-f $(PRJ)$/util$/openoffice.lst\
-l $(subst,$(@:s/_/ /:1)_, $(@:b)) \
-u $(OUT) \
@@ -215,14 +215,23 @@ MAKE_INSTALLER_COMMAND=
\
# This macro makes calling gen_update_info.pl a bit easier
# Just add --product switches, and xml input file and redirect output.
GEN_UPDATE_INFO_COMMAND= \
-$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl\
+@$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl \
--buildid $(BUILD) \
--arch "$(RTL_ARCH)" \
--os "$(RTL_OS)" \
--lstfile $(PRJ)$/util$/openoffice.lst \
--languages $(subst,$(@:s/_/ /:1)_, $(@:b))
-openoffice_%{$(PKGFORMAT:^".") .archive} :
+openoffice_%{$(PKGFORMAT:^".")} :
+$(MAKE_INSTALLER_COMMAND) \
+-p Apache_OpenOffice \
+-msitemplate $(MSIOFFICETEMPLATEDIR)
+$(GEN_UPDATE_INFO_COMMAND) \
+--product Apache_OpenOffice\
+$(PRJ)$/util$/update.xml \
+> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+openoffice_%{.archive} :
$(MAKE_INSTALLER_COMMAND) \
-p Apache_OpenOffice \
-msitemplate $(MSIOFFICETEMPLATEDIR)
commit 440bd20976d8402e3a35dd1694d99f8be68e9701
Author: Andre Fischer
Date: Wed Oct 30 08:32:59 2013 +
123532: Renamed hack_msitemplates target to msitemplates.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index d967598..d28b7cf 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -169,7 +169,7 @@ MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
.IF "$(OS)" == "WNT"
-ADDDEPS+=hack_msitemplates
+ADDDEPS+=msitemplates
.ENDIF
$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
@@ -293,7 +293,7 @@ $(BIN)$/dev$/intro.zip :
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-hack_msitemplates .PHONY: msi_template_files msi_langpack_template_files
msi_sdk_template_files
+msitemplates .PHONY: msi_template_files msi_langpack_template_files
msi_sdk_template_files
MSI_OFFICE_TEMPLATE_FILES= \
ActionTe.idt \
commit 10329bfb1e0c100bdb9d3c947049897b6432b602
Author: Andre Fischer
Date: Wed Oct 30 08:31:19 2013 +
123532: Unhacked the hack_msitemplates target to msitemplates.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 6a58356..d967598 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -293,18 +293,161 @@ $(BIN)$/dev$/intro.zip :
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-hack_msitemplates .PHONY:
--$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
--$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
--$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
--$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
--$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
--$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.*
$(MSIOFFICETEMPLATEDIR)$/Binary
-$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.*
$(MSILANGPACKTEMPLATEDIR)$/Binary
-$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.*
$(MSISDKOOTEMPLATEDIR)$/Binary
-
-
+hack_msitemplates .PHONY: msi_template_files msi_langpack_template_files
msi_s
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source sfx2/inc sfx2/source
sd/source/ui/view/drviews1.cxx |9 +++--
sfx2/inc/sfx2/shell.hxx|4
sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx |9 +
sfx2/source/control/shell.cxx |9 +
sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 16 +++-
5 files changed, 44 insertions(+), 3 deletions(-)
New commits:
commit 520cc667c80cea6bb48422825250b72ff36bb4ef
Author: Andre Fischer
Date: Wed Oct 2 08:52:09 2013 +
123276: Properly forward Deactivate() call and still don't broadcast
context change.
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 56343c5..6dbb4c8 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -53,7 +53,6 @@
#include
#include
-
#include "misc.hxx"
#ifdef STARIMAGE_AVAILABLE
@@ -148,7 +147,13 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli )
void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate)
{
-// Do not forward to ViewShell::Deactivate() to prevent a context change.
+// Temporarily disable context broadcasting while the Deactivate()
+// call is forwarded to our base class.
+const bool bIsContextBroadcasterEnabled
(SfxShell::SetContextBroadcasterEnabled(false));
+
+ViewShell::Deactivate(bIsMDIActivate);
+
+SfxShell::SetContextBroadcasterEnabled(bIsContextBroadcasterEnabled);
}
namespace
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index a358020..2b24048 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -269,6 +269,10 @@ public:
*/
void BroadcastContextForActivation (const bool bIsActivated);
+/** Enabled or disable the context broadcaster. Returns the old state.
+*/
+bool SetContextBroadcasterEnabled (const bool bIsEnabled);
+
#ifndef _SFXSH_HXX
SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
diff --git a/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
b/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
index c103ece..78cea4d 100644
--- a/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
@@ -44,9 +44,18 @@ public:
void Activate (const cssu::Reference& rxFrame);
void Deactivate (const cssu::Reference& rxFrame);
+/** Enable or disable the broadcaster.
+@param bIsEnabled
+The new value of the "enabled" state.
+@return
+The old value of the "enabled" state is returned.
+*/
+bool SetBroadcasterEnabled (const bool bIsEnabled);
+
private:
rtl::OUString msContextName;
bool mbIsContextActive;
+bool mbIsBroadcasterEnabled;
void BroadcastContextChange (
const cssu::Reference& rxFrame,
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index b71bc46..c9ebfb9 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1289,6 +1289,7 @@ void SfxShell::SetViewShell_Impl( SfxViewShell* pView )
+
void SfxShell::BroadcastContextForActivation (const bool bIsActivated)
{
SfxViewFrame* pViewFrame = GetFrame();
@@ -1298,3 +1299,11 @@ void SfxShell::BroadcastContextForActivation (const bool
bIsActivated)
else
pImp->maContextChangeBroadcaster.Deactivate(pViewFrame->GetFrame().GetFrameInterface());
}
+
+
+
+
+bool SfxShell::SetContextBroadcasterEnabled (const bool bIsEnabled)
+{
+return pImp->maContextChangeBroadcaster.SetBroadcasterEnabled(bIsEnabled);
+}
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index dab1b3f..a922358 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -39,7 +39,8 @@ namespace sfx2 { namespace sidebar {
ContextChangeBroadcaster::ContextChangeBroadcaster (void)
: msContextName(),
- mbIsContextActive(false)
+ mbIsContextActive(false),
+ mbIsBroadcasterEnabled(true)
{
}
@@ -85,11 +86,24 @@ void ContextChangeBroadcaster::Deactivate (const
cssu::Reference& rxFrame,
const ::rtl::OUString& rsModuleName,
const ::rtl::OUString& rsContextName)
{
+if ( ! mbIsBroadcasterEnabled)
+return;
+
if (rsContextName.getLength() == 0)
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/DeckLayouter.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4529d6e11a214cec4596a159a60d2b8a5f171697 Author: Andre Fischer Date: Thu Aug 29 07:34:34 2013 + Resolves: #i123091# Request repaints of panels on every deck layouting (cherry picked from commit 98bd1aded3ffa1df24bfec28624bdf5129533c45) Conflicts: sfx2/source/sidebar/DeckLayouter.cxx Change-Id: I7f9b9d0cf3305cafafcb752a5e1da84f341b59c9 diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 37dbd294..fccd797 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -257,6 +257,7 @@ sal_Int32 DeckLayouter::PlacePanels ( // Place the panel. rPanel.setPosSizePixel(0, nY, nWidth, nPanelHeight); +rPanel.Invalidate(); nY += nPanelHeight; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/sidebar/DeckLayouter.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 98bd1aded3ffa1df24bfec28624bdf5129533c45 Author: Andre Fischer Date: Thu Aug 29 07:34:34 2013 + 123091: Request repaints of panels on every deck layouting. diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 7154b52..1bd129a 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -262,6 +262,7 @@ sal_Int32 DeckLayouter::PlacePanels ( // Place the panel. rPanel.SetPosSizePixel(0, nY, nWidth, nPanelHeight); +rPanel.Invalidate(); nY += nPanelHeight; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/introabout desktop/source instsetoo_native/util scp2/source
default_images/introabout/intro.png |binary
desktop/source/splash/splash.cxx | 52 +++
desktop/source/splash/splash.hxx |1
instsetoo_native/util/openoffice.lst |7 ++--
scp2/source/ooo/common_brand.scp |9 ++
5 files changed, 55 insertions(+), 14 deletions(-)
New commits:
commit 143b635b2a73e807fee1574ddaf1e12481d67a0d
Author: Andre Fischer
Date: Thu Jul 11 11:07:44 2013 +
122620: Tweeked the splash screen a little.
diff --git a/default_images/introabout/intro.png
b/default_images/introabout/intro.png
index 80266b4..c8863f4 100755
Binary files a/default_images/introabout/intro.png and
b/default_images/introabout/intro.png differ
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 7546e3e..d6cc4ec 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -55,6 +55,7 @@ SplashScreen::SplashScreen(const Reference<
XMultiServiceFactory >& rSMgr)
: IntroWindow()
, _vdev(*((IntroWindow*)this))
, _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED))
+, _bShowProgressFrame(true)
, _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED))
, _bNativeProgress(true)
, _iMax(100)
@@ -303,6 +304,8 @@ void SplashScreen::loadConfig()
OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) );
OUString sNativeProgress = implReadBootstrapKey(
OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) );
+OUString sShowProgressFrame = implReadBootstrapKey(
+OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowProgressFrame" ) ) );
// Determine full screen splash mode
@@ -334,6 +337,11 @@ void SplashScreen::loadConfig()
}
}
+if (sShowProgressFrame.getLength() > 0)
+{
+_bShowProgressFrame = sShowProgressFrame.toBoolean();
+}
+
if ( sProgressBarColor.getLength() )
{
sal_uInt8 nRed = 0;
@@ -658,18 +666,40 @@ void SplashScreen::Paint( const Rectangle&)
if (_bPaintBitmap)
_vdev.DrawBitmapEx( Point(), _aIntroBmp );
-if (_bPaintProgress) {
+if (_bPaintProgress)
+{
// draw progress...
-long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace);
-if (length < 0) length = 0;
-
-// border
-_vdev.SetFillColor();
-_vdev.SetLineColor( _cProgressFrameColor );
-_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
-_vdev.SetFillColor( _cProgressBarColor );
-_vdev.SetLineColor();
-_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace,
_tlx+_barspace+length, _tly+_barheight-_barspace));
+long length = (_iProgress * _barwidth / _iMax);
+if (_bShowProgressFrame)
+length -= (2 * _barspace);
+if (length < 0)
+length = 0;
+
+if (_bShowProgressFrame)
+{
+// border
+_vdev.SetFillColor();
+_vdev.SetLineColor( _cProgressFrameColor );
+_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth,
_tly+_barheight));
+_vdev.SetFillColor( _cProgressBarColor );
+_vdev.SetLineColor();
+_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace,
_tlx+_barspace+length, _tly+_barheight-_barspace));
+_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth,
_tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
+}
+else
+{
+// Show flat progress bar without frame.
+
+// border
+_vdev.SetFillColor( _cProgressFrameColor );
+_vdev.SetLineColor();
+_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth,
_tly+_barheight));
+
+_vdev.SetFillColor( _cProgressBarColor );
+_vdev.SetLineColor();
+_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+length,
_tly+_barheight));
+}
+
_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth,
_tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
}
Size aSize = GetOutputSizePixel();
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index b312bef..7863d29 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -84,6 +84,7 @@ private:
VirtualDevice _vdev;
BitmapEx_aIntroBmp;
Color _cProgressFrameColor;
+bool_bShowProgressFrame;
Color _cProgressBarColor;
bool_bNativeProgress;
OUString_sAppName;
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 2de02be..815d657 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -20,10 +20,11 @@ Globals
LIBRARYVERSION 10.0.0
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 36
1 file changed, 24 insertions(+), 12 deletions(-)
New commits:
commit 99c3dd415f415126759a6332f78732f886f5a35c
Author: Andre Fischer
Date: Wed Jul 10 08:11:07 2013 +
122709: Set default size of application windows to 80% of the screen size.
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 5ca2a77..977d713 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1244,18 +1244,30 @@ Size GtkSalFrame::calcDefaultSize()
long w = aScreenSize.Width();
long h = aScreenSize.Height();
-// fill in holy default values brought to us by product management
-if( aScreenSize.Width() >= 800 )
-w = 785;
-if( aScreenSize.Width() >= 1024 )
-w = 920;
-
-if( aScreenSize.Height() >= 600 )
-h = 550;
-if( aScreenSize.Height() >= 768 )
-h = 630;
-if( aScreenSize.Height() >= 1024 )
-h = 875;
+
+if (true || aScreenSize.Width() <= 1024)
+{
+// For small screen use the old default values. Original comment:
+// fill in holy default values brought to us by product management
+if( aScreenSize.Width() >= 800 )
+w = 785;
+if( aScreenSize.Width() >= 1024 )
+w = 920;
+
+if( aScreenSize.Height() >= 600 )
+h = 550;
+if( aScreenSize.Height() >= 768 )
+h = 630;
+if( aScreenSize.Height() >= 1024 )
+h = 875;
+}
+else
+{
+// Use the same size calculation as on Mac OSX: 80% of width
+// and height.
+w = static_cast(aScreenSize.Width() * 0.8);
+h = static_cast(aScreenSize.Height() * 0.8);
+}
return Size( w, h );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/Theme.cxx | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit f4c9a29d62a6572a0932d5c8e014b7c960131217 Author: Andre Fischer Date: Tue Jul 9 09:45:08 2013 + Resolves: #122707# Show a frame around toolbars in sidebar panels. (cherry picked from commit f6159d52f0423808eaddc9b5f3906cfc3e6baa0b) Conflicts: sfx2/source/sidebar/Theme.cxx svx/source/sidebar/text/TextPropertyPanel.hrc Change-Id: I0163d3766923a5a333214f09db4837435590d753 diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 5bad8dc..abc4315 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -399,28 +399,32 @@ void Theme::UpdateTheme (void) */ // Gradient style +Color aGradientStop2 (aBaseBackgroundColor); +aGradientStop2.IncreaseLuminance(17); +Color aToolBoxBorderColor (aBaseBackgroundColor); +aToolBoxBorderColor.DecreaseLuminance(12); setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBackground], Any(Tools::VclToAwtGradient(Gradient( GradientStyle_LINEAR, -Color(0xf2f2f2), -Color(0xfefefe) +aBaseBackgroundColor.GetRGBColor(), +aGradientStop2.GetRGBColor() ; setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft], mbIsHighContrastMode ? Any(util::Color(sal_uInt32(0x00ff00))) -: Any(util::Color(sal_uInt32(0xf2f2f2; +: Any(util::Color(aToolBoxBorderColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners], mbIsHighContrastMode ? Any(util::Color(sal_uInt32(0x00ff00))) -: Any(util::Color(sal_uInt32(0xf2f2f2; +: Any(util::Color(aToolBoxBorderColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight], mbIsHighContrastMode ? Any(util::Color(sal_uInt32(0x00ff00))) -: Any(util::Color(sal_uInt32(0xf2f2f2; +: Any(util::Color(aToolBoxBorderColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Rect_ToolBoxPadding], Any(awt::Rectangle(2,2,2,2))); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sfx2/source slideshow/source svx/source wizards/com
sfx2/source/sidebar/Theme.cxx| 14 +-
slideshow/source/engine/slideshowimpl.cxx| 12
svx/source/sidebar/text/TextPropertyPanel.hrc|2 +-
wizards/com/sun/star/wizards/common/NumberFormatter.java |3 ++-
4 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit f6159d52f0423808eaddc9b5f3906cfc3e6baa0b
Author: Andre Fischer
Date: Tue Jul 9 09:45:08 2013 +
122707: Show a frame around toolbars in sidebar panels.
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index cce2663..f9d5132 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -424,28 +424,32 @@ void Theme::UpdateTheme (void)
*/
// Gradient style
+Color aGradientStop2 (aBaseBackgroundColor);
+aGradientStop2.IncreaseLuminance(17);
+Color aToolBoxBorderColor (aBaseBackgroundColor);
+aToolBoxBorderColor.DecreaseLuminance(12);
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBackground],
Any(Tools::VclToAwtGradient(Gradient(
GRADIENT_LINEAR,
-Color(0xf2f2f2),
-Color(0xfefefe)
+aBaseBackgroundColor.GetRGBColor(),
+aGradientStop2.GetRGBColor()
;
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
-: Any(util::Color(sal_uInt32(0xf2f2f2;
+: Any(util::Color(aToolBoxBorderColor.GetRGBColor(;
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
-: Any(util::Color(sal_uInt32(0xf2f2f2;
+: Any(util::Color(aToolBoxBorderColor.GetRGBColor(;
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
-: Any(util::Color(sal_uInt32(0xf2f2f2;
+: Any(util::Color(aToolBoxBorderColor.GetRGBColor(;
setPropertyValue(
maPropertyIdToNameMap[Rect_ToolBoxPadding],
Any(awt::Rectangle(2,2,2,2)));
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hrc
b/svx/source/sidebar/text/TextPropertyPanel.hrc
index e07f6dd..49834ad 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -45,7 +45,7 @@
#define X0 SECTIONPAGE_MARGIN_HORIZONTAL
#define X1 SECTIONPAGE_MARGIN_HORIZONTAL + 1 +
TOOLBOX_ITEM_WIDTH * 2 + 4
#define X2 (PROPERTYPAGE_WIDTH - (FONTSIZE_WIDTH))
-#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 2)
+#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 3)
#define FIRST_LINE_YSECTIONPAGE_MARGIN_VERTICAL_TOP
#define SECOND_LINE_Y FIRST_LINE_Y + CBOX_HEIGHT +
CONTROL_SPACING_VERTICAL + 1
commit 58eca806173ea9ede4efda89a96996d147227473
Author: Armin Le Grand
Date: Tue Jul 9 09:29:13 2013 +
i118671 take emergency exit when local slideshow is disposed from executing
macros
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index 5876b6b..e3c317c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2051,6 +2051,18 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
// process queues
maEventQueue.process();
+
+// #118671# the call above may execute a macro bound to an object.
In
+// that case this macro may have destroyed this local sliseshow so
that it
+// is disposed (see bugdoc at task). In that case, detect this and
exit
+// gently from this slideshow. Do not forget to disable the scoped
+// call to mpPresTimer, this will be deleted if we are disposed.
+if (isDisposed())
+{
+scopeGuard.dismiss();
+return false;
+}
+
maActivitiesQueue.process();
// commit frame to screen
commit 4ddd844cc1f7d8c76f48bd5c434eeda7d5fe1704
Author: Herbert Dürr
Date: Tue Jul 9 08:48:59 2013 +
#i122603# fix database wizard's use of the Numberformatter
Patch by: Tsutomu Uchino
Review by: Herbert Durr
When the setNumberFormat method is called from
DBColumn::initializeNumberFormat
method the number formatter is the document's one and the passed arguments
are from the database column.
Before the format key
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/docnode/nodes.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6bb49f538a9c7474effbff2ab1afdc57df4ab5f6
Author: Andre Fischer
Date: Mon Jul 8 08:11:23 2013 +
122682: Prevent crash when moving nodes.
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index eddef2a..0ff1f8a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -529,10 +529,10 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
SwNodeIndex aNodeIndex (aRg.aEnd);
while (aNodeIndex > aRg.aStart)
{
-SwNode* pNode = rNodes[aNodeIndex.GetIndex()];
-if (pNode->GetNodeType() != ND_ENDNODE)
+SwNode& rNode (aNodeIndex.GetNode());
+if (rNode.GetNodeType() != ND_ENDNODE)
break;
-SwStartNode* pStartNode = pNode->pStartOfSection;
+SwStartNode* pStartNode = rNode.pStartOfSection;
if (pStartNode==NULL)
break;
if ( ! pStartNode->IsTableNode())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin sw/source sysui/desktop
solenv/bin/modules/installer/epmfile.pm | 12 +---
sw/source/core/docnode/nodes.cxx| 24
sysui/desktop/debian/control|4 ++--
3 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 7f250ed4ce273c5d54898a142f07ef93f38c3056
Author: Andre Fischer
Date: Mon Jul 1 15:10:21 2013 +
121479: Prevent crash when loading some RTF documents.
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1150d509..eddef2a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -522,6 +522,30 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
sal_uInt16 nSectNdCnt = 0;
sal_Bool bSaveNewFrms = bNewFrms;
+// Check that the range of nodes to move is valid.
+// This is a very specific test that only checks that table nodes
+// are completely covered by the range. Issue 121479 has a
+// document for which this test fails.
+SwNodeIndex aNodeIndex (aRg.aEnd);
+while (aNodeIndex > aRg.aStart)
+{
+SwNode* pNode = rNodes[aNodeIndex.GetIndex()];
+if (pNode->GetNodeType() != ND_ENDNODE)
+break;
+SwStartNode* pStartNode = pNode->pStartOfSection;
+if (pStartNode==NULL)
+break;
+if ( ! pStartNode->IsTableNode())
+break;
+aNodeIndex = *pStartNode;
+if (aNodeIndex < aRg.aStart.GetIndex())
+{
+return sal_False;
+}
+--aNodeIndex;
+}
+
+
// bis alles verschoben ist
while( aRg.aStart < aRg.aEnd )
switch( (pAktNode = &aRg.aEnd.GetNode())->GetNodeType() )
commit e9991e068f17bbe588b97cdfa07fdd0a3f901f33
Author: Oliver-Rainer Wittmann
Date: Mon Jul 1 14:23:10 2013 +
121968: further changes for the creation of debian packages in order to get
them installed when a former AOO resp. OOo version is installed.
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index cd7ed76..d0efdc0 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -538,23 +538,13 @@ sub create_epm_header
if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g;
} # Debian allows no underline in package name
$line = "%replaces" . " " . $onereplaces . "\n";
push(@epmheader, $line);
-
-# Force the openofficeorg packages to get removed,
-# see
http://www.debian.org/doc/debian-policy/ch-relationships.html
-# 7.5.2 Replacing whole packages, forcing their removal
-
-if ( $installer::globals::debian )
-{
-$line = "%incompat" . " " . $onereplaces . "\n";
-push(@epmheader, $line);
-}
}
if ( $installer::globals::debian &&
$variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
-$line = "%incompat" . " openoffice.org-bundled\n";
+$line = "%replaces" . " openoffice.org-bundled\n";
push(@epmheader, $line);
}
}
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index a1db639..90f0c09 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -2,5 +2,5 @@ Description: %productname desktop integration
Maintainer: Apache Software Foundation
Architecture: all
Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration,
openoffice.org-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration,
openoffice.org-debian-menus
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus,
openoffice.org-bundled, openoffice.org-common
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/resource/conn_shared_res.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53a08b03a88e7f6c387988c01f7c6e2183967176
Author: Andre Fischer
Date: Mon Jul 1 09:18:36 2013 +
122658: Fixed typo in localized string.
Found by: jteera
Reported by: Andrea Pescetti
(cherry picked from commit 8f23dda62c32085f8665483e38345ee13389860e)
diff --git a/connectivity/source/resource/conn_shared_res.src
b/connectivity/source/resource/conn_shared_res.src
index a5133d0..b98a560 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -395,7 +395,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME
};
String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
{
-Text [ en-US ] = "The index could not be created. The size of the chosen
column is to big.";
+Text [ en-US ] = "The index could not be created. The size of the chosen
column is too big.";
};
String STR_SQL_NAME_ERROR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 9813b7fb44a2fb3c8b3c681b973b8b0fcf4639ad Author: Andre Fischer Date: Fri Jun 28 09:11:27 2013 + 121772: Prevent a crash when no plugin filter is present. diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 28383c0..f44ba31 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -767,6 +767,9 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog() aLock.clear(); // <- SYNCHRONIZED +if (lFilters.empty()) +return; + COMDLG_FILTERSPEC *pFilt = &lFilters[0]; iDialog->SetFileTypes(lFilters.size(), pFilt/*&lFilters[0]*/); iDialog->SetFileTypeIndex(nCurrentFilter + 1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - filter/source setup_native/source sw/source
filter/source/msfilter/escherex.cxx | 22 +++
setup_native/source/win32/nsis/ooobanner.bmp |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
sw/source/ui/misc/redlndlg.cxx | 51 ++-
4 files changed, 41 insertions(+), 32 deletions(-)
New commits:
commit 70e8e4f79483c3c31c217c4493361d76af99544f
Author: Andre Fischer
Date: Fri Jun 21 09:52:54 2013 +
121256: Remember Any by value not by pointer before using it in outer scope.
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index d126053..ad10d28 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2707,8 +2707,10 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const rtl::OUString sHandles(
RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
const rtl::OUString sAdjustmentValues (
RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
-const beans::PropertyValue* pAdjustmentValuesProp = NULL;
-const beans::PropertyValue* pPathCoordinatesProp = NULL;
+bool bHasAdjustmentValuesProp = false;
+uno::Any aAdjustmentValuesProp;
+bool bHasPathCoordinatesProp = false;
+uno::Any aPathCoordinatesProp;
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
sal_Bool bPredefinedHandlesUsed = sal_True;
@@ -3157,7 +3159,10 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
else if ( rrProp.Name.equals( sPathCoordinates ) )
{
if ( !bIsDefaultObject )
-pPathCoordinatesProp = &rrProp;
+{
+aPathCoordinatesProp = rrProp.Value;
+bHasPathCoordinatesProp = true;
+}
}
else if ( rrProp.Name.equals( sPathGluePoints ) )
{
@@ -3785,13 +3790,14 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
// it is required, that the information which handle is
polar has already be read,
// so we are able to change the polar value to a fixed
float
-pAdjustmentValuesProp = &rProp;
+aAdjustmentValuesProp = rProp.Value;
+bHasAdjustmentValuesProp = true;
}
}
-if ( pAdjustmentValuesProp )
+if ( bHasAdjustmentValuesProp )
{
uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
-if ( pAdjustmentValuesProp->Value >>= aAdjustmentSeq )
+if ( aAdjustmentValuesProp >>= aAdjustmentSeq )
{
if ( bPredefinedHandlesUsed )
LookForPolarHandles( eShapeType,
nAdjustmentsWhichNeedsToBeConverted );
@@ -3802,10 +3808,10 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( (sal_uInt16)( DFF_Prop_adjustValue + k ),
(sal_uInt32)nValue );
}
}
-if( pPathCoordinatesProp )
+if( bHasPathCoordinatesProp )
{
com::sun::star::uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates;
-if ( pPathCoordinatesProp->Value >>= aCoordinates )
+if ( aPathCoordinatesProp >>= aCoordinates )
{
// creating the vertices
if ( (sal_uInt16)aCoordinates.getLength() )
commit 1cf0f678f41407016388e17e75fb3f073b2febe6
Author: Oliver-Rainer Wittmann
Date: Fri Jun 21 08:59:33 2013 +
121435: Change Tracking - Accept and Reject dialog - on accessing redline
by index assure that index has valid value
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index a3779ad..eb275d3 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -350,7 +350,7 @@ void SwRedlineAcceptDlg::InitAuthors()
pFilterPage->ClearAuthors();
String sParent;
-sal_uInt16 nCount = pSh->GetRedlineCount();
+const sal_uInt16 nRedlineCount = pSh->GetRedlineCount();
bOnlyFormatedRedlines = sal_True;
bHasReadonlySel = sal_False;
@@ -358,7 +358,7 @@ void SwRedlineAcceptDlg::InitAuthors()
sal_uInt16 i;
// Autoren ermitteln
-for ( i = 0; i < nCount; i++)
+for ( i = 0; i < nRedlineCou
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/bastyp/index.cxx | 71 ++--
1 file changed, 54 insertions(+), 17 deletions(-)
New commits:
commit 5acb8675672007b3d5c581027825edd5b81c9945
Author: Andre Fischer
Date: Fri Jun 21 08:02:43 2013 +
120250: Fixed removal of item from linked list SwIndexReg.
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 12437c5..63cc8be 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -42,29 +42,45 @@ TYPEINIT0(SwIndexReg); // rtti
#ifdef CHK
-#define IDX_CHK_ARRAY pArray->ChhkArr();
-#define ARR_CHK_ARRAY ChhkArr();
-
+#define IDX_CHK_ARRAY pArray->ChkArr();
+#define AR R_CHK_ARRAY ChkArr();
void SwIndexReg::ChkArr()
{
-ASSERT( (pFirst && pLast) || (!pFirst && !pLast),
-"Array falsch Indiziert" );
+if ( ! ((pFirst && pLast) || (!pFirst && !pLast)))
+{
+ASSERT(false, "array not correctly indexed");
+}
if( !pFirst )
return;
xub_StrLen nVal = 0;
const SwIndex* pIdx = pFirst, *pPrev = 0;
-ASSERT( !pIdx->pPrev, "Array-pFirst nicht am Anfang" );
+if ( ! (!pIdx->pPrev))
+{
+ASSERT(false, "array-pFirst not at beginning");
+}
while( pIdx != pLast )
{
-ASSERT( pIdx->pPrev != pIdx && pIdx->pNext != pIdx,
-"Index zeigt auf sich selbst" )
+if ( ! (pIdx->pPrev != pIdx && pIdx->pNext != pIdx))
+{
+ASSERT(false, "index points to itself");
+}
-ASSERT( pIdx->nIndex >= nVal, "Reihenfolge stimmt nicht" );
-ASSERT( pPrev == pIdx->pPrev, "Verkettung stimmt nicht" );
+if ( ! (pIdx->nIndex >= nVal))
+{
+ASSERT(false, "wrong order");
+}
+if ( ! (pPrev == pIdx->pPrev))
+{
+ASSERT(false, "wrong array pointers");
+}
+if ( ! (this == pIdx->pArray))
+{
+ASSERT(false, "wrong array/child relationship");
+}
pPrev = pIdx;
pIdx = pIdx->pNext;
nVal = pPrev->nIndex;
@@ -224,16 +240,37 @@ IDX_CHK_ARRAY
void SwIndex::Remove()
{
-if( !pPrev )
-pArray->pFirst = pNext;
-else
-pPrev->pNext = pNext;
+if (pArray->pFirst==NULL && pArray->pLast==NULL)
+{
+// The index object is not a member of its list and therefore
+// can not be removed.
+return;
+}
-if( !pNext )
-pArray->pLast = pPrev;
+if (pPrev==NULL && pNext==NULL)
+{
+// Removing last element in list.
+pArray->pFirst = NULL;
+pArray->pLast = NULL;
+}
else
-pNext->pPrev = pPrev;
+{
+if( !pPrev )
+{
+OSL_ASSERT(pNext!=NULL);
+pArray->pFirst = pNext;
+}
+else
+pPrev->pNext = pNext;
+if( !pNext )
+{
+OSL_ASSERT(pPrev!=NULL);
+pArray->pLast = pPrev;
+}
+else
+pNext->pPrev = pPrev;
+}
IDX_CHK_ARRAY
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/prj desktop/source scp2/source sw/source
desktop/prj/d.lst |3
desktop/source/app/app.cxx |2
desktop/source/deployment/gui/deploymentgui.map | 28 ++
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 71 --
desktop/source/deployment/gui/dp_gui_handleversionexception.cxx | 111
++
desktop/source/deployment/gui/dp_gui_service.cxx|4
desktop/source/deployment/gui/makefile.mk | 16 -
desktop/source/deployment/inc/dp_gui.mk |6
desktop/source/inc/dp_gui_api.hxx | 36 +++
desktop/source/inc/dp_gui_handleversionexception.hxx| 17 -
desktop/source/migration/services/oo3extensionmigration.cxx |4
scp2/source/ooo/file_library_ooo.scp|8
sw/source/filter/ww8/rtfexport.cxx | 15 +
13 files changed, 230 insertions(+), 91 deletions(-)
New commits:
commit e14095bc3b573f2c48c996fa2cb58226280d5e87
Author: Andre Fischer
Date: Wed Jun 19 15:26:41 2013 +
122398: Fixed Mac and Linux build breaker.
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 1535275..074f2c3 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -74,6 +74,9 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
..\%__SRC%\bin\depl*.dll %_DEST%\bin%_EXT%\depl*.dll
..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib%_EXT%\deployment*.uno.so
..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib%_EXT%\deployment*.uno.dylib
+..\%__SRC%\bin\deploymentgui*.dll %_DEST%\bin%_EXT%\deploymentgui*.dll
+..\%__SRC%\lib\libdeploymentgui*.uno.so
%_DEST%\lib%_EXT%\libdeploymentgui*.uno.so
+..\%__SRC%\lib\libdeploymentgui*.uno.dylib
%_DEST%\lib%_EXT%\libdeploymentgui*.uno.dylib
..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin%_EXT%\deploymentmisc*.dll
..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib%_EXT%\libdeploymentmisc*.so
..\%__SRC%\lib\libdeploymentmisc*.dylib
%_DEST%\lib%_EXT%\libdeploymentmisc*.dylib
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 30f1992..9eb1985 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -802,7 +802,7 @@ void MinimalCommandEnv::handle(
if ( xRequest->getRequest() >>= verExc )
{
// user interaction, if an extension is already been installed.
-bApprove = dp_gui::handleVersionException( verExc );
+bApprove = handleVersionException( verExc );
}
const css::uno::Sequence< css::uno::Reference<
css::task::XInteractionContinuation > > conts( xRequest->getContinuations());
diff --git a/desktop/source/deployment/gui/deploymentgui.map
b/desktop/source/deployment/gui/deploymentgui.map
new file mode 100644
index 000..ecf7bd2
--- /dev/null
+++ b/desktop/source/deployment/gui/deploymentgui.map
@@ -0,0 +1,28 @@
+###
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###
+UDK_3_0_0 {
+global:
+component_getImplementationEnvironment;
+component_getFactory;
+handleVersionException;
+local:
+*;
+};
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index ca0dbc4..a0e2008 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -26,6 +26,7 @@
+#include
#include "sal/config.h"
@@ -105,20 +106,6 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-namespace {
-
-OUString getVersion( OUString const & sVersion )
-{
-return ( sVersion.getLength() == 0 ) ? OUString(
RTL_CONSTASCII_USTRINGPARAM( "0" ) ) : sVersion;
-}
-
-OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
-{
-return getVersion( rPackage->getVersion());
-}
-}
-
-
namespace dp_gui {
//==
@@ -360,62 +347
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - filter/source
filter/source/msfilter/msdffimp.cxx | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 05703e43389312f7e9856733fcb7384122047631
Author: Andre Fischer
Date: Tue Jul 10 10:01:05 2012 +
bnc#823049 #i119872# Fixed import of custom shapes from PPT.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 5278c7770a350771a96780c0e0d7a0bdae0d55b9)
Signed-off-by: Miklos Vajna
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index c2b67c5..33a5b99 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2253,23 +2253,24 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
{
rIn >> nTmp;
nCommand = EnhancedCustomShapeSegmentCommand::UNKNOWN;
-nCnt = (sal_Int16)( nTmp & 0xfff );
-switch( nTmp >> 12 )
+nCnt = (sal_Int16)( nTmp & 0x1fff );//Last 13 bits for
segment points number
+switch( nTmp >> 13 )//First 3 bits for command type
{
case 0x0: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break;
-case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break; //
seems to the relative lineto
-case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break; //
seems to be the relative curveto
-case 0x8: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
-case 0x6: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
-case 0xa:
-case 0xb:
+case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
+case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
+case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
+case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
+case 0x5:
+case 0x6:
{
-switch ( ( nTmp >> 8 ) & 0xf )
+switch ( ( nTmp >> 8 ) & 0x1f )//5 bits next to
command type is for path escape type
{
case 0x0:
{
+//It is msopathEscapeExtension which is
transformed into LINETO.
+//If issue happens, I think this part can
be comment so that it will be taken as unknow command.
+//When export, origin data will be export
without any change.
nCommand =
EnhancedCustomShapeSegmentCommand::LINETO;
if ( !nCnt )
nCnt = 1;
___
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' - 2 commits - sfx2/source svx/source
sfx2/source/view/viewsh.cxx |1 +
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |9 +
2 files changed, 10 insertions(+)
New commits:
commit cc2e15f2c86097d6a6076badb49663a0e2dba08d
Author: Andre Fischer
Date: Wed Jun 12 13:15:45 2013 +
Related: #i122453# Initialize and update units of PosSize panel spin fields
(cherry picked from commit 5d8bbe5fe43f94d1c29dda7f1e6e06668a304f78)
Change-Id: Ibfcca05efddbcee9983ac4d6bc75703234ea6d67
(cherry picked from commit 4ea968a7b051e4e0f6febeb9996ed7689b08672f)
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index fdba30f..5854e36 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -716,6 +716,11 @@ void PosSizePropertyPanel::NotifyItemUpdate(
else
mbAdjustEnabled = false;
+// Pool unit and dialog unit may have changed, make sure that we
+// have the current values.
+mePoolUnit = maTransfWidthControl.GetCoreMetric();
+meDlgUnit = GetModuleFieldUnit();
+
switch (nSID)
{
case SID_ATTR_TRANSFORM_WIDTH:
@@ -728,6 +733,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldWidth1 = pWidthItem->GetValue();
mlOldWidth1 = Fraction( mlOldWidth1 ) / maUIScale;
+SetFieldUnit( *mpMtrWidth, meDlgUnit, true );
SetMetricValue( *mpMtrWidth, mlOldWidth1, mePoolUnit );
mlOldWidth = mlOldWidth1;
break;
@@ -747,6 +753,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldHeight1 = pHeightItem->GetValue();
mlOldHeight1 = Fraction( mlOldHeight1 ) / maUIScale;
+SetFieldUnit( *mpMtrHeight, meDlgUnit, true );
SetMetricValue( *mpMtrHeight, mlOldHeight1, mePoolUnit );
mlOldHeight = mlOldHeight1;
break;
@@ -765,6 +772,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+SetFieldUnit( *mpMtrPosX, meDlgUnit, true );
SetMetricValue( *mpMtrPosX, nTmp, mePoolUnit );
break;
}
@@ -782,6 +790,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+SetFieldUnit( *mpMtrPosY, meDlgUnit, true );
SetMetricValue( *mpMtrPosY, nTmp, mePoolUnit );
break;
}
commit 97b0dc25007a0ee6728ec9a1079c0616c1783dc6
Author: Andre Fischer
Date: Wed Jun 12 13:14:18 2013 +
Related: #i122453# Invalidate slot servers for all view shells...
on OLE deactivation
(cherry picked from commit f7f162aef22b025b0d0ffcd0bf0c5eead74143d0)
Conflicts:
sfx2/source/view/viewsh.cxx
Change-Id: Ia44ab98e273d3360b4d8ff2f2582cb04b4d43415
(cherry picked from commit 10b26c9af2f15b1634ba26c5d7c9382f7680beea)
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 9c1d0f2..0ac1b20 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -913,6 +913,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient*
/*pClient*/ )
pFrame->GetDispatcher()->Update_Impl( sal_True );
pFrame->GetBindings().HidePopups(sal_False);
+pFrame->GetBindings().InvalidateAll(sal_True);
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source
sfx2/source/view/viewsh.cxx |1 +
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |9 +
2 files changed, 10 insertions(+)
New commits:
commit 4ea968a7b051e4e0f6febeb9996ed7689b08672f
Author: Andre Fischer
Date: Wed Jun 12 13:15:45 2013 +
Related: #i122453# Initialize and update units of PosSize panel spin fields
(cherry picked from commit 5d8bbe5fe43f94d1c29dda7f1e6e06668a304f78)
Change-Id: Ibfcca05efddbcee9983ac4d6bc75703234ea6d67
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index fdba30f..5854e36 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -716,6 +716,11 @@ void PosSizePropertyPanel::NotifyItemUpdate(
else
mbAdjustEnabled = false;
+// Pool unit and dialog unit may have changed, make sure that we
+// have the current values.
+mePoolUnit = maTransfWidthControl.GetCoreMetric();
+meDlgUnit = GetModuleFieldUnit();
+
switch (nSID)
{
case SID_ATTR_TRANSFORM_WIDTH:
@@ -728,6 +733,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldWidth1 = pWidthItem->GetValue();
mlOldWidth1 = Fraction( mlOldWidth1 ) / maUIScale;
+SetFieldUnit( *mpMtrWidth, meDlgUnit, true );
SetMetricValue( *mpMtrWidth, mlOldWidth1, mePoolUnit );
mlOldWidth = mlOldWidth1;
break;
@@ -747,6 +753,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldHeight1 = pHeightItem->GetValue();
mlOldHeight1 = Fraction( mlOldHeight1 ) / maUIScale;
+SetFieldUnit( *mpMtrHeight, meDlgUnit, true );
SetMetricValue( *mpMtrHeight, mlOldHeight1, mePoolUnit );
mlOldHeight = mlOldHeight1;
break;
@@ -765,6 +772,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+SetFieldUnit( *mpMtrPosX, meDlgUnit, true );
SetMetricValue( *mpMtrPosX, nTmp, mePoolUnit );
break;
}
@@ -782,6 +790,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+SetFieldUnit( *mpMtrPosY, meDlgUnit, true );
SetMetricValue( *mpMtrPosY, nTmp, mePoolUnit );
break;
}
commit 10b26c9af2f15b1634ba26c5d7c9382f7680beea
Author: Andre Fischer
Date: Wed Jun 12 13:14:18 2013 +
Related: #i122453# Invalidate slot servers for all view shells...
on OLE deactivation
(cherry picked from commit f7f162aef22b025b0d0ffcd0bf0c5eead74143d0)
Conflicts:
sfx2/source/view/viewsh.cxx
Change-Id: Ia44ab98e273d3360b4d8ff2f2582cb04b4d43415
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 9c1d0f2..0ac1b20 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -913,6 +913,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient*
/*pClient*/ )
pFrame->GetDispatcher()->Update_Impl( sal_True );
pFrame->GetBindings().HidePopups(sal_False);
+pFrame->GetBindings().InvalidateAll(sal_True);
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sfx2/source svx/source
sfx2/source/view/viewsh.cxx |4
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |9 +
2 files changed, 13 insertions(+)
New commits:
commit 5d8bbe5fe43f94d1c29dda7f1e6e06668a304f78
Author: Andre Fischer
Date: Wed Jun 12 13:15:45 2013 +
122453: Initialize and update units of PosSize panel spin fields.
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 1ebece0..d093d0b 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -720,6 +720,11 @@ void PosSizePropertyPanel::NotifyItemUpdate(
else
mbAdjustEnabled = false;
+// Pool unit and dialog unit may have changed, make sure that we
+// have the current values.
+mePoolUnit = maTransfWidthControl.GetCoreMetric();
+meDlgUnit = GetModuleFieldUnit();
+
switch (nSID)
{
case SID_ATTR_TRANSFORM_WIDTH:
@@ -732,6 +737,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldWidth1 = pWidthItem->GetValue();
mlOldWidth1 = Fraction( mlOldWidth1 ) / maUIScale;
+SetFieldUnit( *mpMtrWidth, meDlgUnit, true );
SetMetricValue( *mpMtrWidth, mlOldWidth1, mePoolUnit );
mlOldWidth = mlOldWidth1;
break;
@@ -751,6 +757,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldHeight1 = pHeightItem->GetValue();
mlOldHeight1 = Fraction( mlOldHeight1 ) / maUIScale;
+SetFieldUnit( *mpMtrHeight, meDlgUnit, true );
SetMetricValue( *mpMtrHeight, mlOldHeight1, mePoolUnit );
mlOldHeight = mlOldHeight1;
break;
@@ -769,6 +776,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+SetFieldUnit( *mpMtrPosX, meDlgUnit, true );
SetMetricValue( *mpMtrPosX, nTmp, mePoolUnit );
break;
}
@@ -786,6 +794,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+SetFieldUnit( *mpMtrPosY, meDlgUnit, true );
SetMetricValue( *mpMtrPosY, nTmp, mePoolUnit );
break;
}
commit f7f162aef22b025b0d0ffcd0bf0c5eead74143d0
Author: Andre Fischer
Date: Wed Jun 12 13:14:18 2013 +
122453: Invalidate slot servers for all view shells on OLE deactivation.
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2009b0c..28f3925 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -988,6 +988,10 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient*
/*pClient*/ )
// uno::Reference < frame::XFramesSupplier > xParentFrame(
xOwnFrame->getCreator(), uno::UNO_QUERY );
// if ( xParentFrame.is() )
// xParentFrame->setActiveFrame( uno::Reference < frame::XFrame >() );
+
+// Make sure that slot servers are initialized or updated after
+// an OLE object is deactivated.
+pFrame->GetBindings().InvalidateAll(sal_True);
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/inc sd/sdi sd/source sfx2/inc sfx2/Library_sfx.mk sfx2/Package_inc.mk sfx2/source svtools/source vcl/inc vcl/source
sd/inc/app.hrc |2
sd/sdi/ViewShellBase.sdi |5
sd/sdi/sdraw.sdi | 27 --
sd/source/ui/app/sdmod1.cxx| 11
sd/source/ui/framework/tools/FrameworkHelper.cxx | 51
sd/source/ui/inc/framework/FrameworkHelper.hxx | 19 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 11
sd/source/ui/table/tablefunction.cxx | 10
sd/source/ui/view/GraphicViewShellBase.cxx |1
sd/source/ui/view/ViewShellBase.cxx| 50
sd/source/ui/view/ViewShellImplementation.cxx | 25 --
sd/source/ui/view/drviews6.cxx | 22 +
sfx2/Library_sfx.mk|1
sfx2/Package_inc.mk|1
sfx2/inc/sfx2/sidebar/Sidebar.hxx | 60 +
sfx2/source/sidebar/AsynchronousCall.cxx |9
sfx2/source/sidebar/AsynchronousCall.hxx |1
sfx2/source/sidebar/Sidebar.cxx| 65 ++---
sfx2/source/sidebar/Sidebar.hxx| 68 -
sfx2/source/sidebar/SidebarController.cxx | 66 -
sfx2/source/sidebar/SidebarController.hxx | 23 +-
sfx2/source/sidebar/SidebarDockingWindow.hxx |1
sfx2/source/sidebar/TabBar.cxx | 12 -
svtools/source/control/ctrlbox.cxx | 14 -
svtools/source/control/valueset.cxx| 14 -
vcl/inc/vcl/bitmap.hxx | 30 --
vcl/inc/vcl/bitmapex.hxx | 32 ++
vcl/source/control/ilstbox.cxx | 32 +-
vcl/source/gdi/bitmap4.cxx | 194 -
vcl/source/gdi/bitmapex.cxx| 149 +
vcl/source/gdi/outdev2.cxx |9
31 files changed, 428 insertions(+), 587 deletions(-)
New commits:
commit 7b26aba94e5544937f1e37e34915bcb276bc3c27
Author: Andre Fischer
Date: Wed Jun 5 15:40:56 2013 +
122470: Fixed programmatic triggered switching of sidebar decks.
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 5d8bcd4..5abda4c 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -487,7 +487,7 @@
#define SID_TP_USE_FOR_NEW_PRESENTATIONS(SID_SD_START+427)
#define SID_TP_SHOW_LARGE_PREVIEW (SID_SD_START+428)
#define SID_TP_SHOW_SMALL_PREVIEW (SID_SD_START+429)
-#define SID_SHOW_TOOL_PANEL (SID_SD_START+430)
+// SID_SD_START+430 is unused
#define SID_INSERT_MASTER_PAGE (SID_SD_START+431)
#define SID_DELETE_MASTER_PAGE (SID_SD_START+432)
#define SID_RENAME_MASTER_PAGE (SID_SD_START+433)
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 341ba23..833ce9d 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -82,11 +82,6 @@ interface ViewShellBaseView
ExecMethod = Execute;
StateMethod = GetState;
]
-SID_SHOW_TOOL_PANEL
-[
-ExecMethod = Execute;
-StateMethod = GetState;
-]
SID_WIN_FULLSCREEN
[
ExecMethod = Execute;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index e7907b4..b1cfb38 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -7366,30 +7366,3 @@ SfxBoolItem SlideSorterMultiPaneGUI
SID_SLIDE_SORTER_MULTI_PANE_GUI
ToolBoxConfig = TRUE,
GroupId = GID_MODIFY;
]
-
-SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
-SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE,
-SfxUInt32Item PanelId ID_VAL_PANEL_INDEX)
-[
-/* flags: */
-AutoUpdate = TRUE,
-Cachable = Cachable,
-FastCall = FALSE,
-HasCoreId = FALSE,
-HasDialog = FALSE,
-ReadOnlyDoc = FALSE,
-Toggle = FALSE,
-Container = TRUE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Synchron;
-
-/* config: */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-StatusBarConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = GID_VIEW;
-]
-
-
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 5b9901c..2934033 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -746,17 +746,6 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
}
}
}
-
-if (bMakeLayoutVisible && pViewFrame!=NULL)
-{
-// Make the layout menu visible in the tool pane.
-::sd::ViewShellBase* pBase =
::sd::ViewShellBase::GetViewShellBase(pViewFrame);
-if (pBase != NULL)
-{
-FrameworkHelper::Instance(*pBase)->RequestSidebarPanel(
-FrameworkHelper::msLayoutTaskPanelURL);
-}
-}
}
return pFrame;
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5cafdf1970b28303e6842e6b794f8b23d98ee4e9 Author: Andre Fischer Date: Wed Jun 5 07:14:01 2013 + 122446: Fixed typo. diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 5beceeb..a9aa589 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -498,10 +498,10 @@ void ParaPropertyPanel::InitToolBoxSpacing() // See issue 122446 for more details. maTbxUL_IncDec->SetItemImage( BT_TBX_UL_INC, - sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(BT_TBX_UL_INC), mxFrame)); + sfx2::sidebar::Tools::GetImage(maTbxUL_IncDec->GetItemCommand(BT_TBX_UL_INC), mxFrame)); maTbxUL_IncDec->SetItemImage( BT_TBX_UL_DEC, - sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(BT_TBX_UL_DEC), mxFrame)); + sfx2::sidebar::Tools::GetImage(maTbxUL_IncDec->GetItemCommand(BT_TBX_UL_DEC), mxFrame)); aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl ); maTbxUL_IncDec->SetSelectHdl(aLink); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - filter/source
filter/source/msfilter/msdffimp.cxx | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
New commits:
commit e0413e9da0687d381bac4a7275c56c529f6552cd
Author: Andre Fischer
Date: Tue Jul 10 10:01:05 2012 +
bnc#823049 #i119872# Fixed import of custom shapes from PPT.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 5278c7770a350771a96780c0e0d7a0bdae0d55b9)
Signed-off-by: Miklos Vajna
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index c2b67c5..33a5b99 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2253,23 +2253,24 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
{
rIn >> nTmp;
nCommand = EnhancedCustomShapeSegmentCommand::UNKNOWN;
-nCnt = (sal_Int16)( nTmp & 0xfff );
-switch( nTmp >> 12 )
+nCnt = (sal_Int16)( nTmp & 0x1fff );//Last 13 bits for
segment points number
+switch( nTmp >> 13 )//First 3 bits for command type
{
case 0x0: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break;
-case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break; //
seems to the relative lineto
-case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
-case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break; //
seems to be the relative curveto
-case 0x8: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
-case 0x6: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
-case 0xa:
-case 0xb:
+case 0x1: nCommand =
EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
+case 0x2: nCommand =
EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
+case 0x3: nCommand =
EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
+case 0x4: nCommand =
EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
+case 0x5:
+case 0x6:
{
-switch ( ( nTmp >> 8 ) & 0xf )
+switch ( ( nTmp >> 8 ) & 0x1f )//5 bits next to
command type is for path escape type
{
case 0x0:
{
+//It is msopathEscapeExtension which is
transformed into LINETO.
+//If issue happens, I think this part can
be comment so that it will be taken as unknow command.
+//When export, origin data will be export
without any change.
nCommand =
EnhancedCustomShapeSegmentCommand::LINETO;
if ( !nCnt )
nCnt = 1;
___
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' - 2 commits - include/sfx2 sd/source sfx2/source
include/sfx2/sidebar/ControllerItem.hxx |5
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |1
sfx2/source/sidebar/ControllerItem.cxx | 19
3 files changed, 25 insertions(+)
New commits:
commit a1929fb6282e33770bced4c6a1cd9e0760947f9f
Author: Andre Fischer
Date: Mon Jun 3 12:33:38 2013 +
Resolves: #i122433# The sidebar ControllerItem can now...
give access to the extended help text for commands
(cherry picked from commit 3f483a9219b9135f9f854d62b4ad0512d3752660)
Conflicts:
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
Change-Id: I22668e6f9c1c7aed174a43d7d3e04829dc6733ae
Related: #i122433# fix build breaker
invalid use of incomplete type 'struct Help'
(cherry picked from commit 797e399967ffb1c28b8c32d328f5f57d79a8caf3)
Change-Id: Ifde6fede9b91eb828c665a5a720b93171108e17b
(cherry picked from commit 3b55196fb07c9101f0f0f51895a8083cbf5e78fc)
diff --git a/include/sfx2/sidebar/ControllerItem.hxx
b/include/sfx2/sidebar/ControllerItem.hxx
index 61d21ba..70b4c3d 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -100,6 +100,11 @@ public:
*/
::rtl::OUString GetLabel (void) const;
+/** Return the extended help text for the command.
+Returns an empty string when the UNO command name is not available.
+*/
+::rtl::OUString GetHelpText (void) const;
+
/** Return the icon for the command.
*/
Image GetIcon (void) const;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx
b/sfx2/source/sidebar/ControllerItem.cxx
index 5abc109..eb22a18 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -25,6 +25,7 @@
#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include
#include
+#include
#include
#include
@@ -202,6 +203,23 @@ void ControllerItem::ResetFrame (void)
+::rtl::OUString ControllerItem::GetHelpText (void) const
+{
+Help* pHelp = Application::GetHelp();
+if (pHelp != NULL)
+{
+if (msCommandName.getLength() > 0)
+{
+const ::rtl::OUString sHelp
(pHelp->GetHelpText(A2S(".uno:")+msCommandName, NULL));
+return sHelp;
+}
+}
+return ::rtl::OUString();
+}
+
+
+
+
Image ControllerItem::GetIcon (void) const
{
return GetImage(mxFrame, A2S(".uno:")+msCommandName, sal_False);
@@ -218,6 +236,7 @@
ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16
nIndex)
{
rToolBox.SetQuickHelpText(nIndex, GetLabel());
+rToolBox.SetHelpText(nIndex, GetHelpText());
rToolBox.SetItemImage(nIndex, GetIcon());
}
commit ebacea41751ed59b53a76aec70dddfd2d88aae84
Author: Andre Fischer
Date: Mon Jun 3 10:38:19 2013 +
Resolves: #i122437# Fixed context notification for Draw documents
(cherry picked from commit 88914c616747693083819ec44ea81c9d96fa5136)
Change-Id: I6d5c7365cfe51ba7c6ce57f589264aac8b066742
(cherry picked from commit b269b4ee7c44ec33e63838412bdf4d2a0e1b4887)
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index e9c627f..b32b4a2 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -567,6 +567,7 @@ void SlideSorterViewShell::Activate (sal_Bool
bIsMDIActivate)
case ViewShell::ST_IMPRESS:
case ViewShell::ST_SLIDE_SORTER:
case ViewShell::ST_NOTES:
+case ViewShell::ST_DRAW:
eContext = EnumContext::Context_DrawPage;
if (pMainViewShell->ISA(DrawViewShell))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - cppcanvas/source include/sfx2 include/ucbhelper sd/source sfx2/source ucbhelper/source ucb/source
cppcanvas/source/mtfrenderer/implrenderer.cxx | 14 ++
include/sfx2/sidebar/ControllerItem.hxx |5 +
include/ucbhelper/fd_inputstream.hxx| 35 ++-
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |1
sfx2/source/sidebar/ControllerItem.cxx | 19 +++
ucb/source/ucp/ftp/ftpcfunc.cxx | 16 +--
ucb/source/ucp/ftp/ftpcfunc.hxx |2
ucb/source/ucp/ftp/ftpurl.cxx | 26 +++--
ucb/source/ucp/ftp/ftpurl.hxx |4
ucbhelper/source/provider/fd_inputstream.cxx| 79 ++--
10 files changed, 111 insertions(+), 90 deletions(-)
New commits:
commit 3b55196fb07c9101f0f0f51895a8083cbf5e78fc
Author: Andre Fischer
Date: Mon Jun 3 12:33:38 2013 +
Resolves: #i122433# The sidebar ControllerItem can now...
give access to the extended help text for commands
(cherry picked from commit 3f483a9219b9135f9f854d62b4ad0512d3752660)
Conflicts:
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
Change-Id: I22668e6f9c1c7aed174a43d7d3e04829dc6733ae
Related: #i122433# fix build breaker
invalid use of incomplete type 'struct Help'
(cherry picked from commit 797e399967ffb1c28b8c32d328f5f57d79a8caf3)
Change-Id: Ifde6fede9b91eb828c665a5a720b93171108e17b
diff --git a/include/sfx2/sidebar/ControllerItem.hxx
b/include/sfx2/sidebar/ControllerItem.hxx
index 61d21ba..70b4c3d 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -100,6 +100,11 @@ public:
*/
::rtl::OUString GetLabel (void) const;
+/** Return the extended help text for the command.
+Returns an empty string when the UNO command name is not available.
+*/
+::rtl::OUString GetHelpText (void) const;
+
/** Return the icon for the command.
*/
Image GetIcon (void) const;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx
b/sfx2/source/sidebar/ControllerItem.cxx
index 5abc109..eb22a18 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -25,6 +25,7 @@
#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include
#include
+#include
#include
#include
@@ -202,6 +203,23 @@ void ControllerItem::ResetFrame (void)
+::rtl::OUString ControllerItem::GetHelpText (void) const
+{
+Help* pHelp = Application::GetHelp();
+if (pHelp != NULL)
+{
+if (msCommandName.getLength() > 0)
+{
+const ::rtl::OUString sHelp
(pHelp->GetHelpText(A2S(".uno:")+msCommandName, NULL));
+return sHelp;
+}
+}
+return ::rtl::OUString();
+}
+
+
+
+
Image ControllerItem::GetIcon (void) const
{
return GetImage(mxFrame, A2S(".uno:")+msCommandName, sal_False);
@@ -218,6 +236,7 @@
ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16
nIndex)
{
rToolBox.SetQuickHelpText(nIndex, GetLabel());
+rToolBox.SetHelpText(nIndex, GetHelpText());
rToolBox.SetItemImage(nIndex, GetIcon());
}
commit b269b4ee7c44ec33e63838412bdf4d2a0e1b4887
Author: Andre Fischer
Date: Mon Jun 3 10:38:19 2013 +
Resolves: #i122437# Fixed context notification for Draw documents
(cherry picked from commit 88914c616747693083819ec44ea81c9d96fa5136)
Change-Id: I6d5c7365cfe51ba7c6ce57f589264aac8b066742
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index a215952..319371b 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -567,6 +567,7 @@ void SlideSorterViewShell::Activate (sal_Bool
bIsMDIActivate)
case ViewShell::ST_IMPRESS:
case ViewShell::ST_SLIDE_SORTER:
case ViewShell::ST_NOTES:
+case ViewShell::ST_DRAW:
eContext = EnumContext::Context_DrawPage;
if (pMainViewShell->ISA(DrawViewShell))
{
commit 8de6167e36506a5cba21f6a35d4f064e9c9ea368
Author: Ariel Constenla-Haile
Date: Sat Jun 1 17:16:49 2013 +
Resolves: #i122273# - Avoid using tmpfile()
(cherry picked from commit c4ef17d5e2844ca8d2459a3bfa1f91d99ac297f2)
Conflicts:
ucb/source/ucp/ftp/ftpcfunc.cxx
ucb/source/ucp/ftp/ftpinpstr.cxx
ucb/source/ucp/ftp/ftpinpstr.hxx
ucb/source/ucp/ftp/ftpurl.cxx
Change-Id: I267a9191f9b922380bef8653ac74543662ebf3ef
diff --git a/include/ucbhelper/fd_inputstream.hxx
b/include/ucbhelper/fd_inputstream.hxx
index df3d6e3..6246af0 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -22,23 +22,26 @@
#include
#include
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/inc sfx2/source
sfx2/inc/sfx2/sidebar/ControllerItem.hxx |5 +
sfx2/source/sidebar/ControllerItem.cxx | 18 ++
2 files changed, 23 insertions(+)
New commits:
commit 3f483a9219b9135f9f854d62b4ad0512d3752660
Author: Andre Fischer
Date: Mon Jun 3 12:33:38 2013 +
122433: The sidebar ControllerItem can now give access to the extended help
text for commands.
diff --git a/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
b/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
index 0641e38..0d53b01 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
@@ -103,6 +103,11 @@ public:
*/
::rtl::OUString GetLabel (void) const;
+/** Return the extended help text for the command.
+Returns an empty string when the UNO command name is not available.
+*/
+::rtl::OUString GetHelpText (void) const;
+
/** Return the icon for the command. Uses the system high contrast mode
state.
*/
Image GetIcon (void) const;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx
b/sfx2/source/sidebar/ControllerItem.cxx
index a4b6a08..1455232 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -208,6 +208,23 @@ void ControllerItem::ResetFrame (void)
+::rtl::OUString ControllerItem::GetHelpText (void) const
+{
+Help* pHelp = Application::GetHelp();
+if (pHelp != NULL)
+{
+if (msCommandName.getLength() > 0)
+{
+const ::rtl::OUString sHelp
(pHelp->GetHelpText(A2S(".uno:")+msCommandName, NULL));
+return sHelp;
+}
+}
+return ::rtl::OUString();
+}
+
+
+
+
Image ControllerItem::GetIcon (void) const
{
return
GetIcon(Application::GetSettings().GetStyleSettings().GetHighContrastMode());
@@ -228,6 +245,7 @@ Image ControllerItem::GetIcon (const bool
bIsHighContrastMode) const
void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16
nIndex)
{
rToolBox.SetQuickHelpText(nIndex, GetLabel());
+rToolBox.SetHelpText(nIndex, GetHelpText());
rToolBox.SetItemImage(nIndex, GetIcon());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/setsdkenv_windows.template sd/source
odk/setsdkenv_windows.template | 22 +++-
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |1
2 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 88914c616747693083819ec44ea81c9d96fa5136
Author: Andre Fischer
Date: Mon Jun 3 10:38:19 2013 +
122437: Fixed context notification for Draw documents.
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 0bed381..46895c0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -567,6 +567,7 @@ void SlideSorterViewShell::Activate (sal_Bool
bIsMDIActivate)
case ViewShell::ST_IMPRESS:
case ViewShell::ST_SLIDE_SORTER:
case ViewShell::ST_NOTES:
+case ViewShell::ST_DRAW:
eContext = EnumContext::Context_DrawPage;
if (pMainViewShell->ISA(DrawViewShell))
{
commit ec3d57252111792c7cf5dbc13966b426c0a5b8fa
Author: Jürgen Schmidt
Date: Mon Jun 3 10:11:15 2013 +
#122356# add mistakenly removed licene header
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index eb04beb..501a2f8 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,5 +1,25 @@
@echo off
-Rem This script sets all enviroment variables, which
+REM *
+REM
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License")rem you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REMhttp://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM
+REM *
+REM This script sets all enviroment variables, which
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cui/source helpcontent2 sfx2/Library_sfx.mk sfx2/source
cui/source/inc/helpid.hrc |2
helpcontent2 |2
sfx2/Library_sfx.mk|2
sfx2/source/sidebar/Accessible.cxx | 63 ++
sfx2/source/sidebar/Accessible.hxx | 70 +
sfx2/source/sidebar/AccessibleTitleBar.cxx | 67 +++
sfx2/source/sidebar/AccessibleTitleBar.hxx | 49
sfx2/source/sidebar/DeckTitleBar.cxx | 11
sfx2/source/sidebar/DeckTitleBar.hxx |1
sfx2/source/sidebar/PanelTitleBar.cxx | 21 +---
sfx2/source/sidebar/PanelTitleBar.hxx |2
sfx2/source/sidebar/TitleBar.cxx | 32 -
sfx2/source/sidebar/TitleBar.hxx |5 +-
13 files changed, 302 insertions(+), 25 deletions(-)
New commits:
commit 8502b8006fdf03d2bc634f53490200f853474867
Author: Andre Fischer
Date: Fri May 31 09:03:08 2013 +
Resolves: #i122271# FOCUSABLE flag at accessibility object sidebar title
bars
so that bridges create focus events and title bars become visible
to AT devices.
(cherry picked from commit 6055c2b50b36a0fc1b26c18b030827e3e08a51fc)
Conflicts:
sfx2/source/sidebar/TitleBar.cxx
Change-Id: If863c2c9d5ba19ba627639b294a430869f245abd
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 03775fd..aefe3a2 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -233,6 +233,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/sidebar/SidebarController \
sfx2/source/sidebar/SidebarPanelBase \
sfx2/source/sidebar/SidebarToolBox \
+sfx2/source/sidebar/Accessible \
+sfx2/source/sidebar/AccessibleTitleBar \
sfx2/source/sidebar/AsynchronousCall \
sfx2/source/sidebar/CommandInfoProvider \
sfx2/source/sidebar/Context \
diff --git a/sfx2/source/sidebar/Accessible.cxx
b/sfx2/source/sidebar/Accessible.cxx
new file mode 100644
index 000..13d52aa
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "Accessible.hxx"
+
+
+using namespace css;
+using namespace cssu;
+
+
+namespace sfx2 { namespace sidebar {
+
+
+Accessible::Accessible (
+const Reference& rxContext)
+: AccessibleInterfaceBase(m_aMutex),
+ mxContext(rxContext)
+{
+}
+
+
+
+
+Accessible::~Accessible (void)
+{
+}
+
+
+
+
+void SAL_CALL Accessible::disposing (void)
+{
+Reference xComponent (mxContext, UNO_QUERY);
+if (xComponent.is())
+xComponent->dispose();
+}
+
+
+
+
+Reference SAL_CALL
Accessible::getAccessibleContext (void)
+throw (cssu::RuntimeException)
+{
+return mxContext;
+}
+
+
+} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Accessible.hxx
b/sfx2/source/sidebar/Accessible.hxx
new file mode 100644
index 000..d6b8584
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_ACCESSIBLE_HXX
+#define SFX_SIDEBAR_ACCESSIBLE_HXX
+
+#include
+
+#include
+#include
+
+#include
+#include
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace
+{
+typedef ::cppu::WeakComponentImplHelper1 <
+css::accessibility::XAcces
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/sidebar/Accessible.cxx | 68 +++
sfx2/source/sidebar/Accessible.hxx | 72 +
sfx2/source/sidebar/AccessibleTitleBar.cxx | 72 +
sfx2/source/sidebar/AccessibleTitleBar.hxx | 53 +
4 files changed, 265 insertions(+)
New commits:
commit 488befaed6d5203d8a6e1c9e986caa5d342f5b40
Author: Andre Fischer
Date: Fri May 31 11:29:01 2013 +
122271: Added missing files.
diff --git a/sfx2/source/sidebar/Accessible.cxx
b/sfx2/source/sidebar/Accessible.cxx
new file mode 100644
index 000..19fb8f6
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -0,0 +1,68 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "precompiled_sfx2.hxx"
+
+#include "Accessible.hxx"
+
+
+using namespace css;
+using namespace cssu;
+
+
+namespace sfx2 { namespace sidebar {
+
+
+Accessible::Accessible (
+const Reference& rxContext)
+: AccessibleInterfaceBase(m_aMutex),
+ mxContext(rxContext)
+{
+}
+
+
+
+
+Accessible::~Accessible (void)
+{
+}
+
+
+
+
+void SAL_CALL Accessible::disposing (void)
+{
+Reference xComponent (mxContext, UNO_QUERY);
+if (xComponent.is())
+xComponent->dispose();
+}
+
+
+
+
+Reference SAL_CALL
Accessible::getAccessibleContext (void)
+throw (cssu::RuntimeException)
+{
+return mxContext;
+}
+
+
+} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Accessible.hxx
b/sfx2/source/sidebar/Accessible.hxx
new file mode 100644
index 000..6209c27
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -0,0 +1,72 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#ifndef SFX_SIDEBAR_ACCESSIBLE_HXX
+#define SFX_SIDEBAR_ACCESSIBLE_HXX
+
+#include
+#include
+
+#include
+#include
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace
+{
+typedef ::cppu::WeakComponentImplHelper1 <
+css::accessibility::XAccessible
+> AccessibleInterfaceBase;
+}
+
+namespace sfx2 { namespace sidebar {
+
+
+/** Simple implementation of the XAccessible interface.
+Its getAccessibleContext() method returns a context object given
+to its constructor.
+*/
+class Accessible
+: private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public AccessibleInterfaceBase
+{
+public:
+Accessible (
+const cssu::Reference&
rxContext);
+virtual ~Accessible (void);
+
+virtual void SAL_CALL disposing (void);
+
+
+// XAccessible
+virtual cssu::Reference SAL_CALL
getAccessibleContext (void)
+throw (cssu::RuntimeException);
+
+private:
+cssu::Reference mxContext;
+};
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx
b/sfx2/source/sidebar/AccessibleTitleBar.cxx
new file mode 100644
index 000..39f2cb6
--- /dev/null
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -0,0 +1,72 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (AS
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/Library_sfx.mk sfx2/source
sfx2/Library_sfx.mk |2 ++
sfx2/source/sidebar/DeckTitleBar.cxx | 11 +++
sfx2/source/sidebar/DeckTitleBar.hxx |1 +
sfx2/source/sidebar/PanelTitleBar.cxx | 21 +
sfx2/source/sidebar/PanelTitleBar.hxx |2 ++
sfx2/source/sidebar/TitleBar.cxx | 32
sfx2/source/sidebar/TitleBar.hxx |5 +++--
7 files changed, 52 insertions(+), 22 deletions(-)
New commits:
commit 6055c2b50b36a0fc1b26c18b030827e3e08a51fc
Author: Andre Fischer
Date: Fri May 31 09:03:08 2013 +
122271: Setting FOCUSABLE flag at accessibility object sidebar title bars
so that bridges create focus events and title bars become visible
to AT devices.
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 5341571..38625ca 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -218,6 +218,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/sidebar/SidebarController \
sfx2/source/sidebar/SidebarPanelBase \
sfx2/source/sidebar/SidebarToolBox \
+sfx2/source/sidebar/Accessible \
+sfx2/source/sidebar/AccessibleTitleBar \
sfx2/source/sidebar/AsynchronousCall \
sfx2/source/sidebar/CommandInfoProvider \
sfx2/source/sidebar/Context \
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 8e0c450..bd9e86c 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -139,6 +139,17 @@ void DeckTitleBar::HandleToolBoxItemClick (const
sal_uInt16 nItemIndex)
+cssu::Reference
DeckTitleBar::CreateAccessible (void)
+{
+const ::rtl::OUString sAccessibleName(msTitle);
+SetAccessibleName(sAccessibleName);
+SetAccessibleDescription(sAccessibleName);
+return TitleBar::CreateAccessible();
+}
+
+
+
+
void DeckTitleBar::DataChanged (const DataChangedEvent& rEvent)
{
maToolBox.SetItemImage(
diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx
b/sfx2/source/sidebar/DeckTitleBar.hxx
index dfc5e9c..f75aad9 100644
--- a/sfx2/source/sidebar/DeckTitleBar.hxx
+++ b/sfx2/source/sidebar/DeckTitleBar.hxx
@@ -49,6 +49,7 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void);
virtual Color GetTextColor (void);
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
+virtual cssu::Reference CreateAccessible
(void);
private:
const sal_uInt16 mnCloserItemIndex;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 4917412..a8d1048 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -35,7 +35,6 @@
#include
#include
-
using namespace css;
using namespace cssu;
@@ -55,16 +54,11 @@ PanelTitleBar::PanelTitleBar (
mpPanel(pPanel),
mnMenuItemIndex(1),
mxFrame(),
- msMoreOptionsCommand()
+ msMoreOptionsCommand(),
+
msAccessibleNamePrefix(String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX)))
{
OSL_ASSERT(mpPanel != NULL);
-const ::rtl::OUString sAccessibleName(
-String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX))
-+ rsTitle);
-SetAccessibleName(sAccessibleName);
-SetAccessibleDescription(sAccessibleName);
-
#ifdef DEBUG
SetText(A2S("PanelTitleBar"));
#endif
@@ -195,6 +189,17 @@ void PanelTitleBar::HandleToolBoxItemClick (const
sal_uInt16 nItemIndex)
+Reference PanelTitleBar::CreateAccessible (void)
+{
+const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle);
+SetAccessibleName(sAccessibleName);
+SetAccessibleDescription(sAccessibleName);
+return TitleBar::CreateAccessible();
+}
+
+
+
+
void PanelTitleBar::MouseButtonDown (const MouseEvent& rMouseEvent)
{
if (rMouseEvent.IsLeft())
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx
b/sfx2/source/sidebar/PanelTitleBar.hxx
index 517d759..426f087 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -56,6 +56,7 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void);
virtual Color GetTextColor (void);
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
+virtual cssu::Reference CreateAccessible
(void);
private:
bool mbIsLeftButtonDown;
@@ -63,6 +64,7 @@ private:
const sal_uInt16 mnMenuItemIndex;
cssu::Reference mxFrame;
::rtl::OUString msMoreOptionsCommand;
+::rtl::OUString msAccessibleNamePrefix;
};
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index d04dd4f..c2e01bf 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -23,11 +23,16 @@
#include "TitleBar.hxx"
#include "Paint.hxx"
+#include "Accessible.hxx"
+#include "AccessibleTitleBar.hxx"
#include
#include
#include
+#include
+
+
ToolbarValue::~T
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 636b7e64bd803f2355bfcc56680d41832ccc4a6b
Author: Andre Fischer
Date: Thu May 30 08:59:30 2013 +
Resolves: #i122380# Use quick help text as accessible name...
for some paragraph panel controls
(cherry picked from commit 3f1d43bd6d7a2c5841ad3b0fbcd417393df74329)
Conflicts:
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Change-Id: Ic1fdbf1bfa5c04e844c03e6909fef41b76e6c6c5
(cherry picked from commit d7609ad71524207b847f07e7df9bea1c24fb3b70)
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 9bf443b..88d29c9 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -402,6 +402,10 @@ void ParaPropertyPanel::InitToolBoxIndent()
maRightIndent->SetModifyHdl( aLink );
maFLineIndent->SetModifyHdl( aLink );
+maLeftIndent->SetAccessibleName(maLeftIndent->GetQuickHelpText());
+maRightIndent->SetAccessibleName(maRightIndent->GetQuickHelpText());
+maFLineIndent->SetAccessibleName(maFLineIndent->GetQuickHelpText());
+
if( Application::GetSettings().GetLayoutRTL())
{
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1,
maIncIndentControl.GetIcon());
@@ -467,6 +471,9 @@ void ParaPropertyPanel::InitToolBoxSpacing()
maTopDist->SetModifyHdl(aLink);
maBottomDist->SetModifyHdl( aLink );
+maTopDist->SetAccessibleName(maTopDist->GetQuickHelpText());
+maBottomDist->SetAccessibleName(maBottomDist->GetQuickHelpText());
+
maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM1, maParInc);
maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM2, maParDec);
aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit d7609ad71524207b847f07e7df9bea1c24fb3b70
Author: Andre Fischer
Date: Thu May 30 08:59:30 2013 +
Resolves: #i122380# Use quick help text as accessible name...
for some paragraph panel controls
(cherry picked from commit 3f1d43bd6d7a2c5841ad3b0fbcd417393df74329)
Conflicts:
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Change-Id: Ic1fdbf1bfa5c04e844c03e6909fef41b76e6c6c5
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 9bf443b..88d29c9 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -402,6 +402,10 @@ void ParaPropertyPanel::InitToolBoxIndent()
maRightIndent->SetModifyHdl( aLink );
maFLineIndent->SetModifyHdl( aLink );
+maLeftIndent->SetAccessibleName(maLeftIndent->GetQuickHelpText());
+maRightIndent->SetAccessibleName(maRightIndent->GetQuickHelpText());
+maFLineIndent->SetAccessibleName(maFLineIndent->GetQuickHelpText());
+
if( Application::GetSettings().GetLayoutRTL())
{
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1,
maIncIndentControl.GetIcon());
@@ -467,6 +471,9 @@ void ParaPropertyPanel::InitToolBoxSpacing()
maTopDist->SetModifyHdl(aLink);
maBottomDist->SetModifyHdl( aLink );
+maTopDist->SetAccessibleName(maTopDist->GetQuickHelpText());
+maBottomDist->SetAccessibleName(maBottomDist->GetQuickHelpText());
+
maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM1, maParInc);
maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM2, maParDec);
aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl );
___
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' - 2 commits - sfx2/source
sfx2/source/sidebar/Panel.cxx |7 ---
sfx2/source/sidebar/SidebarController.cxx | 60 ++
sfx2/source/sidebar/SidebarController.hxx | 16 ++--
3 files changed, 42 insertions(+), 41 deletions(-)
New commits:
commit f73f1d2ecbe5629ded2bc840fb9b9bd5ec86fe01
Author: Andre Fischer
Date: Wed May 29 15:57:18 2013 +
Resolves: #i122394# Force creation of new sidebar panels on DATACHANGED
events
(cherry picked from commit c726a12e1833af2f06858e5a797bcbd03bf9e996)
Conflicts:
sfx2/source/sidebar/SidebarController.cxx
(cherry picked from commit 10480649244213a6346bdb52192580f0b4ad6804)
Conflicts:
sfx2/source/sidebar/SidebarController.cxx
Change-Id: Ie28ff4371e42fd57534eeca75dab1a4bfda2ead6
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 43b7194..7c883da 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -106,6 +106,7 @@ SidebarController::SidebarController (
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
+ mnRequestedForceFlags(SwitchFlag_NoForce),
msCurrentDeckId(gsDefaultDeckId),
msCurrentDeckTitle(),
maPropertyChangeForwarder(::boost::bind(&SidebarController::BroadcastPropertyChange,
this)),
@@ -260,7 +261,7 @@ void SAL_CALL SidebarController::statusChanged (const
css::frame::FeatureStateEv
// Force the current deck to update its panel list.
if ( ! mbIsDocumentReadOnly)
msCurrentDeckId = gsDefaultDeckId;
-maCurrentContext = Context();
+mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
maContextChangeUpdate.RequestCall();
}
}
@@ -381,7 +382,8 @@ void SidebarController::ProcessNewWidth (const sal_Int32
nNewWidth)
void SidebarController::UpdateConfigurations (void)
{
-if (maCurrentContext != maRequestedContext)
+if (maCurrentContext != maRequestedContext
+|| mnRequestedForceFlags!=SwitchFlag_NoForce)
{
maCurrentContext = maRequestedContext;
@@ -461,7 +463,9 @@ void SidebarController::OpenThenSwitchToDeck (
void SidebarController::SwitchToDeck (
const ::rtl::OUString& rsDeckId)
{
-if ( ! msCurrentDeckId.equals(rsDeckId) || ! mbIsDeckOpen)
+if ( ! msCurrentDeckId.equals(rsDeckId)
+|| ! mbIsDeckOpen
+|| mnRequestedForceFlags!=SwitchFlag_NoForce)
{
const DeckDescriptor* pDeckDescriptor =
ResourceManager::Instance().GetDeckDescriptor(rsDeckId);
if (pDeckDescriptor != NULL)
@@ -478,7 +482,12 @@ void SidebarController::SwitchToDeck (
{
maFocusManager.Clear();
-if ( ! msCurrentDeckId.equals(rDeckDescriptor.msId))
+const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
+const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
+mnRequestedForceFlags = SwitchFlag_NoForce;
+
+if ( ! msCurrentDeckId.equals(rDeckDescriptor.msId)
+|| bForceNewDeck)
{
// When the deck changes then destroy the deck and all panels
// and create everything new.
@@ -552,10 +561,20 @@ void SidebarController::SwitchToDeck (
// Find the corresponding panel among the currently active
// panels.
-SharedPanelContainer::const_iterator iPanel (::std::find_if(
+SharedPanelContainer::const_iterator iPanel;
+if (bForceNewPanels)
+{
+// All panels have to be created in any case. There is no
+// point in searching already existing panels.
+iPanel = rCurrentPanels.end();
+}
+else
+{
+iPanel = ::std::find_if(
rCurrentPanels.begin(),
rCurrentPanels.end(),
-::boost::bind(&Panel::HasIdPredicate, _1,
::boost::cref(rPanelContexDescriptor.msId;
+::boost::bind(&Panel::HasIdPredicate, _1,
::boost::cref(rPanelContexDescriptor.msId)));
+}
if (iPanel != rCurrentPanels.end())
{
// Panel already exists in current deck. Reuse it.
@@ -564,7 +583,8 @@ void SidebarController::SwitchToDeck (
}
else
{
-// Panel does not yet exist. Create it.
+// Panel does not yet exist or creation of new panels is forced.
+// Create it.
aNewPanels[nWriteIndex] = CreatePanel(
rPanelContexDescriptor.msId,
mpCurrentDeck->GetPanelParentWindow(),
@@ -615,30 +635,6 @@ void SidebarController::SwitchToDeck (
-bool SidebarController::ArePanelSetsEqual (
-const SharedPanelContainer& rCurrentPanels,
-const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels)
-{
-if (rCurrentPanels.size() != rRequestedPanels.size())
-
[Libreoffice-commits] core.git: 2 commits - sfx2/source
sfx2/source/sidebar/Panel.cxx |7 ---
sfx2/source/sidebar/SidebarController.cxx | 60 ++
sfx2/source/sidebar/SidebarController.hxx | 16 ++--
3 files changed, 42 insertions(+), 41 deletions(-)
New commits:
commit 7e1c66163287eef13253d20639b9b2c78abf2580
Author: Andre Fischer
Date: Wed May 29 13:19:17 2013 +
Resolves: #i122405# Sidebar panels no longer dispose...
XUIElement's inner objects
(cherry picked from commit 3464c3499e708370359a9c0864bd4edc76d3a4c0)
Change-Id: I860e09fe2436bb8a08458e4f49fb88f05d34dbd8
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 3b81121..309dc04 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -86,13 +86,6 @@ void Panel::Dispose (void)
{
mxPanelComponent = NULL;
-if (mxElement.is())
-{
-Reference xComponent (mxElement->getRealInterface(),
UNO_QUERY);
-if (xComponent.is())
-xComponent->dispose();
-}
-
{
Reference xComponent (mxElement, UNO_QUERY);
mxElement = NULL;
commit 10480649244213a6346bdb52192580f0b4ad6804
Author: Andre Fischer
Date: Wed May 29 15:57:18 2013 +
Resolves: #i122394# Force creation of new sidebar panels on DATACHANGED
events
(cherry picked from commit c726a12e1833af2f06858e5a797bcbd03bf9e996)
Conflicts:
sfx2/source/sidebar/SidebarController.cxx
Change-Id: Ie28ff4371e42fd57534eeca75dab1a4bfda2ead6
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index a2efa70..bce2f6f 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -106,6 +106,7 @@ SidebarController::SidebarController (
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
+ mnRequestedForceFlags(SwitchFlag_NoForce),
msCurrentDeckId(gsDefaultDeckId),
msCurrentDeckTitle(),
maPropertyChangeForwarder(::boost::bind(&SidebarController::BroadcastPropertyChange,
this)),
@@ -260,7 +261,7 @@ void SAL_CALL SidebarController::statusChanged (const
css::frame::FeatureStateEv
// Force the current deck to update its panel list.
if ( ! mbIsDocumentReadOnly)
msCurrentDeckId = gsDefaultDeckId;
-maCurrentContext = Context();
+mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
maContextChangeUpdate.RequestCall();
}
}
@@ -381,7 +382,8 @@ void SidebarController::ProcessNewWidth (const sal_Int32
nNewWidth)
void SidebarController::UpdateConfigurations (void)
{
-if (maCurrentContext != maRequestedContext)
+if (maCurrentContext != maRequestedContext
+|| mnRequestedForceFlags!=SwitchFlag_NoForce)
{
maCurrentContext = maRequestedContext;
@@ -461,7 +463,9 @@ void SidebarController::OpenThenSwitchToDeck (
void SidebarController::SwitchToDeck (
const ::rtl::OUString& rsDeckId)
{
-if ( ! msCurrentDeckId.equals(rsDeckId) || ! mbIsDeckOpen)
+if ( ! msCurrentDeckId.equals(rsDeckId)
+|| ! mbIsDeckOpen
+|| mnRequestedForceFlags!=SwitchFlag_NoForce)
{
const DeckDescriptor* pDeckDescriptor =
ResourceManager::Instance().GetDeckDescriptor(rsDeckId);
if (pDeckDescriptor != NULL)
@@ -478,7 +482,12 @@ void SidebarController::SwitchToDeck (
{
maFocusManager.Clear();
-if ( ! msCurrentDeckId.equals(rDeckDescriptor.msId))
+const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
+const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
+mnRequestedForceFlags = SwitchFlag_NoForce;
+
+if ( ! msCurrentDeckId.equals(rDeckDescriptor.msId)
+|| bForceNewDeck)
{
// When the deck changes then destroy the deck and all panels
// and create everything new.
@@ -552,10 +561,20 @@ void SidebarController::SwitchToDeck (
// Find the corresponding panel among the currently active
// panels.
-SharedPanelContainer::const_iterator iPanel (::std::find_if(
+SharedPanelContainer::const_iterator iPanel;
+if (bForceNewPanels)
+{
+// All panels have to be created in any case. There is no
+// point in searching already existing panels.
+iPanel = rCurrentPanels.end();
+}
+else
+{
+iPanel = ::std::find_if(
rCurrentPanels.begin(),
rCurrentPanels.end(),
-::boost::bind(&Panel::HasIdPredicate, _1,
::boost::cref(rPanelContexDescriptor.msId;
+::boost::bind(&Panel::HasIdPredicate, _1,
::boost::cref(rPanelContexDescriptor.msId)));
+}
if (iPanel != rCurrentPanels.end())
{
// Panel already exists in current deck.
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx | 60 ++
sfx2/source/sidebar/SidebarController.hxx | 16 ++--
2 files changed, 42 insertions(+), 34 deletions(-)
New commits:
commit c726a12e1833af2f06858e5a797bcbd03bf9e996
Author: Andre Fischer
Date: Wed May 29 15:57:18 2013 +
122394: Force creation of new sidebar panels on DATACHANGED events.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index e49ba24..067349a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -114,6 +114,7 @@ SidebarController::SidebarController (
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
+ mnRequestedForceFlags(SwitchFlag_NoForce),
msCurrentDeckId(gsDefaultDeckId),
msCurrentDeckTitle(),
maPropertyChangeForwarder(::boost::bind(&SidebarController::BroadcastPropertyChange,
this)),
@@ -268,7 +269,7 @@ void SAL_CALL SidebarController::statusChanged (const
css::frame::FeatureStateEv
// Force the current deck to update its panel list.
if ( ! mbIsDocumentReadOnly)
msCurrentDeckId = gsDefaultDeckId;
-maCurrentContext = Context();
+mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
maContextChangeUpdate.RequestCall();
}
}
@@ -389,7 +390,8 @@ void SidebarController::ProcessNewWidth (const sal_Int32
nNewWidth)
void SidebarController::UpdateConfigurations (void)
{
-if (maCurrentContext != maRequestedContext)
+if (maCurrentContext != maRequestedContext
+|| mnRequestedForceFlags!=SwitchFlag_NoForce)
{
maCurrentContext = maRequestedContext;
@@ -469,7 +471,9 @@ void SidebarController::OpenThenSwitchToDeck (
void SidebarController::SwitchToDeck (
const ::rtl::OUString& rsDeckId)
{
-if ( ! msCurrentDeckId.equals(rsDeckId) || ! mbIsDeckOpen)
+if ( ! msCurrentDeckId.equals(rsDeckId)
+|| ! mbIsDeckOpen
+|| mnRequestedForceFlags!=SwitchFlag_NoForce)
{
const DeckDescriptor* pDeckDescriptor =
ResourceManager::Instance().GetDeckDescriptor(rsDeckId);
if (pDeckDescriptor != NULL)
@@ -486,7 +490,12 @@ void SidebarController::SwitchToDeck (
{
maFocusManager.Clear();
-if ( ! msCurrentDeckId.equals(rDeckDescriptor.msId))
+const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
+const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
+mnRequestedForceFlags = SwitchFlag_NoForce;
+
+if ( ! msCurrentDeckId.equals(rDeckDescriptor.msId)
+|| bForceNewDeck)
{
// When the deck changes then destroy the deck and all panels
// and create everything new.
@@ -560,10 +569,20 @@ void SidebarController::SwitchToDeck (
// Find the corresponding panel among the currently active
// panels.
-SharedPanelContainer::const_iterator iPanel (::std::find_if(
+SharedPanelContainer::const_iterator iPanel;
+if (bForceNewPanels)
+{
+// All panels have to be created in any case. There is no
+// point in searching already existing panels.
+iPanel = rCurrentPanels.end();
+}
+else
+{
+iPanel = ::std::find_if(
rCurrentPanels.begin(),
rCurrentPanels.end(),
-::boost::bind(&Panel::HasIdPredicate, _1,
::boost::cref(rPanelContexDescriptor.msId;
+::boost::bind(&Panel::HasIdPredicate, _1,
::boost::cref(rPanelContexDescriptor.msId)));
+}
if (iPanel != rCurrentPanels.end())
{
// Panel already exists in current deck. Reuse it.
@@ -572,7 +591,8 @@ void SidebarController::SwitchToDeck (
}
else
{
-// Panel does not yet exist. Create it.
+// Panel does not yet exist or creation of new panels is forced.
+// Create it.
aNewPanels[nWriteIndex] = CreatePanel(
rPanelContexDescriptor.msId,
mpCurrentDeck->GetPanelParentWindow(),
@@ -623,30 +643,6 @@ void SidebarController::SwitchToDeck (
-bool SidebarController::ArePanelSetsEqual (
-const SharedPanelContainer& rCurrentPanels,
-const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels)
-{
-if (rCurrentPanels.size() != rRequestedPanels.size())
-return false;
-for (sal_Int32 nIndex=0,nCount=rCurrentPanels.size(); nIndexGetId().equals(rRequestedPanels[nIndex].msId))
-return false;
-
-// Check if the panels still can be displayed. This may not be the
case when
-// the document just become rea-only.
-if (mbIsDocumentReadOnly && !
rRequestedPanels[nIndex].mbShowForReadOnlyDocuments)
-return false;
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - include/sfx2 include/svx sc/source sd/source sfx2/source svx/source
include/sfx2/shell.hxx | 15
include/sfx2/sidebar/EnumContext.hxx|1
include/svx/sidebar/SelectionAnalyzer.hxx | 16 +++-
include/svx/sidebar/SelectionChangeHandler.hxx |4 -
sc/source/ui/drawfunc/drawsh2.cxx | 26 ++-
sc/source/ui/inc/drawsh.hxx |4 -
sd/source/ui/inc/DrawViewShell.hxx |5 -
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 18 ++---
sd/source/ui/view/drviews1.cxx | 12 ---
sd/source/ui/view/drviewsa.cxx | 36 ++
sd/source/ui/view/outlnvsh.cxx |2
sd/source/ui/view/viewshel.cxx |2
sfx2/source/control/shell.cxx | 25 ---
sfx2/source/sidebar/EnumContext.cxx |8 ++
svx/source/sidebar/SelectionAnalyzer.cxx| 54 +---
svx/source/sidebar/SelectionChangeHandler.cxx |5 -
svx/source/sidebar/text/TextPropertyPanel.cxx | 37 ++
svx/source/sidebar/text/TextPropertyPanel.hxx |9 ++
18 files changed, 191 insertions(+), 88 deletions(-)
New commits:
commit bf087c85aab791a9282bbda940344c8bf9925ef4
Author: Andre Fischer
Date: Mon May 27 12:55:37 2013 +
Resolves: #i122387# Use the right tool box for font color in text sidebar
(cherry picked from commit 08159967126946849906827ceadd802053d132c0)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: If40d3dee7c11e4ea6b01d40d713280e1dc19484d
Unname unused argument to prevent compiler warnings.
(cherry picked from commit f68dfc2cc8754d9cf72ae1b09f119e683ad44124)
Change-Id: I6450c6e46d5971abc871ed378d2ad6307e8f7a3e
(cherry picked from commit 21747cae6ad12ec6566e6dd9a06f3c268c72404d)
diff --git a/include/sfx2/sidebar/EnumContext.hxx
b/include/sfx2/sidebar/EnumContext.hxx
index f45ecd9..b24a8b2 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -129,6 +129,7 @@ public:
Application GetApplication_DI (void) const;
const ::rtl::OUString& GetContextName (void) const;
+Context GetContext (void) const;
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
diff --git a/sfx2/source/sidebar/EnumContext.cxx
b/sfx2/source/sidebar/EnumContext.cxx
index d78d8cf..48a974e 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -136,6 +136,14 @@ const ::rtl::OUString& EnumContext::GetContextName (void)
const
+EnumContext::Context EnumContext::GetContext (void) const
+{
+return meContext;
+}
+
+
+
+
bool EnumContext::operator== (const EnumContext aOther)
{
return meApplication==aOther.meApplication
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 6547db6..258a730 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -147,9 +147,12 @@ TextPropertyPanel::TextPropertyPanel (
mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxFontColor(ControlFactory::CreateToolBox(
mpToolBoxFontColorBackground.get(),
-rContext.GetApplication_DI() ==
sfx2::sidebar::EnumContext::Application_WriterVariants
-? SVX_RES(TB_FONTCOLOR_SW)
-: SVX_RES(TB_FONTCOLOR),
+SVX_RES(TB_FONTCOLOR),
+rxFrame)),
+
mpToolBoxFontColorBackgroundSW(ControlFactory::CreateToolBoxBackground(this)),
+mpToolBoxFontColorSW(ControlFactory::CreateToolBox(
+mpToolBoxFontColorBackgroundSW.get(),
+SVX_RES(TB_FONTCOLOR_SW),
rxFrame)),
mpToolBoxHighlightBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxHighlight(ControlFactory::CreateToolBox(
@@ -186,6 +189,8 @@ TextPropertyPanel::TextPropertyPanel (
Initialize();
FreeResource();
+
+UpdateFontColorToolbox(rContext);
}
@@ -200,6 +205,7 @@ TextPropertyPanel::~TextPropertyPanel (void)
mpToolBoxIncDec.reset();
mpToolBoxFont.reset();
mpToolBoxFontColor.reset();
+mpToolBoxFontColorSW.reset();
mpToolBoxScript.reset();
mpToolBoxScriptSw.reset();
mpToolBoxSpacing.reset();
@@ -209,6 +215,7 @@ TextPropertyPanel::~TextPropertyPanel (void)
mpToolBoxIncDecBackground.reset();
mpToolBoxFontBackground.reset();
mpToolBoxFontColorBackground.reset();
+mpToolBoxFontColorBackgroundSW.reset();
mpToolBoxScriptBackground.reset();
mpToolBoxScriptSwBackground.reset();
mpToolBoxSpacingBackground.reset();
@@ -284,6 +291,30 @@ void TextPrope
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 27 ++-
vcl/aqua/source/dtrans/DataFlavorMapping.hxx |2 ++
2 files changed, 20 insertions(+), 9 deletions(-)
New commits:
commit e31d408ca6bdaaa3eef9fc2eaa50e4745ebd33ff
Author: Andre Fischer
Date: Wed Aug 22 07:37:16 2012 +
Resolves: #i120481# Add registered transferable flavor...
to make the Writer accept column headers dragged from database tables.
(cherry picked from commit a32aabba57b53f581691f60e5484a6ddf3deb9f2)
Change-Id: I63d41c8000cdfc7f0b2ca28e83aaedf2e822e64d
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 7b57871..d61d09b 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -564,14 +564,17 @@ NSString*
DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor
}
}
-if( ! sysFlavor )
-{
-OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find(
oOOFlavor.MimeType );
-if( it == maOfficeOnlyTypes.end() )
-sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] =
OUStringToNSString( oOOFlavor.MimeType );
-else
-sysFlavor = it->second;
-}
+return sysFlavor;
+}
+
+NSString* DataFlavorMapper::internalOpenOfficeToSystemFlavor(const DataFlavor&
oOOFlavor) const
+{
+NSString* sysFlavor = NULL;
+OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find(
oOOFlavor.MimeType );
+if( it == maOfficeOnlyTypes.end() )
+sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] =
OUStringToNSString( oOOFlavor.MimeType );
+else
+sysFlavor = it->second;
return sysFlavor;
}
@@ -699,6 +702,8 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const
com::sun::star::uno:
sal_uInt32 nFlavors = flavors.getLength();
NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: 1];
+ bool bNeedDummyInternalFlavor (true);
+
for (sal_uInt32 i = 0; i < nFlavors; i++)
{
if( flavors[i].MimeType.startsWith("image/bmp") )
@@ -709,6 +714,10 @@ NSArray*
DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
else
{
NSString* str = openOfficeToSystemFlavor(flavors[i]);
+ if (str == NULL)
+ str = internalOpenOfficeToSystemFlavor(flavors[i]);
+ else
+ bNeedDummyInternalFlavor = false;
if (str != NULL)
{
@@ -721,7 +730,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const
com::sun::star::uno:
// #i89462# #i90747#
// in case no system flavor was found to report
// report at least one so D&D between OOo targets works
- if( [array count] == 0 )
+ if( [array count] == 0 || bNeedDummyInternalFlavor)
{
[array addObject: PBTYPE_DUMMY_INTERNAL];
}
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index ed78689..3c1ee87 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -128,6 +128,8 @@ private:
*/
bool isValidMimeContentType(const OUString& contentType) const;
+ NSString* internalOpenOfficeToSystemFlavor(const
com::sun::star::datatransfer::DataFlavor& oooDataFlavor) const;
+
private:
::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
typedef boost::unordered_map< OUString, NSString*, OUStringHash >
OfficeOnlyTypes;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b1e751d665599eeb7445b20837c079d84de2113f
Author: Andre Fischer
Date: Thu Jun 21 11:36:13 2012 +
Resolves: #i119537# Fixed extrusion of custom shapes to XLS
Reported by: Terry Yang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 8954201783be3d0479dfa2338116427a17f0dab4)
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: I994a2b14877c4e291d622665ec3f4a8ea9f3041b
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 637e2ab3..cc2dbf6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1826,8 +1826,8 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( IsProperty( DFF_Prop_c3DOriginX ) || IsProperty(
DFF_Prop_c3DOriginY ) )
{
const OUString sExtrusionOrigin( "Origin" );
-double fOriginX = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DOriginX, 0 ));
-double fOriginY = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DOriginY, 0 ));
+double fOriginX = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DOriginX, 32768 ));
+double fOriginY = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DOriginY, (sal_uInt32)-32768 ));
fOriginX /= 65536;
fOriginY /= 65536;
EnhancedCustomShapeParameterPair aOriginPair;
___
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' - sd/source sfx2/source
sd/source/ui/sidebar/NavigatorWrapper.cxx |9 +
sd/source/ui/sidebar/NavigatorWrapper.hxx |1
sfx2/source/sidebar/FocusManager.cxx | 150 ++
sfx2/source/sidebar/FocusManager.hxx | 18 +++
4 files changed, 158 insertions(+), 20 deletions(-)
New commits:
commit ce7dafae81f226bd441723df49f68005919df91f
Author: Andre Fischer
Date: Thu May 23 14:30:17 2013 +
Resolves: #i122247# Improved focus traveling in sidebar
(cherry picked from commit 4b0aafb8182b1f86b9edf947a4c62ff9948c6676)
Change-Id: Ieae8e44fe147309cc3ff447a6dbc375d1b2f34d0
(cherry picked from commit ab0360c309adcd131a9e6c1f02abc82486d09a46)
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx
b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index ad870fc..0412362 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -81,4 +81,13 @@ void NavigatorWrapper::UpdateNavigator (void)
}
+
+
+void NavigatorWrapper::GetFocus (void)
+{
+maNavigator.GrabFocus();
+}
+
+
+
} } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx
b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index 669628d..26e6255 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -51,6 +51,7 @@ public:
// Control
virtual void Resize (void);
+virtual void GetFocus (void);
// From ILayoutableWindow
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth);
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 51d4c5e..69c2e53 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -42,7 +42,9 @@ FocusManager::FocusManager (const
::boost::function& rShowPa
: mpDeckTitleBar(),
maPanels(),
maButtons(),
- maShowPanelFunctor(rShowPanelFunctor)
+ maShowPanelFunctor(rShowPanelFunctor),
+ mbObservingContentControlFocus(false),
+ mpFirstFocusedContentControl(NULL)
{
}
@@ -254,17 +256,23 @@ bool FocusManager::IsAnyButtonFocused (void) const
void FocusManager::FocusDeckTitle (void)
{
-if (IsDeckTitleVisible())
+if (mpDeckTitleBar != NULL)
{
-ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
-if (rToolBox.GetItemCount() > 0)
+if (IsDeckTitleVisible())
+{
+mpDeckTitleBar->GrabFocus();
+}
+else if (mpDeckTitleBar->GetToolBox().GetItemCount() > 0)
{
+ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
rToolBox.GrabFocus();
rToolBox.Invalidate();
}
+else
+FocusPanel(0, false);
}
else
-FocusPanel(0);
+FocusPanel(0, false);
}
@@ -278,10 +286,31 @@ bool FocusManager::IsDeckTitleVisible (void) const
-void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
+bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const
{
if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size()))
+return false;
+
+TitleBar* pTitleBar = maPanels[nPanelIndex]->GetTitleBar();
+if (pTitleBar==NULL)
+return false;
+return pTitleBar->IsVisible();
+}
+
+
+
+
+void FocusManager::FocusPanel (
+const sal_Int32 nPanelIndex,
+const bool bFallbackToDeckTitle)
+{
+if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size()))
+{
+if (bFallbackToDeckTitle)
+FocusDeckTitle();
return;
+}
+
Panel& rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar!=NULL && pTitleBar->IsVisible())
@@ -289,8 +318,21 @@ void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
rPanel.SetExpanded(true);
pTitleBar->GrabFocus();
}
+else if (bFallbackToDeckTitle)
+{
+// The panel title is not visible, fall back to the deck
+// title.
+// Make sure that the desk title is visible here to prevent a
+// loop when both the title of panel 0 and the deck title are
+// not present.
+if (IsDeckTitleVisible())
+FocusDeckTitle();
+else
+FocusPanelContent(nPanelIndex);
+}
else
FocusPanelContent(nPanelIndex);
+
if (maShowPanelFunctor)
maShowPanelFunctor(rPanel);
}
@@ -302,7 +344,11 @@ void FocusManager::FocusPanelContent (const sal_Int32
nPanelIndex)
{
Window* pWindow =
VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow());
if (pWindow != NULL)
+{
+mbObservingContentControlFocus = true;
pWindow->GrabFocus();
+mbObservingContentControlFocus = false;
+}
}
@@ -322,7 +368,7 @@ void FocusManager::ClickButton (const sal_Int32
nButtonIndex)
maButtons[nButtonIn
[Libreoffice-commits] core.git: sd/source sfx2/source
sd/source/ui/sidebar/NavigatorWrapper.cxx |9 +
sd/source/ui/sidebar/NavigatorWrapper.hxx |1
sfx2/source/sidebar/FocusManager.cxx | 150 ++
sfx2/source/sidebar/FocusManager.hxx | 18 +++
4 files changed, 158 insertions(+), 20 deletions(-)
New commits:
commit ab0360c309adcd131a9e6c1f02abc82486d09a46
Author: Andre Fischer
Date: Thu May 23 14:30:17 2013 +
Resolves: #i122247# Improved focus traveling in sidebar
(cherry picked from commit 4b0aafb8182b1f86b9edf947a4c62ff9948c6676)
Change-Id: Ieae8e44fe147309cc3ff447a6dbc375d1b2f34d0
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx
b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index ad870fc..0412362 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -81,4 +81,13 @@ void NavigatorWrapper::UpdateNavigator (void)
}
+
+
+void NavigatorWrapper::GetFocus (void)
+{
+maNavigator.GrabFocus();
+}
+
+
+
} } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx
b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index 669628d..26e6255 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -51,6 +51,7 @@ public:
// Control
virtual void Resize (void);
+virtual void GetFocus (void);
// From ILayoutableWindow
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth);
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 51d4c5e..69c2e53 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -42,7 +42,9 @@ FocusManager::FocusManager (const
::boost::function& rShowPa
: mpDeckTitleBar(),
maPanels(),
maButtons(),
- maShowPanelFunctor(rShowPanelFunctor)
+ maShowPanelFunctor(rShowPanelFunctor),
+ mbObservingContentControlFocus(false),
+ mpFirstFocusedContentControl(NULL)
{
}
@@ -254,17 +256,23 @@ bool FocusManager::IsAnyButtonFocused (void) const
void FocusManager::FocusDeckTitle (void)
{
-if (IsDeckTitleVisible())
+if (mpDeckTitleBar != NULL)
{
-ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
-if (rToolBox.GetItemCount() > 0)
+if (IsDeckTitleVisible())
+{
+mpDeckTitleBar->GrabFocus();
+}
+else if (mpDeckTitleBar->GetToolBox().GetItemCount() > 0)
{
+ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
rToolBox.GrabFocus();
rToolBox.Invalidate();
}
+else
+FocusPanel(0, false);
}
else
-FocusPanel(0);
+FocusPanel(0, false);
}
@@ -278,10 +286,31 @@ bool FocusManager::IsDeckTitleVisible (void) const
-void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
+bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const
{
if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size()))
+return false;
+
+TitleBar* pTitleBar = maPanels[nPanelIndex]->GetTitleBar();
+if (pTitleBar==NULL)
+return false;
+return pTitleBar->IsVisible();
+}
+
+
+
+
+void FocusManager::FocusPanel (
+const sal_Int32 nPanelIndex,
+const bool bFallbackToDeckTitle)
+{
+if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size()))
+{
+if (bFallbackToDeckTitle)
+FocusDeckTitle();
return;
+}
+
Panel& rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar!=NULL && pTitleBar->IsVisible())
@@ -289,8 +318,21 @@ void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
rPanel.SetExpanded(true);
pTitleBar->GrabFocus();
}
+else if (bFallbackToDeckTitle)
+{
+// The panel title is not visible, fall back to the deck
+// title.
+// Make sure that the desk title is visible here to prevent a
+// loop when both the title of panel 0 and the deck title are
+// not present.
+if (IsDeckTitleVisible())
+FocusDeckTitle();
+else
+FocusPanelContent(nPanelIndex);
+}
else
FocusPanelContent(nPanelIndex);
+
if (maShowPanelFunctor)
maShowPanelFunctor(rPanel);
}
@@ -302,7 +344,11 @@ void FocusManager::FocusPanelContent (const sal_Int32
nPanelIndex)
{
Window* pWindow =
VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow());
if (pWindow != NULL)
+{
+mbObservingContentControlFocus = true;
pWindow->GrabFocus();
+mbObservingContentControlFocus = false;
+}
}
@@ -322,7 +368,7 @@ void FocusManager::ClickButton (const sal_Int32
nButtonIndex)
maButtons[nButtonIndex]->Click();
if (nButtonIndex > 0)
if ( ! maPanels.empty())
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source sfx2/source
sd/source/ui/sidebar/NavigatorWrapper.cxx |9 +
sd/source/ui/sidebar/NavigatorWrapper.hxx |1
sfx2/source/sidebar/FocusManager.cxx | 150 ++
sfx2/source/sidebar/FocusManager.hxx | 18 +++
4 files changed, 158 insertions(+), 20 deletions(-)
New commits:
commit 4b0aafb8182b1f86b9edf947a4c62ff9948c6676
Author: Andre Fischer
Date: Thu May 23 14:30:17 2013 +
122247: Improved focus traveling in sidebar.
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx
b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 6a4f3bc..eeaa7d4 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -86,4 +86,13 @@ void NavigatorWrapper::UpdateNavigator (void)
}
+
+
+void NavigatorWrapper::GetFocus (void)
+{
+maNavigator.GrabFocus();
+}
+
+
+
} } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx
b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index 83370d1..16ee30a 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -55,6 +55,7 @@ public:
// Control
virtual void Resize (void);
+virtual void GetFocus (void);
// From ILayoutableWindow
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth);
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 9d29355..f568e52 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -47,7 +47,9 @@ FocusManager::FocusManager (const
::boost::function& rShowPa
: mpDeckTitleBar(),
maPanels(),
maButtons(),
- maShowPanelFunctor(rShowPanelFunctor)
+ maShowPanelFunctor(rShowPanelFunctor),
+ mbObservingContentControlFocus(false),
+ mpFirstFocusedContentControl(NULL)
{
}
@@ -259,17 +261,23 @@ bool FocusManager::IsAnyButtonFocused (void) const
void FocusManager::FocusDeckTitle (void)
{
-if (IsDeckTitleVisible())
+if (mpDeckTitleBar != NULL)
{
-ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
-if (rToolBox.GetItemCount() > 0)
+if (IsDeckTitleVisible())
+{
+mpDeckTitleBar->GrabFocus();
+}
+else if (mpDeckTitleBar->GetToolBox().GetItemCount() > 0)
{
+ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
rToolBox.GrabFocus();
rToolBox.Invalidate();
}
+else
+FocusPanel(0, false);
}
else
-FocusPanel(0);
+FocusPanel(0, false);
}
@@ -283,10 +291,31 @@ bool FocusManager::IsDeckTitleVisible (void) const
-void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
+bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const
{
if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size()))
+return false;
+
+TitleBar* pTitleBar = maPanels[nPanelIndex]->GetTitleBar();
+if (pTitleBar==NULL)
+return false;
+return pTitleBar->IsVisible();
+}
+
+
+
+
+void FocusManager::FocusPanel (
+const sal_Int32 nPanelIndex,
+const bool bFallbackToDeckTitle)
+{
+if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size()))
+{
+if (bFallbackToDeckTitle)
+FocusDeckTitle();
return;
+}
+
Panel& rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar!=NULL && pTitleBar->IsVisible())
@@ -294,8 +323,21 @@ void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
rPanel.SetExpanded(true);
pTitleBar->GrabFocus();
}
+else if (bFallbackToDeckTitle)
+{
+// The panel title is not visible, fall back to the deck
+// title.
+// Make sure that the desk title is visible here to prevent a
+// loop when both the title of panel 0 and the deck title are
+// not present.
+if (IsDeckTitleVisible())
+FocusDeckTitle();
+else
+FocusPanelContent(nPanelIndex);
+}
else
FocusPanelContent(nPanelIndex);
+
if (maShowPanelFunctor)
maShowPanelFunctor(rPanel);
}
@@ -307,7 +349,11 @@ void FocusManager::FocusPanelContent (const sal_Int32
nPanelIndex)
{
Window* pWindow =
VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow());
if (pWindow != NULL)
+{
+mbObservingContentControlFocus = true;
pWindow->GrabFocus();
+mbObservingContentControlFocus = false;
+}
}
@@ -327,7 +373,7 @@ void FocusManager::ClickButton (const sal_Int32
nButtonIndex)
maButtons[nButtonIndex]->Click();
if (nButtonIndex > 0)
if ( ! maPanels.empty())
-FocusPanel(0);
+FocusPanel(0, true);
maButtons[nButtonIndex]->GetParent()->Invalidate();
}
@@ -391,11 +437,46 @@ bool Foc
[Libreoffice-commits] core.git: filter/source include/svx sc/source
filter/source/msfilter/msdffimp.cxx |7 +++
include/svx/msdffdef.hxx|3 +++
sc/source/filter/excel/xeescher.cxx |7 +++
sc/source/filter/excel/xiescher.cxx | 15 +++
4 files changed, 32 insertions(+)
New commits:
commit aab697c7b64e79dd9102395ae1a8fe9025995a73
Author: Andre Fischer
Date: Thu Jun 21 10:29:05 2012 +
Resolves: #i119903# Alternative text for form control t import/export
Patch by: Jianyuan Li
review by: Andre Fischer
(cherry picked from commit 0ecc381c85bd4192add692d26fc60ba8e6341fd9)
Conflicts:
filter/source/msfilter/msdffimp.cxx
sc/source/filter/excel/xiescher.cxx
sc/source/filter/inc/xiescher.hxx
svx/inc/svx/msdffdef.hxx
Change-Id: Iac7282e50fd86244381ca174ba3f906aab89c7d9
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 25942ee..637e2ab3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4705,6 +4705,13 @@ SdrObject* SvxMSDffManager::ImportShape( const
DffRecordHeader& rHd, SvStream& r
pRet->SetPrintable( ( nGroupProperties & 1 ) != 0 );
}
+//Import alt text as description
+if ( pRet && SeekToContent( DFF_Prop_wzDescription, rSt ) )
+{
+OUString aAltText = MSDFFReadZString(rSt,
GetPropertyValue(DFF_Prop_wzDescription), true);
+pRet->SetDescription( aAltText );
+}
+
return pRet;
}
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 3ff5a3d..007f273 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -1179,6 +1179,9 @@ typedef enum {
mso_colorBParamShift = 16 // To extract the parameter value
} MSO_SYSCOLORINDEX;
+//ALT_TXT_MSINTEROP
+#define MSPROP_DESCRIPTION_MAX_LEN 4096
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index b391a07..6acbf4d 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -686,6 +686,13 @@ XclExpTbxControlObj::XclExpTbxControlObj(
XclExpObjectManager& rRoot, Reference<
if( aCtrlProp.GetProperty( aCtrlName, "Name" ) && !aCtrlName.isEmpty() )
aPropOpt.AddOpt( ESCHER_Prop_wzName, aCtrlName );
+//Export description as alt text
+if( SdrObject* pSdrObj = SdrObject::getSdrObjectFromXShape( xShape ) )
+{
+String aAltTxt( pSdrObj->GetDescription(), 0,
MSPROP_DESCRIPTION_MAX_LEN );
+aPropOpt.AddOpt( ESCHER_Prop_wzDescription, aAltTxt );
+}
+
// write DFF property set to stream
aPropOpt.Commit( mrEscherEx.GetStream() );
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 7acd77e..c358c1f 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -107,6 +107,7 @@
#include
#include
+using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
@@ -1997,6 +1998,20 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet&
rPropSet ) const
aLabel.Insert( '~', nPos );
}
rPropSet.SetStringProperty( "Label", aLabel );
+
+//Excel Alt text <==> Aoo description
+//For TBX control, if user does not operate alt text, alt text will be
set label text as default value in Excel.
+//In this case, DFF_Prop_wzDescription will not be set in excel file.
+//So In the end of SvxMSDffManager::ImportShape, description will not
be set. But actually in excel,
+//the alt text is the label value. So here set description as label
text first which is called before ImportShape.
+Reference< ::com::sun::star::beans::XPropertySet > xPropset( mxShape,
UNO_QUERY );
+try{
+if(xPropset.is())
+xPropset->setPropertyValue( "Description",
makeAny(::rtl::OUString(aLabel)) );
+}catch( ... )
+{
+OSL_TRACE( " Can't set a default text for TBX Control ");
+}
}
ConvertFont( rPropSet );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: animations/source
animations/source/animcore/targetpropertiescreator.cxx | 23 ++---
1 file changed, 14 insertions(+), 9 deletions(-)
New commits:
commit edba4119fffb83d7a001f5a2845d20ce3d6c6a1e
Author: Andre Fischer
Date: Fri Jun 15 06:11:45 2012 +
Resolves: #i119966# Fixed handling of the "visibility" flag of animations.
Patch by: Steve Yin
Review by: Andre Fischer
(cherry picked from commit 241c9736944e49308e03b74191524a1b8a5076bb)
Conflicts:
animations/source/animcore/targetpropertiescreator.cxx
Change-Id: Ic81ff35a5a31ba5239510e85c17bb4a261d57b6a
diff --git a/animations/source/animcore/targetpropertiescreator.cxx
b/animations/source/animcore/targetpropertiescreator.cxx
index 9e9fd27..d42799f 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -267,9 +267,9 @@ namespace animcore
// FALLTHROUGH intended
case animations::AnimationNodeType::AUDIO:
// FALLTHROUGH intended
-default:
+/*default:
// ignore this node, no valuable content for now.
-break;
+break;*/
case animations::AnimationNodeType::SET:
{
@@ -332,9 +332,9 @@ namespace animcore
// initially. This is currently the only place
// where a shape effect influences shape
// attributes outside it's effective duration.
+sal_Bool bVisible( sal_False );
if(
xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") )
{
-sal_Bool bVisible( sal_False );
uno::Any aAny( xAnimateNode->getTo() );
@@ -360,22 +360,27 @@ namespace animcore
}
}
-if( bVisible )
+/*if( bVisible )
{
// target is set to 'visible' at the
// first relevant effect. Thus, target
// must be initially _hidden_, for the
// effect to have visible impact.
-mrShapeHash.insert(
+*/
+}
+// target is set the 'visible' value,
+// so we should record the opposite value
+mrShapeHash.insert(
XShapeHash::value_type(
aTarget,
VectorOfNamedValues(
1,
beans::NamedValue(
-
xAnimateNode->getAttributeName(),
-uno::makeAny( sal_False ) ) )
) );
-}
-}
+
//xAnimateNode->getAttributeName(),
+::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("visibility")),
+uno::makeAny( !bVisible ) ) )
) );
+//}
+//}
}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/qa
slideshow/qa/tools/mktransitions.pl | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit de63defeabe25842f22461748ae71931e4fdb279
Author: Andre Fischer
Date: Wed Aug 29 13:51:27 2012 +
Added options to create subset of full animation set.
(cherry picked from commit 017cdba28f99bd599e1651e709914453069e1080)
Change-Id: I55bc8a183990544dcf47086cebc495bcd240463a
diff --git a/slideshow/qa/tools/mktransitions.pl
b/slideshow/qa/tools/mktransitions.pl
index de39a0b..8096e05 100644
--- a/slideshow/qa/tools/mktransitions.pl
+++ b/slideshow/qa/tools/mktransitions.pl
@@ -28,6 +28,8 @@ use File::Temp;
use File::Path;
$TempDir = "";
+my $FirstTransitionIndex = 0;
+my $LastTransitionIndex = -1;
# all the XML package generation is a blatant rip from AF's
@@ -95,7 +97,7 @@ sub zip_dirtree
# Remove .. directories from the middle of the path.
while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//)
{
-$zip_name = $` . "/" . $';
+$zip_name = $` . "/" . $'; # $'
}
}
@@ -140,6 +142,8 @@ sub writeSlideStyles
my $transitionType = pop @_;
my $slideNum = pop @_;
+return if $slideNum<$FirstTransitionIndex || ($LastTransitionIndex>=0 &&
$slideNum>$LastTransitionIndex);
+
print $OUT " \n";
print $OUT " \n";
print $OUT " \n";
@@ -214,6 +218,8 @@ sub writeSlide
my $transitionType = pop @_;
my $slideNum = pop @_;
+return if $slideNum<$FirstTransitionIndex || ($LastTransitionIndex>=0 &&
$slideNum>$LastTransitionIndex);
+
print $OUT " ";
print $OUT "\n";
@@ -552,6 +558,8 @@ output-file-name defaults to alltransitions.odp.
options: -aGenerate _all_ combinations of type, subtype,
direction, and mode
-hPrint this usage information.
+ -fFirst transition to include, defaults to 0
+ -lLast transition to include
END_OF_USAGE
}
@@ -579,6 +587,14 @@ sub process_command_line
{
$global_gen_all=1;
}
+elsif ($ARGV[$i] eq "-f")
+{
+$FirstTransitionIndex = $ARGV[++$i];
+}
+elsif ($ARGV[$i] eq "-l")
+{
+$LastTransitionIndex = $ARGV[++$i];
+}
elsif ($ARGV[$i] =~ /^-/)
{
print "Unknown option $ARGV[$i]\n";
___
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' - 3 commits - sc/source sc/uiconfig sd/source sd/uiconfig sfx2/source sw/source sw/uiconfig
sc/source/ui/view/tabvwsh.cxx|1
sc/uiconfig/scalc/menubar/menubar.xml|1
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |1
sd/source/ui/view/drvwshrg.cxx |1
sd/uiconfig/simpress/menubar/menubar.xml |1
sfx2/source/sidebar/MenuButton.cxx | 12 ---
sfx2/source/sidebar/TabBar.cxx |4 +++
sfx2/source/sidebar/TabBar.hxx |3 +-
sw/source/ui/uiview/view0.cxx|1
sw/uiconfig/sglobal/menubar/menubar.xml |1
sw/uiconfig/sweb/menubar/menubar.xml |1
sw/uiconfig/swform/menubar/menubar.xml |1
sw/uiconfig/swreport/menubar/menubar.xml |1
sw/uiconfig/swriter/menubar/menubar.xml |1
sw/uiconfig/swxform/menubar/menubar.xml |1
15 files changed, 7 insertions(+), 24 deletions(-)
New commits:
commit 12da94075c58d7dac7f9a9080107a879de805e89
Author: Andre Fischer
Date: Wed May 22 12:22:32 2013 +
Resolves: #i122354# Fix notification of slide change when...
caused by slide sorter key event
(cherry picked from commit a3d234a12b037327688d4743c82f76da732ec70e)
Change-Id: I6ac1667d10b5ecd8cc3f96b7657d7ffe49a7ac3f
(cherry picked from commit 0314533d3ba5a2601bc18037c4a1fbc6a54910d3)
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 2decfcb..ca0ff0b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -417,6 +417,7 @@ void SelectionFunction::NotifyDragFinished (void)
sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
{
view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter);
+PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter);
PageSelector::UpdateLock aLock (mrSlideSorter);
FocusManager& rFocusManager (mrController.GetFocusManager());
sal_Bool bResult = sal_False;
commit f7b9c4e38733863da8e434157ff7061e6b110309
Author: Andre Fischer
Date: Wed May 22 11:48:44 2013 +
Resolves: #i122366# Uncheck sidebar menu button after menu is closed
(cherry picked from commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6)
Change-Id: I4eef19a3b4ad9ea3ff7fd40b22c2854f569b69b6
(cherry picked from commit ff7bbe528aebedd41229e8d351a8c595e3627905)
diff --git a/sfx2/source/sidebar/MenuButton.cxx
b/sfx2/source/sidebar/MenuButton.cxx
index 0a5180e..fc573ce 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -102,18 +102,12 @@ void MenuButton::MouseMove (const MouseEvent& rEvent)
void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
{
-#if 0
-Hide();
-CheckBox::MouseButtonDown(rMouseEvent);
-Show();
-#else
if (rMouseEvent.IsLeft())
{
mbIsLeftButtonDown = true;
CaptureMouse();
Invalidate();
}
-#endif
}
@@ -121,11 +115,6 @@ void MenuButton::MouseButtonDown (const MouseEvent&
rMouseEvent)
void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
{
-#if 0
-Hide();
-CheckBox::MouseButtonUp(rMouseEvent);
-Show();
-#else
if (IsMouseCaptured())
ReleaseMouse();
@@ -143,7 +132,6 @@ void MenuButton::MouseButtonUp (const MouseEvent&
rMouseEvent)
mbIsLeftButtonDown = false;
Invalidate();
}
-#endif
}
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 21beb0f..1cbd18b 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -363,6 +363,9 @@ void TabBar::UpdateFocusManager (FocusManager&
rFocusManager)
IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
{
+if ( ! mpMenuButton)
+return 0;
+
::std::vector aMenuData;
for(ItemContainer::const_iterator
iItem(maItems.begin()),iEnd(maItems.end());
@@ -388,6 +391,7 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
mpMenuButton->GetPosPixel(),
mpMenuButton->GetSizePixel()),
aMenuData);
+mpMenuButton->Check(sal_False);
return 0;
}
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 7cecc42..cafd3e8 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -30,6 +30,7 @@
#include
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -94,7 +95,7 @@ public:
private:
cssu::Reference mxFrame;
-::boost::scoped_ptr mpMenuButton;
+::boost::scoped_ptr mpMenuButton;
class Item
{
public:
commit 95ae39c0c34c9a5e6fa6e
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0314533d3ba5a2601bc18037c4a1fbc6a54910d3
Author: Andre Fischer
Date: Wed May 22 12:22:32 2013 +
Resolves: #i122354# Fix notification of slide change when...
caused by slide sorter key event
(cherry picked from commit a3d234a12b037327688d4743c82f76da732ec70e)
Change-Id: I6ac1667d10b5ecd8cc3f96b7657d7ffe49a7ac3f
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 2decfcb..ca0ff0b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -417,6 +417,7 @@ void SelectionFunction::NotifyDragFinished (void)
sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
{
view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter);
+PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter);
PageSelector::UpdateLock aLock (mrSlideSorter);
FocusManager& rFocusManager (mrController.GetFocusManager());
sal_Bool bResult = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/MenuButton.cxx | 12
sfx2/source/sidebar/TabBar.cxx |4
sfx2/source/sidebar/TabBar.hxx |3 ++-
3 files changed, 6 insertions(+), 13 deletions(-)
New commits:
commit ff7bbe528aebedd41229e8d351a8c595e3627905
Author: Andre Fischer
Date: Wed May 22 11:48:44 2013 +
Resolves: #i122366# Uncheck sidebar menu button after menu is closed
(cherry picked from commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6)
Change-Id: I4eef19a3b4ad9ea3ff7fd40b22c2854f569b69b6
diff --git a/sfx2/source/sidebar/MenuButton.cxx
b/sfx2/source/sidebar/MenuButton.cxx
index 0a5180e..fc573ce 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -102,18 +102,12 @@ void MenuButton::MouseMove (const MouseEvent& rEvent)
void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
{
-#if 0
-Hide();
-CheckBox::MouseButtonDown(rMouseEvent);
-Show();
-#else
if (rMouseEvent.IsLeft())
{
mbIsLeftButtonDown = true;
CaptureMouse();
Invalidate();
}
-#endif
}
@@ -121,11 +115,6 @@ void MenuButton::MouseButtonDown (const MouseEvent&
rMouseEvent)
void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
{
-#if 0
-Hide();
-CheckBox::MouseButtonUp(rMouseEvent);
-Show();
-#else
if (IsMouseCaptured())
ReleaseMouse();
@@ -143,7 +132,6 @@ void MenuButton::MouseButtonUp (const MouseEvent&
rMouseEvent)
mbIsLeftButtonDown = false;
Invalidate();
}
-#endif
}
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 21beb0f..1cbd18b 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -363,6 +363,9 @@ void TabBar::UpdateFocusManager (FocusManager&
rFocusManager)
IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
{
+if ( ! mpMenuButton)
+return 0;
+
::std::vector aMenuData;
for(ItemContainer::const_iterator
iItem(maItems.begin()),iEnd(maItems.end());
@@ -388,6 +391,7 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
mpMenuButton->GetPosPixel(),
mpMenuButton->GetSizePixel()),
aMenuData);
+mpMenuButton->Check(sal_False);
return 0;
}
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 7cecc42..cafd3e8 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -30,6 +30,7 @@
#include
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -94,7 +95,7 @@ public:
private:
cssu::Reference mxFrame;
-::boost::scoped_ptr mpMenuButton;
+::boost::scoped_ptr mpMenuButton;
class Item
{
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sd/source sd/uiconfig sw/source sw/uiconfig
sc/source/ui/view/tabvwsh.cxx|1 -
sc/uiconfig/scalc/menubar/menubar.xml|1 -
sd/source/ui/view/drvwshrg.cxx |1 -
sd/uiconfig/simpress/menubar/menubar.xml |1 -
sw/source/ui/uiview/view0.cxx|1 -
sw/uiconfig/sglobal/menubar/menubar.xml |1 -
sw/uiconfig/sweb/menubar/menubar.xml |1 -
sw/uiconfig/swform/menubar/menubar.xml |1 -
sw/uiconfig/swreport/menubar/menubar.xml |1 -
sw/uiconfig/swriter/menubar/menubar.xml |1 -
sw/uiconfig/swxform/menubar/menubar.xml |1 -
11 files changed, 11 deletions(-)
New commits:
commit 94b868141e5ad43f8e2affb77563ec0f999a2d60
Author: Andre Fischer
Date: Wed May 22 11:32:13 2013 +
Resolves: #ii122335# Disabling the old task pane
(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54)
Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 537499b..7949e17 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,7 +54,6 @@
SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
-SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index ca8d8ba..777c324 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -139,7 +139,6 @@
-
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index c71959c..bb20370 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -94,7 +94,6 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell,
SdResId(STR_DRAWVIEWSHELL)) //SOH
{
SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
-SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE );
SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId()
);
SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() );
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index 9a5b874..9ad2019 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -113,7 +113,6 @@
-
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index e5f7b3b..73555a8 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -90,7 +90,6 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
{
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
-SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index f79d0ec..3c310f2 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -137,7 +137,6 @@
-
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
index 3cb3b76..30229a7 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -108,7 +108,6 @@
-
diff --git a/sw/uiconfig/swform/menubar/menubar.xml
b/sw/uiconfig/swform/menubar/menubar.xml
index 806da2d..4f22cf1 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -136,7 +136,6 @@
-
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml
b/sw/uiconfig/swreport/menubar/menubar.xml
index bc90989..39284e8 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -137,7 +137,6 @@
-
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
ind
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source sc/uiconfig sd/source sd/uiconfig sfx2/source sw/source sw/uiconfig
sc/source/ui/view/tabvwsh.cxx|1 -
sc/uiconfig/scalc/menubar/menubar.xml|1 -
sd/source/ui/view/drvwshrg.cxx |1 -
sd/uiconfig/sdraw/menubar/menubar.xml|1 -
sd/uiconfig/simpress/menubar/menubar.xml |1 -
sfx2/source/sidebar/MenuButton.cxx | 12
sfx2/source/sidebar/TabBar.cxx |4
sfx2/source/sidebar/TabBar.hxx |3 ++-
sw/source/ui/uiview/view0.cxx|1 -
sw/uiconfig/sglobal/menubar/menubar.xml |1 -
sw/uiconfig/sweb/menubar/menubar.xml |1 -
sw/uiconfig/swform/menubar/menubar.xml |1 -
sw/uiconfig/swreport/menubar/menubar.xml |1 -
sw/uiconfig/swriter/menubar/menubar.xml |1 -
sw/uiconfig/swxform/menubar/menubar.xml |1 -
15 files changed, 6 insertions(+), 25 deletions(-)
New commits:
commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6
Author: Andre Fischer
Date: Wed May 22 11:48:44 2013 +
i122366: Uncheck sidebar menu button after menu is closed.
diff --git a/sfx2/source/sidebar/MenuButton.cxx
b/sfx2/source/sidebar/MenuButton.cxx
index d29bad0..c1d0f59 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -109,18 +109,12 @@ void MenuButton::MouseMove (const MouseEvent& rEvent)
void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
{
-#if 0
-Hide();
-CheckBox::MouseButtonDown(rMouseEvent);
-Show();
-#else
if (rMouseEvent.IsLeft())
{
mbIsLeftButtonDown = true;
CaptureMouse();
Invalidate();
}
-#endif
}
@@ -128,11 +122,6 @@ void MenuButton::MouseButtonDown (const MouseEvent&
rMouseEvent)
void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
{
-#if 0
-Hide();
-CheckBox::MouseButtonUp(rMouseEvent);
-Show();
-#else
if (IsMouseCaptured())
ReleaseMouse();
@@ -150,7 +139,6 @@ void MenuButton::MouseButtonUp (const MouseEvent&
rMouseEvent)
mbIsLeftButtonDown = false;
Invalidate();
}
-#endif
}
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 5b87856..2da81a5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -379,6 +379,9 @@ void TabBar::UpdateFocusManager (FocusManager&
rFocusManager)
IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
{
+if ( ! mpMenuButton)
+return 0;
+
::std::vector aMenuData;
for(ItemContainer::const_iterator
iItem(maItems.begin()),iEnd(maItems.end());
@@ -404,6 +407,7 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
mpMenuButton->GetPosPixel(),
mpMenuButton->GetSizePixel()),
aMenuData);
+mpMenuButton->Check(sal_False);
return 0;
}
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index f1ef6f2..399399a 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -34,6 +34,7 @@
#include
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -98,7 +99,7 @@ public:
private:
cssu::Reference mxFrame;
-::boost::scoped_ptr mpMenuButton;
+::boost::scoped_ptr mpMenuButton;
class Item
{
public:
commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54
Author: Andre Fischer
Date: Wed May 22 11:32:13 2013 +
i122335: Disabling the old task pane.
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 2c3c6f1..eb81361 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -65,7 +65,6 @@
SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(FID_INPUTLINE_STATUS);
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
-SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 969cdef..9308ce8 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -143,7 +143,6 @@
-
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index c48e958..3ba3119 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -104,7 +104,6 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell,
SdResId(STR_DRAWVIEWSHELL)) //SOH
{
SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
-SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE );
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarDockingWindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 88707ef9e8477784d0f5f9d679c5de4020b4ea40
Author: Andre Fischer
Date: Tue May 21 09:46:08 2013 +
Resolves: #i122336# Show docked tab bar after closing undocked sidebar
(cherry picked from commit d8b17867f3c58d5623cca129d6459bae0eb11729)
Change-Id: I5579c8f12cad696da94674c4f1a52bb2bed68cb5
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 3b6a61d..fe18b32 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -92,8 +92,8 @@ sal_Bool SidebarDockingWindow::Close (void)
{
// Do not close the floating window.
// Dock it and close just the deck instead.
-mpSidebarController->RequestCloseDeck();
SetFloatingMode(sal_False);
+mpSidebarController->RequestCloseDeck();
mpSidebarController->NotifyResize();
return sal_False;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/DeckDescriptor.cxx|6 ++
sfx2/source/sidebar/DeckLayouter.cxx |2 +-
sfx2/source/sidebar/PanelDescriptor.cxx |6 ++
sfx2/source/sidebar/ResourceManager.cxx | 11 +--
sfx2/source/sidebar/SidebarController.cxx |2 ++
5 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit 57af6389b5e6cf9656edb96e987509ce84b45721
Author: Andre Fischer
Date: Tue May 21 13:29:49 2013 +
Resolves: #i122057# Fixed layouting of legacy sidebar panels
(cherry picked from commit ff4875ae18c417a74621559bd2d2e9ad05929a82)
Change-Id: I6c97144981fbebc591fe595274c2f01055dd1979
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx
b/sfx2/source/sidebar/DeckDescriptor.cxx
index be0c77d..01602ef 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -25,9 +25,12 @@ DeckDescriptor::DeckDescriptor (void)
msId(),
msIconURL(),
msHighContrastIconURL(),
+ msTitleBarIconURL(),
+ msHighContrastTitleBarIconURL(),
msHelpURL(),
msHelpText(),
maContextList(),
+ mbIsEnabled(true),
mnOrderIndex(1) // Default value as defined in Sidebar.xcs
{
}
@@ -40,9 +43,12 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther)
msId(rOther.msId),
msIconURL(rOther.msIconURL),
msHighContrastIconURL(rOther.msHighContrastIconURL),
+ msTitleBarIconURL(rOther.msTitleBarIconURL),
+ msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
msHelpURL(rOther.msHelpURL),
msHelpText(rOther.msHelpText),
maContextList(rOther.maContextList),
+ mbIsEnabled(rOther.mbIsEnabled),
mnOrderIndex(rOther.mnOrderIndex)
{
}
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index 8d7cb89..ade08bb 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -318,7 +318,7 @@ void DeckLayouter::GetRequestedSizes (
if (xPanel.is())
aLayoutSize =
xPanel->getHeightForWidth(rContentBox.GetWidth());
else
-aLayoutSize = ui::LayoutSize(MinimalPanelHeight, 0, -1);
+aLayoutSize = ui::LayoutSize(MinimalPanelHeight, -1, 0);
}
}
iItem->maLayoutSize = aLayoutSize;
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx
b/sfx2/source/sidebar/PanelDescriptor.cxx
index 31e3b9e..fa80402 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -26,10 +26,13 @@ PanelDescriptor::PanelDescriptor (void)
mbIsTitleBarOptional(false),
msId(),
msDeckId(),
+ msTitleBarIconURL(),
+ msHighContrastTitleBarIconURL(),
msHelpURL(),
maContextList(),
msImplementationURL(),
mnOrderIndex(1), // Default value as defined in Sidebar.xcs
+ mbShowForReadOnlyDocuments(false),
mbWantsCanvas(false)
{
}
@@ -42,10 +45,13 @@ PanelDescriptor::PanelDescriptor (const PanelDescriptor&
rOther)
mbIsTitleBarOptional(rOther.mbIsTitleBarOptional),
msId(rOther.msId),
msDeckId(rOther.msDeckId),
+ msTitleBarIconURL(rOther.msTitleBarIconURL),
+ msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
msHelpURL(rOther.msHelpURL),
maContextList(rOther.maContextList),
msImplementationURL(rOther.msImplementationURL),
mnOrderIndex(rOther.mnOrderIndex),
+ mbShowForReadOnlyDocuments(rOther.mbShowForReadOnlyDocuments),
mbWantsCanvas(rOther.mbWantsCanvas)
{
}
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index 2821293..96395eb 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -535,20 +535,27 @@ void ResourceManager::ReadLegacyAddons (const
Reference& rxFrame)
rDeckDescriptor.msId = rsNodeName;
rDeckDescriptor.msIconURL =
::comphelper::getString(aChildNode.getNodeValue("ImageURL"));
rDeckDescriptor.msHighContrastIconURL = rDeckDescriptor.msIconURL;
+rDeckDescriptor.msTitleBarIconURL = OUString();
+rDeckDescriptor.msHighContrastTitleBarIconURL = OUString();
rDeckDescriptor.msHelpURL =
::comphelper::getString(aChildNode.getNodeValue("HelpURL"));
rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle;
-
rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName,
A2S("any")), true, OUString());
rDeckDescriptor.mbIsEnabled = true;
+rDeckDescriptor.mnOrderIndex = 10 + nReadIndex;
+
rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName,
A2S("any")), true, OUString());
PanelDescriptor& rPanelDescriptor (maPanels[nPanelWriteIndex++]);
rPanelDescrip
[Libreoffice-commits] core.git: sd/source
sd/source/ui/sidebar/LayoutMenu.cxx |1 +
sd/source/ui/view/drviews1.cxx |3 +++
sd/source/ui/view/drviewsa.cxx |2 ++
3 files changed, 6 insertions(+)
New commits:
commit b8520e02d2b1b18ece5dbc6dbac12b9481643fdd
Author: Andre Fischer
Date: Tue May 21 09:22:27 2013 +
Resolves: #i122291# Showing the right set of layouts for handout mode
Fixed painting selection in layout panel
(cherry picked from commit b89784c822670593cb253bcc0d260b93c9936e1c)
Change-Id: I73d53bdcdec25753c8adb0f011f05868f82d35a5
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 9aa5955..ef6ae63 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -809,6 +809,7 @@ void LayoutMenu::UpdateSelection (void)
break;
// Find the entry of the menu for to the layout.
+SetNoSelection();
sal_uInt16 nItemCount (GetItemCount());
for (sal_uInt16 nId=1; nId<=nItemCount; nId++)
{
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 552f61b..876eab3 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -461,6 +461,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
if (meEditMode == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 86c20dd..2287258 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -139,6 +139,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame,
ViewShellBase& rViewShellBas
if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarController.cxx | 63 ++
sfx2/source/sidebar/SidebarController.hxx |6 --
sfx2/source/sidebar/TabBar.cxx| 26
sfx2/source/sidebar/TabBar.hxx| 13 --
4 files changed, 53 insertions(+), 55 deletions(-)
New commits:
commit d456545fb1215eda69f6970d4207b2b062384877
Author: Andre Fischer
Date: Tue May 21 08:49:40 2013 +
Resolves: #i122352# Do not allow selection of disabled decks via menu
(cherry picked from commit b27563ac5988d7ce407b045466e952114f54e07c)
Change-Id: Id36b8fd12d0fce8f8717e5dd21538d1871a005b0
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 7cc315e..e1e0042 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -102,7 +102,7 @@ SidebarController::SidebarController (
mpParentWindow,
rxFrame,
::boost::bind(&SidebarController::OpenThenSwitchToDeck, this,
_1),
- ::boost::bind(&SidebarController::ShowPopupMenu, this,
_1,_2,_3))),
+ ::boost::bind(&SidebarController::ShowPopupMenu, this, _1,_2))),
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
@@ -794,10 +794,9 @@ IMPL_LINK(SidebarController, WindowEventHandler,
VclWindowEvent*, pEvent)
void SidebarController::ShowPopupMenu (
const Rectangle& rButtonBox,
-const ::std::vector& rDeckSelectionData,
-const ::std::vector& rDeckShowData) const
+const ::std::vector& rMenuData) const
{
-::boost::shared_ptr pMenu = CreatePopupMenu(rDeckSelectionData,
rDeckShowData);
+::boost::shared_ptr pMenu = CreatePopupMenu(rMenuData);
pMenu->SetSelectHdl(LINK(this, SidebarController, OnMenuItemSelected));
// pass toolbox button rect so the menu can stay open on button up
@@ -829,9 +828,9 @@ void SidebarController::ShowDetailMenu (const
::rtl::OUString& rsMenuCommand) co
::boost::shared_ptr SidebarController::CreatePopupMenu (
-const ::std::vector& rDeckSelectionData,
-const ::std::vector& rDeckShowData) const
+const ::std::vector& rMenuData) const
{
+// Create the top level popup menu.
::boost::shared_ptr pMenu (new PopupMenu());
FloatingWindow* pMenuWindow =
dynamic_cast(pMenu->GetWindow());
if (pMenuWindow != NULL)
@@ -839,21 +838,36 @@ void SidebarController::ShowDetailMenu (const
::rtl::OUString& rsMenuCommand) co
pMenuWindow->SetPopupModeFlags(pMenuWindow->GetPopupModeFlags() |
FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE);
}
+// Create sub menu for customization (hiding of deck tabs.)
+PopupMenu* pCustomizationMenu = new PopupMenu();
+
SidebarResource aLocalResource;
// Add one entry for every tool panel element to individually make
// them visible or hide them.
+sal_Int32 nIndex (0);
+for(::std::vector::const_iterator
+iItem(rMenuData.begin()),
+iEnd(rMenuData.end());
+iItem!=iEnd;
+++iItem,++nIndex)
{
-sal_Int32 nIndex (MID_FIRST_PANEL);
-for(::std::vector::const_iterator
-iItem(rDeckSelectionData.begin()),
-iEnd(rDeckSelectionData.end());
-iItem!=iEnd;
-++iItem)
+const sal_Int32 nMenuIndex (nIndex+MID_FIRST_PANEL);
+pMenu->InsertItem(nMenuIndex, iItem->msDisplayName, MIB_RADIOCHECK);
+pMenu->CheckItem(nMenuIndex, iItem->mbIsCurrentDeck ? sal_True :
sal_False);
+pMenu->EnableItem(nMenuIndex, (iItem->mbIsEnabled&&iItem->mbIsActive)
? sal_True : sal_False);
+
+const sal_Int32 nSubMenuIndex (nIndex+MID_FIRST_HIDE);
+if (iItem->mbIsCurrentDeck)
+{
+// Don't allow the currently visible deck to be disabled.
+pCustomizationMenu->InsertItem(nSubMenuIndex,
iItem->msDisplayName, MIB_RADIOCHECK);
+pCustomizationMenu->CheckItem(nSubMenuIndex, sal_True);
+}
+else
{
-pMenu->InsertItem(nIndex, iItem->get<0>(), MIB_RADIOCHECK);
-pMenu->CheckItem(nIndex, iItem->get<2>());
-++nIndex;
+pCustomizationMenu->InsertItem(nSubMenuIndex,
iItem->msDisplayName, MIB_CHECKABLE);
+pCustomizationMenu->CheckItem(nSubMenuIndex, iItem->mbIsActive ?
sal_True : sal_False);
}
}
@@ -865,22 +879,6 @@ void SidebarController::ShowDetailMenu (const
::rtl::OUString& rsMenuCommand) co
else
pMenu->InsertItem(MID_UNLOCK_TASK_PANEL,
String(SfxResId(STR_SFX_UNDOCK)));
-// Add sub menu for customization (hiding of deck tabs.)
-PopupMenu* pCustomizationMenu = new PopupMenu();
-{
-sal_Int32 nIndex (MID_FIRST_HIDE);
-
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +
sfx2/source/sidebar/Deck.cxx |4 ---
sfx2/source/sidebar/SidebarController.cxx| 14 ---
3 files changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 9a32ed36709cb03a8b5d3bcff0276bc31c934848
Author: Andre Fischer
Date: Fri May 17 12:23:50 2013 +
Resolves; #i122219# Show 'Cell Appearance' and 'Number Format' panels...
when editing cells.(cherry picked from commit
09d043596e8283dd6ced26d1e4ff0da530252df0)
Change-Id: I2fe0f9655efa24fb99b566f5c515b0fd1f651f6b
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index a92643a..cd69c01 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -724,6 +724,7 @@
Calc, Auditing, visible ;
Calc, Cell, visible ;
+Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot,visible ;
@@ -753,6 +754,7 @@
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot,hidden ;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0fed648..9a16ad5 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -294,8 +294,6 @@ const SharedPanelContainer& Deck::GetPanels (void) const
void Deck::RequestLayout (void)
{
-//PrintWindowTree();
-
DeckLayouter::LayoutDeck(
GetContentArea(),
maPanels,
@@ -304,8 +302,6 @@ void Deck::RequestLayout (void)
*mpScrollContainer,
*mpFiller,
*mpVerticalScrollBar);
-
-Invalidate();
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index af0a547..7cc315e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -518,20 +518,6 @@ void SidebarController::SwitchToDeck (
}
}
-if (mpCurrentDeck
-&& ArePanelSetsEqual(mpCurrentDeck->GetPanels(),
aPanelContextDescriptors))
-{
-// Requested set of panels is identical to the current set of
-// panels => Nothing to do.
-return;
-}
-
-// When the document is read-only, check if there are any panels that
can still be displayed.
-if (mbIsDocumentReadOnly)
-{
-}
-
-
// Provide a configuration and Deck object.
if ( ! mpCurrentDeck)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - framework/inc framework/source include/sfx2 sfx2/source svx/source
framework/inc/uifactory/uicontrollerfactory.hxx| 101 +++
framework/source/uifactory/uicontrollerfactory.cxx | 269 +
include/sfx2/sidebar/ControlFactory.hxx| 29 ++
include/sfx2/sidebar/ControllerFactory.hxx | 16 +
include/sfx2/sidebar/SidebarToolBox.hxx|4
include/sfx2/sidebar/Tools.hxx |3
sfx2/source/sidebar/ControlFactory.cxx |5
sfx2/source/sidebar/ControllerFactory.cxx | 132 --
sfx2/source/sidebar/ResourceManager.cxx| 26 --
sfx2/source/sidebar/ResourceManager.hxx|3
sfx2/source/sidebar/SidebarToolBox.cxx | 28 +-
sfx2/source/sidebar/ToolBoxBackground.cxx | 13 -
sfx2/source/sidebar/ToolBoxBackground.hxx |4
sfx2/source/sidebar/Tools.cxx | 25 +
svx/source/sidebar/insert/InsertPropertyPanel.hxx |2
15 files changed, 594 insertions(+), 66 deletions(-)
New commits:
commit edaca7c6e1d1ade6bf6cdae753028ee62297f0b1
Author: Andre Fischer
Date: Thu May 16 11:43:55 2013 +
Resolves: #i121960# Improve creation of toolbox/toolbar controllers
(cherry picked from commit 3608a33d8362cbc44a2eb7203b7d1bffe481c7ab)
Conflicts:
sfx2/inc/sfx2/sidebar/ControlFactory.hxx
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
sfx2/inc/sfx2/sidebar/Tools.hxx
sfx2/source/sidebar/ToolBoxBackground.cxx
Change-Id: I833a33bbc58ebe46bd28c6d97a4d76329f1f0186
diff --git a/include/sfx2/sidebar/ControlFactory.hxx
b/include/sfx2/sidebar/ControlFactory.hxx
index 3b286e9..b4d329a 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -28,26 +28,49 @@ namespace sfx2 { namespace sidebar {
class ToolBoxBackground;
+/** Factory for controls used in sidebar panels.
+The reason to use this factory instead of creating the controls
+directly is that this way the sidebar has a little more control
+over look and feel of its controls.
+*/
class SFX2_DLLPUBLIC ControlFactory
{
public:
+/** Create the menu button for the task bar.
+*/
static CheckBox* CreateMenuButton (Window* pParentWindow);
+
static ImageRadioButton* CreateTabItem (Window* pParentWindow);
-/** Create a tool box that does *not* handle its items.
+/** Create a tool box that does *not* handle its items. The
+caller has to register callbacks to process, among others,
+click and selection events.
*/
static SidebarToolBox* CreateToolBox (
Window* pParentWindow,
const ResId& rResId);
-/** Create a tool box that *does* handle its items.
+/** Create a tool box that *does* handle its items. All event
+processing is done by toolbox controllers.
*/
static SidebarToolBox* CreateToolBox (
Window* pParentWindow,
const ResId& rResId,
const ::com::sun::star::uno::Reference&
rxFrame);
-static Window* CreateToolBoxBackground (Window* pParentWindow);
+/** Create a window that acts as background of a tool box.
+In general it is slightly larger than the tool box.
+@param pParentWindow
+The parent window of the new background control.
+@param bShowBorder
+When then the background control is made slightly
+larger then its tool box child, once that is created.
+Otherwise the background control will not be visible.
+*/
+static Window* CreateToolBoxBackground (
+Window* pParentWindow,
+const bool bShowBorder = true);
+
static ImageRadioButton* CreateCustomImageRadionButton(
Window* pParentWindow,
const ResId& rResId );
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx
b/include/sfx2/sidebar/ControllerFactory.hxx
index 030b050..fa341f1 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -19,8 +19,9 @@
#define SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
#include "sfx2/dllapi.h"
-#include
+#include
#include
+#include
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
@@ -29,7 +30,7 @@ class ToolBox;
namespace sfx2 { namespace sidebar {
-/** Convenience class for easy creation of toolbox controllers.
+/** Convenience class for the easy creation of toolbox controllers.
*/
class SFX2_DLLPUBLIC ControllerFactory
{
@@ -38,7 +39,16 @@ public:
ToolBox* pToolBox,
const sal_uInt16 nItemId,
const ::rtl::OUString& rsCommandName,
-const cssu::Reference& rxFrame);
+const cssu::Reference& rxFrame,
+const cssu::Reference& rxParentWindow,
+const sal_Int32 nItemWidth);
+
+private:
+static cssu::Reference
CreateToolBarController(
+ToolBox* pToolBox,
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sd/source sfx2/source
sd/source/ui/sidebar/LayoutMenu.cxx |1
sd/source/ui/view/drviews1.cxx |3 +
sd/source/ui/view/drviewsa.cxx |2
sfx2/source/sidebar/SidebarController.cxx| 63 +--
sfx2/source/sidebar/SidebarController.hxx|6 --
sfx2/source/sidebar/SidebarDockingWindow.cxx |2
sfx2/source/sidebar/TabBar.cxx | 26 ---
sfx2/source/sidebar/TabBar.hxx | 13 -
8 files changed, 60 insertions(+), 56 deletions(-)
New commits:
commit d8b17867f3c58d5623cca129d6459bae0eb11729
Author: Andre Fischer
Date: Tue May 21 09:46:08 2013 +
i122336: Show docked tab bar after closing undocked sidebar.
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1b6dcd8..b6b56a1 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -98,8 +98,8 @@ sal_Bool SidebarDockingWindow::Close (void)
{
// Do not close the floating window.
// Dock it and close just the deck instead.
-mpSidebarController->RequestCloseDeck();
SetFloatingMode(sal_False);
+mpSidebarController->RequestCloseDeck();
mpSidebarController->NotifyResize();
return sal_False;
}
commit b89784c822670593cb253bcc0d260b93c9936e1c
Author: Andre Fischer
Date: Tue May 21 09:22:27 2013 +
i122291: Showing the right set of layouts for handout mode. Fixed painting
selection in layout panel.
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index dd26a07..2aac13f 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -816,6 +816,7 @@ void LayoutMenu::UpdateSelection (void)
break;
// Find the entry of the menu for to the layout.
+SetNoSelection();
sal_uInt16 nItemCount (GetItemCount());
for (sal_uInt16 nId=1; nId<=nItemCount; nId++)
{
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 615063f..4bc9851 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -519,6 +519,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
if (meEditMode == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 1410116..8cb2297 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -158,6 +158,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame,
ViewShellBase& rViewShellBas
if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
}
commit b27563ac5988d7ce407b045466e952114f54e07c
Author: Andre Fischer
Date: Tue May 21 08:49:40 2013 +
i122352: Do not allow selection of disabled decks via menu.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index a6a4d73..0078418 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -110,7 +110,7 @@ SidebarController::SidebarController (
mpParentWindow,
rxFrame,
::boost::bind(&SidebarController::OpenThenSwitchToDeck, this,
_1),
- ::boost::bind(&SidebarController::ShowPopupMenu, this,
_1,_2,_3))),
+ ::boost::bind(&SidebarController::ShowPopupMenu, this, _1,_2))),
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
@@ -802,10 +802,9 @@ IMPL_LINK(SidebarController, WindowEventHandler,
VclWindowEvent*, pEvent)
void SidebarController::ShowPopupMenu (
const Rectangle& rButtonBox,
-const ::std::vector& rDeckSelectionData,
-const ::std::vector& rDeckShowData) const
+const ::std::vector& rMenuData) const
{
-::boost::shared_ptr pMenu = CreatePopupMenu(rDeckSelectionData,
rDeckShowData);
+::boost::shared_ptr pMenu = CreatePopupMenu(rMenuData);
pMenu->SetSelectHdl(LINK(this, SidebarController, OnMenuItemSel
[Libreoffice-commits] core.git: 5 commits - officecfg/registry sfx2/source svx/source vcl/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |6
sfx2/source/dialog/templdlg.cxx |2
sfx2/source/sidebar/Deck.cxx | 86 ++-
sfx2/source/sidebar/Deck.hxx |5
sfx2/source/sidebar/FocusManager.cxx |8 -
sfx2/source/sidebar/PanelTitleBar.cxx|8 -
sfx2/source/sidebar/Sidebar.hrc |5
sfx2/source/sidebar/Sidebar.src |5
sfx2/source/sidebar/SidebarController.cxx| 28 ++-
sfx2/source/sidebar/SidebarDockingWindow.cxx | 30 +++
sfx2/source/sidebar/SidebarDockingWindow.hxx |4
svx/source/sidebar/SelectionAnalyzer.cxx |4
vcl/source/window/dockwin.cxx| 15 +
13 files changed, 147 insertions(+), 59 deletions(-)
New commits:
commit c6e576da95074215d1dcfbcc4b7c4fad6cdeb27c
Author: Andre Fischer
Date: Fri May 17 08:56:55 2013 +
Resolves: #i122329# Disable undocking of stylist in the sidebar
(cherry picked from commit 8dc875f17c0cdd41e7ba6ad2f4c1ea3bda1a8be2)
Change-Id: I1a19135d3496463c8759e341449fa51d389fa264
(cherry picked from commit 048eca411083bc8a2ef95e5701bf7eba5d232a2d)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7853b72..3d81345 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -398,6 +398,8 @@ SfxTemplatePanelControl::SfxTemplatePanelControl (
OSL_ASSERT(mpBindings!=NULL);
pImpl->updateNonFamilyImages();
+
+SetStyle(GetStyle() & ~WB_DOCKABLE);
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 2ee2f48..42954e6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -755,10 +755,19 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::StateChanged( StateChangedType nType )
{
-if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+switch(nType)
{
-ImplInitSettings();
-Invalidate();
+case STATE_CHANGE_CONTROLBACKGROUND:
+ImplInitSettings();
+Invalidate();
+break;
+
+case STATE_CHANGE_STYLE:
+mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
+break;
+
+default:
+break;
}
Window::StateChanged( nType );
commit 05b2cd081452571dde558b5376d0db41f9049ab4
Author: Andre Fischer
Date: Thu May 16 11:08:30 2013 +
Resolves: #i122321# Fix processing of scroll wheel...
to not block other events
(cherry picked from commit 0a5d252c19fdd4e1e705668a604fb319dc6ceccb)
Change-Id: Ib1a3fa50e071688df41983ce8e2cb6b1c93e18c9
(cherry picked from commit 58da1dc5061fcd9abc7dd296d0d7d04d651dc10f)
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0a319e1..6534ec7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -217,49 +217,57 @@ void Deck::DataChanged (const DataChangedEvent& rEvent)
long Deck::Notify (NotifyEvent& rEvent)
{
-if (rEvent.GetType() != EVENT_COMMAND)
-return sal_False;
+if (rEvent.GetType() == EVENT_COMMAND)
+{
+CommandEvent* pCommandEvent =
reinterpret_cast(rEvent.GetData());
+if (pCommandEvent != NULL)
+switch (pCommandEvent->GetCommand())
+{
+case COMMAND_WHEEL:
+return ProcessWheelEvent(pCommandEvent, rEvent)
+? sal_True
+: sal_False;
+
+default:
+break;
+}
+}
-CommandEvent* pCommandEvent =
reinterpret_cast(rEvent.GetData());
-if (pCommandEvent == NULL)
-return sal_False;
+return Window::Notify(rEvent);
+}
-switch (pCommandEvent->GetCommand())
-{
-case COMMAND_WHEEL:
-{
-if ( ! mpVerticalScrollBar
-|| ! mpVerticalScrollBar->IsVisible())
-return sal_False;
-
-// Ignore all wheel commands from outside the vertical
-// scroll bar. Otherwise after a scroll we might land on
-// a spin field and subsequent wheel events would change
-// the value of that control.
-if (rEvent.GetWindow() != mpVerticalScrollBar.get())
-return sal_True;
-
-// Get the wheel data and check that it describes a valid
-// vertical scroll.
-const CommandWheelData* pData = pCommandEvent->GetWheelData();
-if (pData==NULL
-|| pData->GetModifier()
-|| pData->GetMode() != COMMAND_WHEEL_SCROLL
-|| pData->IsHorz())
-return sal_False;
-
-
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source vcl/source
sfx2/source/dialog/templdlg.cxx |2 ++
vcl/source/window/dockwin.cxx | 15 ---
2 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 048eca411083bc8a2ef95e5701bf7eba5d232a2d
Author: Andre Fischer
Date: Fri May 17 08:56:55 2013 +
Resolves: #i122329# Disable undocking of stylist in the sidebar
(cherry picked from commit 8dc875f17c0cdd41e7ba6ad2f4c1ea3bda1a8be2)
Change-Id: I1a19135d3496463c8759e341449fa51d389fa264
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index dda190a..2f04b53 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -398,6 +398,8 @@ SfxTemplatePanelControl::SfxTemplatePanelControl (
OSL_ASSERT(mpBindings!=NULL);
pImpl->updateNonFamilyImages();
+
+SetStyle(GetStyle() & ~WB_DOCKABLE);
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 2ee2f48..42954e6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -755,10 +755,19 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::StateChanged( StateChangedType nType )
{
-if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+switch(nType)
{
-ImplInitSettings();
-Invalidate();
+case STATE_CHANGE_CONTROLBACKGROUND:
+ImplInitSettings();
+Invalidate();
+break;
+
+case STATE_CHANGE_STYLE:
+mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
+break;
+
+default:
+break;
}
Window::StateChanged( nType );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source
sfx2/source/sidebar/Deck.cxx | 86 +++
sfx2/source/sidebar/Deck.hxx |5 +-
sfx2/source/sidebar/FocusManager.cxx |8 ++-
3 files changed, 56 insertions(+), 43 deletions(-)
New commits:
commit 58da1dc5061fcd9abc7dd296d0d7d04d651dc10f
Author: Andre Fischer
Date: Thu May 16 11:08:30 2013 +
Resolves: #i122321# Fix processing of scroll wheel...
to not block other events
(cherry picked from commit 0a5d252c19fdd4e1e705668a604fb319dc6ceccb)
Change-Id: Ib1a3fa50e071688df41983ce8e2cb6b1c93e18c9
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0a319e1..6534ec7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -217,49 +217,57 @@ void Deck::DataChanged (const DataChangedEvent& rEvent)
long Deck::Notify (NotifyEvent& rEvent)
{
-if (rEvent.GetType() != EVENT_COMMAND)
-return sal_False;
+if (rEvent.GetType() == EVENT_COMMAND)
+{
+CommandEvent* pCommandEvent =
reinterpret_cast(rEvent.GetData());
+if (pCommandEvent != NULL)
+switch (pCommandEvent->GetCommand())
+{
+case COMMAND_WHEEL:
+return ProcessWheelEvent(pCommandEvent, rEvent)
+? sal_True
+: sal_False;
+
+default:
+break;
+}
+}
-CommandEvent* pCommandEvent =
reinterpret_cast(rEvent.GetData());
-if (pCommandEvent == NULL)
-return sal_False;
+return Window::Notify(rEvent);
+}
-switch (pCommandEvent->GetCommand())
-{
-case COMMAND_WHEEL:
-{
-if ( ! mpVerticalScrollBar
-|| ! mpVerticalScrollBar->IsVisible())
-return sal_False;
-
-// Ignore all wheel commands from outside the vertical
-// scroll bar. Otherwise after a scroll we might land on
-// a spin field and subsequent wheel events would change
-// the value of that control.
-if (rEvent.GetWindow() != mpVerticalScrollBar.get())
-return sal_True;
-
-// Get the wheel data and check that it describes a valid
-// vertical scroll.
-const CommandWheelData* pData = pCommandEvent->GetWheelData();
-if (pData==NULL
-|| pData->GetModifier()
-|| pData->GetMode() != COMMAND_WHEEL_SCROLL
-|| pData->IsHorz())
-return sal_False;
-
-// Execute the actual scroll action.
-long nDelta = pData->GetDelta();
-mpVerticalScrollBar->DoScroll(
-mpVerticalScrollBar->GetThumbPos() - nDelta);
-return sal_True;
-}
-default:
-break;
-}
-return sal_False;
+
+bool Deck::ProcessWheelEvent (
+CommandEvent* pCommandEvent,
+NotifyEvent& rEvent)
+{
+if ( ! mpVerticalScrollBar)
+return false;
+if ( ! mpVerticalScrollBar->IsVisible())
+return false;
+
+// Ignore all wheel commands from outside the vertical scroll bar.
+// Otherwise after a scroll we might land on a spin field and
+// subsequent wheel events would change the value of that control.
+if (rEvent.GetWindow() != mpVerticalScrollBar.get())
+return true;
+
+// Get the wheel data and check that it describes a valid vertical
+// scroll.
+const CommandWheelData* pData = pCommandEvent->GetWheelData();
+if (pData==NULL
+|| pData->GetModifier()
+|| pData->GetMode() != COMMAND_WHEEL_SCROLL
+|| pData->IsHorz())
+return false;
+
+// Execute the actual scroll action.
+long nDelta = pData->GetDelta();
+mpVerticalScrollBar->DoScroll(
+mpVerticalScrollBar->GetThumbPos() - nDelta);
+return true;
}
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 171fff7..f49d38f 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -100,8 +100,9 @@ private:
::boost::scoped_ptr mpVerticalScrollBar;
DECL_LINK(HandleVerticalScrollBarChange,void*);
-
-
+bool ProcessWheelEvent (
+CommandEvent* pCommandEvent,
+NotifyEvent& rEvent);
};
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 081fa25..6ed64a5 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -554,6 +554,10 @@ IMPL_LINK(FocusManager, WindowEventListener,
VclSimpleEvent*, pEvent)
case VCLEVENT_WINDOW_GETFOCUS:
case VCLEVENT_WINDOW_LOSEFOCUS:
pSource->Invalidate();
+return 1;
+
+default:
+break;
}
return 0;
@@ -608,14 +612,14 @@ IMPL_LINK(FocusManager, Chi
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx| 28 -
sfx2/source/sidebar/SidebarDockingWindow.cxx | 30 +++
sfx2/source/sidebar/SidebarDockingWindow.hxx |4 +++
3 files changed, 52 insertions(+), 10 deletions(-)
New commits:
commit 3c451f893663c118201ccdd4688fe97f1524d21e
Author: Andre Fischer
Date: Thu May 16 09:51:11 2013 +
Resolves: #i122320# Show closer after docking sidebar.
Prevent sidebar from being docked above or below edit view.
(cherry picked from commit ca7264d7ab7e8b70693362d60227c7dd7626df8b)
Change-Id: I634e0b68c27039613054160b7add5d2d07b666cd
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index c4ea537..c3d4262 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1014,11 +1014,13 @@ bool SidebarController::CanModifyChildWindowWidth (void)
sal_uInt16 nRow (0x);
sal_uInt16 nColumn (0x);
-pSplitWindow->GetWindowPos(mpParentWindow, nColumn, nRow);
-
-sal_uInt16 nRowCount (pSplitWindow->GetWindowCount(nColumn));
-
-return nRowCount==1;
+if (pSplitWindow->GetWindowPos(mpParentWindow, nColumn, nRow))
+{
+sal_uInt16 nRowCount (pSplitWindow->GetWindowCount(nColumn));
+return nRowCount==1;
+}
+else
+return false;
}
@@ -1070,17 +1072,23 @@ void SidebarController::RestrictWidth (void)
SfxSplitWindow* SidebarController::GetSplitWindow (void)
{
-if (mpSplitWindow == NULL)
+if (mpParentWindow != NULL)
{
-if (mpParentWindow != NULL)
+SfxSplitWindow* pSplitWindow =
dynamic_cast(mpParentWindow->GetParent());
+if (pSplitWindow != mpSplitWindow)
{
-mpSplitWindow =
dynamic_cast(mpParentWindow->GetParent());
+if (mpSplitWindow != NULL)
+mpSplitWindow->RemoveEventListener(LINK(this,
SidebarController, WindowEventHandler));
+
+mpSplitWindow = pSplitWindow;
+
if (mpSplitWindow != NULL)
mpSplitWindow->AddEventListener(LINK(this, SidebarController,
WindowEventHandler));
}
+return mpSplitWindow;
}
-
-return mpSplitWindow;
+else
+return NULL;
}
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index f991c7a5..3b6a61d 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -102,4 +102,34 @@ sal_Bool SidebarDockingWindow::Close (void)
}
+
+
+SfxChildAlignment SidebarDockingWindow::CheckAlignment (
+SfxChildAlignment eCurrentAlignment,
+SfxChildAlignment eRequestedAlignment)
+{
+switch (eRequestedAlignment)
+{
+case SFX_ALIGN_TOP:
+case SFX_ALIGN_HIGHESTTOP:
+case SFX_ALIGN_LOWESTTOP:
+case SFX_ALIGN_BOTTOM:
+case SFX_ALIGN_LOWESTBOTTOM:
+case SFX_ALIGN_HIGHESTBOTTOM:
+return eCurrentAlignment;
+
+case SFX_ALIGN_LEFT:
+case SFX_ALIGN_RIGHT:
+case SFX_ALIGN_FIRSTLEFT:
+case SFX_ALIGN_LASTLEFT:
+case SFX_ALIGN_FIRSTRIGHT:
+case SFX_ALIGN_LASTRIGHT:
+return eRequestedAlignment;
+
+default:
+return eRequestedAlignment;
+}
+}
+
+
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx
b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index 2125212..5a54f11 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -49,6 +49,10 @@ protected:
// Window overridables
virtual void GetFocus (void);
+virtual SfxChildAlignment CheckAlignment (
+SfxChildAlignment eCurrentAlignment,
+SfxChildAlignment eRequestedAlignment);
+
private:
::rtl::Reference mpSidebarController;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source
sfx2/source/sidebar/PanelTitleBar.cxx |8 +++-
sfx2/source/sidebar/Sidebar.hrc |5 +++--
sfx2/source/sidebar/Sidebar.src |5 +
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 35c18dc890a8883b974ff73c585033fc3ee3b73e
Author: Andre Fischer
Date: Thu May 16 08:49:36 2013 +
Resolves: #i122271# Provide accessible for panels that...
includes the panel title.
(cherry picked from commit e785c5125994bbfdb4e69108b5a73a184b3ced49)
Change-Id: I97cf9f5f78382dfbd69dcff33b7066380d47313d
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 9b67e3c..3446aca 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -43,7 +43,7 @@ static const sal_Int32 gaRightIconPadding (5);
PanelTitleBar::PanelTitleBar (
const ::rtl::OUString& rsTitle,
Window* pParentWindow,
-Panel* pPanel )
+Panel* pPanel)
: TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
mbIsLeftButtonDown(false),
mpPanel(pPanel),
@@ -52,6 +52,12 @@ PanelTitleBar::PanelTitleBar (
{
OSL_ASSERT(mpPanel != NULL);
+const ::rtl::OUString sAccessibleName(
+String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX))
++ rsTitle);
+SetAccessibleName(sAccessibleName);
+SetAccessibleDescription(sAccessibleName);
+
#ifdef DEBUG
SetText(A2S("PanelTitleBar"));
#endif
diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
index c9c4d79..ac3500b 100644
--- a/sfx2/source/sidebar/Sidebar.hrc
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -52,5 +52,6 @@
#define STRING_CUSTOMIZATION200
#define STRING_RESTORE 201
-#define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1)
-#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2)
+#define SFX_STR_SIDEBAR_MORE_OPTIONS(RID_SFX_SIDEBAR_START +
1)
+#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START +
2)
+#define SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX (RID_SFX_SIDEBAR_START +
3)
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index 6ec57c1..a5d8a03 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -165,3 +165,8 @@ String SFX_STR_SIDEBAR_CLOSE_DECK
Text [en-US] = "Close Sidebar Deck";
};
+String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
+{
+Text [en-US] = "Panel: ";
+};
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +
sfx2/source/sidebar/Deck.cxx |4 ---
sfx2/source/sidebar/SidebarController.cxx| 14 ---
3 files changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 09d043596e8283dd6ced26d1e4ff0da530252df0
Author: Andre Fischer
Date: Fri May 17 12:23:50 2013 +
122219: Show 'Cell Appearance' and 'Number Format' panels when editing
cells.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 927747c..d05cdae 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -752,6 +752,7 @@
Calc, Auditing, visible ;
Calc, Cell, visible ;
+Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot,visible ;
@@ -781,6 +782,7 @@
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot,hidden ;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 76a83b1..416fb0d 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -299,8 +299,6 @@ const SharedPanelContainer& Deck::GetPanels (void) const
void Deck::RequestLayout (void)
{
-//PrintWindowTree();
-
DeckLayouter::LayoutDeck(
GetContentArea(),
maPanels,
@@ -309,8 +307,6 @@ void Deck::RequestLayout (void)
*mpScrollContainer,
*mpFiller,
*mpVerticalScrollBar);
-
-Invalidate();
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index fd0a1af..a6a4d73 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -526,20 +526,6 @@ void SidebarController::SwitchToDeck (
}
}
-if (mpCurrentDeck
-&& ArePanelSetsEqual(mpCurrentDeck->GetPanels(),
aPanelContextDescriptors))
-{
-// Requested set of panels is identical to the current set of
-// panels => Nothing to do.
-return;
-}
-
-// When the document is read-only, check if there are any panels that
can still be displayed.
-if (mbIsDocumentReadOnly)
-{
-}
-
-
// Provide a configuration and Deck object.
if ( ! mpCurrentDeck)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - cui/source sfx2/source svx/source sw/source
cui/source/tabpages/tpline.cxx|3 +--
sfx2/source/sidebar/PanelTitleBar.cxx |4 +---
sfx2/source/sidebar/SidebarController.cxx | 11 +--
sfx2/source/sidebar/SidebarController.hxx |1 +
svx/source/xoutdev/xattr2.cxx |3 +--
sw/source/ui/sidebar/PageSizeControl.cxx |4 ++--
6 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit e65bf3376ec742e2d5e69cad097d17f77fb19a73
Author: Andre Fischer
Date: Fri May 17 11:58:45 2013 +
122315: Include the Tools.hxx header always.
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 9c46e5e..4917412 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -29,14 +29,12 @@
#include "Panel.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include "sfx2/sidebar/ControllerFactory.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include
#include
#include
#include
-#ifdef DEBUG
-#include "sfx2/sidebar/Tools.hxx"
-#endif
using namespace css;
using namespace cssu;
commit b83fb522809c9b54427f60200164f878ae7f4658
Author: Oliver-Rainer Wittmann
Date: Fri May 17 11:35:46 2013 +
122310: page property panel, page size control - display page size as Width
x Height
diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx
b/sw/source/ui/sidebar/PageSizeControl.cxx
index c54f3ee..28b4908 100644
--- a/sw/source/ui/sidebar/PageSizeControl.cxx
+++ b/sw/source/ui/sidebar/PageSizeControl.cxx
@@ -116,9 +116,9 @@ PageSizeControl::PageSizeControl(
maWidthHeightField.IsUseThousandSep(),
maWidthHeightField.IsShowTrailingZeros() );
-ItemText2 = HeightStr;
+ItemText2 = WidthStr;
ItemText2 += String::CreateFromAscii(" x ");
-ItemText2 += WidthStr;
+ItemText2 += HeightStr;
ItemText2 += String::CreateFromAscii(" ");
ItemText2 += aMetricStr;
commit a30912ea805a74f2ef47e10511d6e85ed4600b73
Author: Andre Fischer
Date: Fri May 17 11:13:52 2013 +
122082: React to changes read-only <-> read-write more realiably.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 8e230c1..fd0a1af 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -93,6 +93,10 @@ namespace {
MID_FIRST_PANEL,
MID_FIRST_HIDE = 1000
};
+
+/** When in doubt, show this deck.
+*/
+static const ::rtl::OUString gsDefaultDeckId(A2S("PropertyDeck"));
}
@@ -110,7 +114,7 @@ SidebarController::SidebarController (
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
- msCurrentDeckId(A2S("PropertyDeck")),
+ msCurrentDeckId(gsDefaultDeckId),
msCurrentDeckTitle(),
maPropertyChangeForwarder(::boost::bind(&SidebarController::BroadcastPropertyChange,
this)),
maContextChangeUpdate(::boost::bind(&SidebarController::UpdateConfigurations,
this)),
@@ -260,7 +264,10 @@ void SAL_CALL SidebarController::statusChanged (const
css::frame::FeatureStateEv
mbIsDocumentReadOnly = !bIsReadWrite;
// Force the current deck to update its panel list.
-SwitchToDeck(msCurrentDeckId);
+if ( ! mbIsDocumentReadOnly)
+msCurrentDeckId = gsDefaultDeckId;
+maCurrentContext = Context();
+maContextChangeUpdate.RequestCall();
}
}
diff --git a/sfx2/source/sidebar/SidebarController.hxx
b/sfx2/source/sidebar/SidebarController.hxx
index dfa588c..e940974 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -163,6 +163,7 @@ private:
/** Make maRequestedContext the current context.
*/
void UpdateConfigurations (void);
+
bool ArePanelSetsEqual (
const SharedPanelContainer& rCurrentPanels,
const ResourceManager::PanelContextDescriptorContainer&
rRequestedPanels);
commit ee4c4e4fe15a3ec3af8e7d75cc314025793726c1
Author: Pavel JanÃk
Date: Fri May 17 10:18:30 2013 +
Use default case instead of handling a "meta" value.
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 5b8bb26..3aaadc9 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -223,8 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation(
SfxItemPresentation ePres,
nId = RID_SVXSTR_LINEJOINT_ROUND;
break;
-// Not handled?
-case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ):
+default:
break;
}
commit 0faa03061eb281510b885c7d39f2f0a3d2db10f2
Author: Pavel JanÃk
Date: Fri May 17 10:17:32 2013 +
