[Libreoffice-commits] core.git: svl/source
svl/source/items/itempool.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 55dd17942cde0a1dd50fb534cff415adbc0b6a5e
Author: Andre Fischer a...@apache.org
Date: Thu Jun 21 07:27:44 2012 +
i#120055 Prevent crash caused by un-disposed secondary item pool.
Conflicts:
svl/source/items/itempool.cxx
Adapted to new pImp implementation. (erAck)
Change-Id: I106f0dc41bc8f41d394d680fe89a8fee6a2f508a
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 13b3b2a..54593b3 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -338,10 +338,21 @@ void SfxItemPool::ReleaseDefaults
SfxItemPool::~SfxItemPool()
{
DBG_DTOR(SfxItemPool, 0);
-DBG_ASSERT( pImp-mpMaster == this, destroying active Secondary-Pool );
if ( !pImp-maPoolItems.empty() pImp-ppPoolDefaults )
Delete();
+
+if (pImp-mpMaster != NULL pImp-mpMaster != this)
+{
+// This condition indicates an error. A
+// pImp-mpMaster-SetSecondaryPool(...) call should have been made
+// earlier to prevent this. At this point we can only try to
+// prevent a crash later on.
+DBG_ASSERT( pImp-mpMaster == this, destroying active Secondary-Pool
);
+if (pImp-mpMaster-pImp-mpSecondary == this)
+pImp-mpMaster-pImp-mpSecondary = NULL;
+}
+
delete pImp;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sd/source writerfilter/source
sd/source/filter/eppt/epptso.cxx|3 +++
sd/source/ui/unoidl/unomodel.cxx|3 ++-
writerfilter/source/dmapper/PropertyMap.cxx |2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2a4161f7098b9bcb76eadbc82212038bbaebed2b
Author: Andre Fischer a...@apache.org
Date: Thu Aug 30 07:28:53 2012 +
#i119592# Fixed column widths.
Reported by: xiao ting xiao
Patch by: wujinlong@...
Reviewed by: Andre Fischer
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 8f19057..9e22551 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -543,7 +543,7 @@ uno::Reference text::XTextColumns
SectionPropertyMap::ApplyColumnProperties(
uno::Reference beans::XPropertySet xColumnPropSet( xColumns,
uno::UNO_QUERY_THROW );
if( !m_bEvenlySpaced
(sal_Int32(m_aColWidth.size()) == (m_nColumnCount + 1 ))
-(sal_Int32(m_aColDistance.size()) == m_nColumnCount))
+((sal_Int32(m_aColDistance.size()) == m_nColumnCount) ||
(sal_Int32(m_aColDistance.size()) == m_nColumnCount + 1)) )
{
//the column width in word is an absolute value, in OOo it's
relative
//the distances are both absolute
commit 40ca6b3a9f805e4a1c12a9ed2c487282fff1c08b
Author: Armin Le Grand a...@apache.org
Date: Wed Jun 20 12:52:26 2012 +
#119459# Corrected export of connectors to PPT format, Patch by: Sun Ying,
Review by: alg
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 106bb74..f543cde 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2664,6 +2664,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
mpPptEscherEx-OpenContainer( ESCHER_SpContainer );
ImplCreateShape( nSpType, nSpFlags, aSolverContainer );
+
+// #119459# for connector shape, the start point and end point
is fixed, and should not be rotated.
+mnAngle = 0;
}
else if ( mType == drawing.Measure )
{
commit 69b0688589fe611d873d2c8d2556dd1279c764a0
Author: Zhe Wang wangz...@apache.org
Date: Fri Sep 7 02:11:47 2012 +
Fix issue #i119524#: [From Symphony]Can not open the sample ppt file which
contain vb controls in the slide master.
* subversion/main/sd/source/ui/unoidl/unomodel.cxx
[]Before initializeDocument,should check whether it is in loading process
Patch by: Yin Bing steve.yin@gmail.com
Suggested by:Wang Zhe kingwise...@gmail.com
Found by: Du Jing jbjduj...@gmail.com
Review by: Wang Zhe kingwise...@gmail.com
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 037a2cd..32249c1 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -736,7 +736,8 @@ uno::Reference drawing::XDrawPages SAL_CALL
SdXImpressDocument::getMasterPage
if( !xMasterPages.is() )
{
-initializeDocument();
+if ( !hasControllersLocked() )
+initializeDocument();
mxMasterPagesAccess = xMasterPages = new SdMasterPagesAccess(*this);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - filter/source
filter/source/msfilter/msdffimp.cxx | 31 +++
1 file changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 5278c7770a350771a96780c0e0d7a0bdae0d55b9
Author: Andre Fischer a...@apache.org
Date: Tue Jul 10 10:01:05 2012 +
#i119872# Fixed import of custom shapes from PPT.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index cf760ef..6a98e71 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2243,23 +2243,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;
commit c789d126aacda9c5d2ccf3c51d669b1796180f66
Author: Andre Fischer a...@apache.org
Date: Fri Jul 6 12:07:22 2012 +
#i119887# Fixing import of shadow direction.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 96b69b7..cf760ef 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2604,15 +2604,13 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
{
sal_Int32 nVal = static_cast sal_Int32 ( GetPropertyValue(
DFF_Prop_shadowOffsetX ) );
rManager.ScaleEmu( nVal );
-if ( nVal )
-rSet.Put( SdrShadowXDistItem( nVal ) );
+rSet.Put( SdrShadowXDistItem( nVal ) );
}
if ( IsProperty( DFF_Prop_shadowOffsetY ) )
{
sal_Int32 nVal = static_cast sal_Int32 ( GetPropertyValue(
DFF_Prop_shadowOffsetY ) );
rManager.ScaleEmu( nVal );
-if ( nVal )
-rSet.Put( SdrShadowYDistItem( nVal ) );
+rSet.Put( SdrShadowYDistItem( nVal ) );
}
if ( IsProperty( DFF_Prop_fshadowObscured ) )
{
commit cf4260b85213b263f78c51d33557176c813989ef
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 11:04:52 2012 +
#i119888# Fixed import of gradient colored shapes from PPT.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
diff --git a/filter/source
Re: [tdf-discuss] macro compatibility between LO and AOO?
On 05.03.2013 18:29, Michael Meeks wrote: Hi guys, On Tue, 2013-03-05 at 09:19 -0800, Fred Ollinger wrote: I was wondering if libreoffice and aooo can't agree to some basic level api for 3rd party developers? It's an interesting discussion; but in the absence of any concrete code, patches etc. it doesn't belong on the libreoffice developer list; Talking about a concrete change is a good idea so please let me ask a question similar to one I asked at FOSDEM but to which I got no clear answer. Probably because of my bad English that is even worse when I speak it. Stephan Bergman talked about Well-typed UNO, something that would involve incompatible changes to the UNO API. I would like to know if LibreOffice and Apache OpenOffice could work together on this. I am just talking about changes on API level not the underlying implementation. That would be something that both projects would do independently. I am asking this because I think that the users of both LO and AOO would benefit from APIs that are as similar as possible. I am aware that there are other incompatible changes in both projects but every part of the API that remains compatible between LO and AOO means that an extension developer does not have to care about it when developing an extension for both projects. please drop that one from the CC. As my question is directed at (to?) the LibreOffice developers, I hope that you don't mind that I have put the LO list back on CC. Thanks, Andre Thanks, Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [tdf-discuss] macro compatibility between LO and AOO?
On 06.03.2013 15:25, Stephan Bergmann wrote: On 03/06/2013 09:00 AM, Andre Fischer wrote: On 05.03.2013 18:29, Michael Meeks wrote: On Tue, 2013-03-05 at 09:19 -0800, Fred Ollinger wrote: I was wondering if libreoffice and aooo can't agree to some basic level api for 3rd party developers? It's an interesting discussion; but in the absence of any concrete code, patches etc. it doesn't belong on the libreoffice developer list; Talking about a concrete change is a good idea so please let me ask a question similar to one I asked at FOSDEM but to which I got no clear answer. Probably because of my bad English that is even worse when I speak it. Stephan Bergman talked about Well-typed UNO, something that would involve incompatible changes to the UNO API. I would like to know if LibreOffice and Apache OpenOffice could work together on this. I am just talking about changes on API level not the underlying implementation. That would be something that both projects would do independently. First off, depends on what you mean with UNO API. One customary meaning is the set of UNOIDL entities (mainly) declared in udkapi/ and offapi/ .idl files. (LibreOffice tries to meticulously track any incompatible changes it does there, see e.g., the API Changes section at http://www.libreoffice.org/download/4-0-new-features-and-fixes/.) Another customary meaning is the broader concept of stable interface the URE offers, including C ABI, file formats, wire protocols, etc. My hope is that my work on changing the type representation does not affect the former, only the latter (file formats etc.). And, obviously, it will need to take care of a backward-compatibility plan. By UNO API I mean everything that affects a packaged extension, that is basically your option B. So if I understand you correctly that an extension developer just has to recompile (for a C++ extension) the source code, repackage the extension and is done (with respect to your changes). That sounds good. That said, I can only repeat now what I already said at FOSDEM, that I'm going to well document all the changes to any specifications---just like I did for any other changes to UNO I did over the last ten years or so. And, as always, any input is highly welcome. Great. Thanks. Do you have a pointer to the relevant documentation? -Andre Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/escherex.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6bf213237139cf1dbea3b793a90a0245872f1110
Author: Andre Fischer a...@apache.org
Date: Tue Jun 12 06:23:27 2012 +
#i119502# Guard array access against invalid indices.
Patch by: SunYing
Review by: Andre
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 81a12ed..5d5809b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1962,8 +1962,12 @@ sal_Int32 GetValueForEnhancedCustomShapeParameter( const
com::sun::star::drawing
{
case
com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
-nValue = (sal_uInt16)rEquationOrder[ nValue ];
-nValue |= (sal_uInt32)0x8000;
+OSL_ASSERT(nValue rEquationOrder.size());
+if ( nValue rEquationOrder.size() )
+{
+nValue = (sal_uInt16)rEquationOrder[ nValue ];
+nValue |= (sal_uInt32)0x8000;
+}
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL
:
___
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/svdfppt.cxx |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 87354e7fc1f63480bdef092047f912682bc7ac58
Author: Andre Fischer a...@apache.org
Date: Thu Jun 7 10:42:10 2012 +
i#119478# Fixed application of transparency to table cells.
Patch by: Lei Debin
Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 94bf34b..113d912 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7336,12 +7336,8 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference XCell xCell )
if ( eFillStyle != XFILL_NONE )
{
sal_Int16 nFillTransparence( ( (const
XFillTransparenceItem)pObj-GetMergedItem( XATTR_FILLTRANSPARENCE )
).GetValue() );
-if ( nFillTransparence != 100 )
-{
-nFillTransparence *= 100;
-static const rtl::OUString sFillTransparence( String(
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
-xPropSet-setPropertyValue( sFillTransparence, Any(
nFillTransparence ) );
-}
+static const rtl::OUString sFillTransparence( String(
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
+xPropSet-setPropertyValue( sFillTransparence, Any(
nFillTransparence ) );
}
}
catch( const Exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/source
filter/source/msfilter/svdfppt.cxx |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 0bd9229fdeb4bcf3023bef65257ff8317590455a
Author: Andre Fischer a...@apache.org
Date: Thu Jun 7 10:42:10 2012 +
i#119478# Fixed application of transparency to table cells.
Patch by: Lei Debin
Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
(cherry picked from commit 87354e7fc1f63480bdef092047f912682bc7ac58)
Reviewed-on: https://gerrit.libreoffice.org/2725
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index b44fe62..306309d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7329,12 +7329,8 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference XCell xCell )
if ( eFillStyle != XFILL_NONE )
{
sal_Int16 nFillTransparence( ( (const
XFillTransparenceItem)pObj-GetMergedItem( XATTR_FILLTRANSPARENCE )
).GetValue() );
-if ( nFillTransparence != 100 )
-{
-nFillTransparence *= 100;
-static const rtl::OUString sFillTransparence( String(
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
-xPropSet-setPropertyValue( sFillTransparence, Any(
nFillTransparence ) );
-}
+static const rtl::OUString sFillTransparence( String(
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
+xPropSet-setPropertyValue( sFillTransparence, Any(
nFillTransparence ) );
}
}
catch( const Exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/uno/unonrule.cxx | 13 ++---
1 file changed, 2 insertions(+), 11 deletions(-)
New commits:
commit 8569f74b898f3c82f338ee151d49ff30ad1e3035
Author: Andre Fischer a...@apache.org
Date: Fri Jun 8 10:36:51 2012 +
i#119907# Numbering type now applied (almost) unconditionally.
Patch by: Steve Yin
Cleanup: af
Change-Id: Iccf48a24cc947115524b1d92874386c1e2e0aecf
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 4e6a414..d8937a7 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -286,18 +286,9 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const
Sequence beans::Prope
sal_Int16 nSet = sal_Int16();
aVal = nSet;
-switch(nSet)
+// There is no reason to limit numbering types.
+if ( nSet=0 )
{
-case SVX_NUM_BITMAP:
-case SVX_NUM_CHAR_SPECIAL:
-case SVX_NUM_ROMAN_UPPER:
-case SVX_NUM_ROMAN_LOWER:
-case SVX_NUM_CHARS_UPPER_LETTER:
-case SVX_NUM_CHARS_LOWER_LETTER:
-case SVX_NUM_ARABIC:
-case SVX_NUM_NUMBER_NONE:
-case SVX_NUM_CHARS_UPPER_LETTER_N:
-case SVX_NUM_CHARS_LOWER_LETTER_N:
aFmt.SetNumberingType(nSet);
continue;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/manager/dp_extensionmanager.cxx |4 1 file changed, 4 insertions(+) New commits: commit af37523b69b9e445fdf860e98e896daabf386e41 Author: Andre Fischer a...@apache.org Date: Mon Jun 25 15:12:42 2012 + Resolves: #i119272# Trigger deletion of temporary files of extension manager (cherry picked from commit 84598594a6f36c2e3fc219d8cf1ec74b902e5e11) Change-Id: I5f581cb46e21c738ebf95eb30bcb517922e7f24b diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 55d9802..85f0566 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1171,6 +1171,10 @@ uno::Sequence uno::SequenceReferencedeploy::XPackage getBundledRepository()-getDeployedPackages(xAbort, xCmdEnv); addExtensionsToMap(mapExt, bundledExt, bundled); +// Create the tmp repository to trigger its clean up (deletion +// of old temporary data.) +getTmpRepository(); + //copy the values of the map to a vector for sorting ::std::vector ::std::vectorReferencedeploy::XPackage vecExtensions; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f04463012e630f439dd0004120c6717b90c52a54 Author: Andre Fischer a...@apache.org Date: Fri Jun 29 06:18:01 2012 + Fixed typo (missing $) in configure.ac (cherry picked from commit e755623a1d2cb24fc8c339eb0c0888c42d6c0ba7) Conflicts: configure.in Change-Id: I2a7a9ab83ac29c0306366303374e93ab08cd10ce diff --git a/configure.ac b/configure.ac index 0f19e1b..25fc5cd 100644 --- a/configure.ac +++ b/configure.ac @@ -6900,7 +6900,7 @@ if test $enable_epm = yes; then AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.]) fi fi -if echo PKGFORMAT | $EGREP osx 21 /dev/null; then +if echo $PKGFORMAT | $EGREP osx 21 /dev/null; then if test $_os = Darwin; then AC_MSG_CHECKING([for PackageMaker availability]) if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then ___ 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 a01e4aa97b086b898499b84760ac271b0cc4a479
Author: Andre Fischer a...@apache.org
Date: Tue Jun 12 10:44:51 2012 +
Resolves: #i119554# Fixed export of viewpoint property.
Patch by: Lei Debin
Reviewed by: Andre
(cherry picked from commit 9667c78f99156ff4dd49002da270bc610bf75920)
Change-Id: I993ee9497e5da5d0af499fcab1d203766a18a4a9
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 57a761c..d75f020 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1856,8 +1856,8 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream rIn, SfxIt
// ViewPoint in 1/100mm
if ( IsProperty( DFF_Prop_c3DXViewpoint ) || IsProperty(
DFF_Prop_c3DYViewpoint ) || IsProperty( DFF_Prop_c3DZViewpoint ) )
{
-double fViewX = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DXViewpoint, 1249920 )) / 360.0;
-double fViewY = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DYViewpoint, (sal_uInt32)-1249920 ))/ 360.0;
+double fViewX = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DXViewpoint, 125 )) / 360.0;
+double fViewY = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DYViewpoint, (sal_uInt32)-125 ))/ 360.0;
double fViewZ = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DZViewpoint, 900 )) / 360.0;
::com::sun::star::drawing::Position3D aExtrusionViewPoint( fViewX,
fViewY, fViewZ );
const OUString sExtrusionViewPoint( ViewPoint );
___
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/SidebarController.cxx | 15 +--
sfx2/source/sidebar/SidebarController.hxx |3 ++-
2 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 02e826258f757e954f40f6a928a0351724a7280a
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:04:57 2013 +
Related: #i121420# Provide sidebar panels with XCanvas objects.
(cherry picked from commit d179a612f5f9c01776ea52bfdcf27f1cb864f249)
Conflicts:
sfx2/source/sidebar/SidebarController.cxx
Change-Id: I755d55ac0f5a97fdd11476ce11631afb362e83d8
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 08e1e6d..55a384e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -35,6 +35,7 @@
#include splitwin.hxx
#include svl/smplhint.hxx
#include tools/link.hxx
+#include toolkit/helper/vclunohelper.hxx
#include comphelper/processfactory.hxx
#include comphelper/componentcontext.hxx
#include comphelper/namedvaluecollection.hxx
@@ -46,6 +47,7 @@
#include com/sun/star/ui/XUIElementFactory.hpp
#include com/sun/star/util/XURLTransformer.hpp
#include com/sun/star/util/URL.hpp
+#include com/sun/star/rendering/XSpriteCanvas.hpp
#include boost/bind.hpp
#include boost/function.hpp
@@ -491,6 +493,7 @@ bool SidebarController::ArePanelSetsEqual (
const SharedPanelContainer rCurrentPanels,
const ResourceManager::PanelContextDescriptorContainer rRequestedPanels)
{
+#ifdef DEBUG
OSL_TRACE(current panel list:);
for (SharedPanelContainer::const_iterator
iPanel(rCurrentPanels.begin()),
@@ -510,6 +513,7 @@ bool SidebarController::ArePanelSetsEqual (
{
OSL_TRACE(panel %s, S2A(iId-msId));
}
+#endif
if (rCurrentPanels.size() != rRequestedPanels.size())
return false;
@@ -553,7 +557,8 @@ SharedPanel SidebarController::CreatePanel (
// Create the XUIElement.
Referenceui::XUIElement xUIElement (CreateUIElement(
pPanel-GetComponentInterface(),
-pPanelDescriptor-msImplementationURL));
+pPanelDescriptor-msImplementationURL,
+pPanelDescriptor-mbWantsCanvas));
if (xUIElement.is())
{
// Initialize the panel and add it to the active deck.
@@ -572,7 +577,8 @@ SharedPanel SidebarController::CreatePanel (
Referenceui::XUIElement SidebarController::CreateUIElement (
const Referenceawt::XWindowPeer rxWindow,
-const ::rtl::OUString rsImplementationURL)
+const ::rtl::OUString rsImplementationURL,
+const bool bWantsCanvas)
{
try
{
@@ -590,6 +596,11 @@ Referenceui::XUIElement
SidebarController::CreateUIElement (
aCreationArguments.put(SfxBindings,
makeAny(sal_uInt64(pSfxDockingWindow-GetBindings(;
aCreationArguments.put(Theme, Theme::GetPropertySet());
aCreationArguments.put(Sidebar,
makeAny(Referenceui::XSidebar(static_castui::XSidebar*(this;
+if (bWantsCanvas)
+{
+Referencerendering::XSpriteCanvas xCanvas
(VCLUnoHelper::GetWindow(rxWindow)-GetSpriteCanvas());
+aCreationArguments.put(Canvas, makeAny(xCanvas));
+}
Referenceui::XUIElement xUIElement(
xUIElementFactory-createUIElement(
diff --git a/sfx2/source/sidebar/SidebarController.hxx
b/sfx2/source/sidebar/SidebarController.hxx
index 8902a73..38ce50b 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -124,7 +124,8 @@ private:
const ResourceManager::PanelContextDescriptorContainer
rRequestedPanels);
cssu::Referencecss::ui::XUIElement CreateUIElement (
const cssu::Referencecss::awt::XWindowPeer rxWindow,
-const ::rtl::OUString rsImplementationURL);
+const ::rtl::OUString rsImplementationURL,
+const bool bWantsCanvas);
SharedPanel CreatePanel (
const ::rtl::OUString rsPanelId,
::Window* pParentWindow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - offapi/com
offapi/com/sun/star/ui/LayoutSize.idl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4497c8dd71735cb896198f613e13979930132700
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:10:36 2013 +
Resolves: #i122030# Fixed bug in documentation that breaks autodoc
processing
Found and patched by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 2784b2266ba8ce1dcd899a06626669dfd4dadde5)
Change-Id: I5fafe38f007a9a98b34e3fc99950bdb8e4c79278
diff --git a/offapi/com/sun/star/ui/LayoutSize.idl
b/offapi/com/sun/star/ui/LayoutSize.idl
index 42d76ab..c3aa383 100644
--- a/offapi/com/sun/star/ui/LayoutSize.idl
+++ b/offapi/com/sun/star/ui/LayoutSize.idl
@@ -22,7 +22,7 @@ module com { module sun { module star { module ui {
/** Size used for layouting windows.
It specifies a range of valid values and a preferred value.
-The values must not violate the relation 0 = Minimum = Preferred =
Maximum.
+The values must not violate the relation 0 lt;#61; Minimum lt;#61;
Preferred lt;#61; Maximum.
@param Minimum
Zero or positive. The value itself is included in the valid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sw/source
sw/source/ui/uiview/viewtab.cxx | 1123
1 file changed, 565 insertions(+), 558 deletions(-)
New commits:
commit dcf9e218ca028864ac9af76bf04ab69939918f3b
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:20:30 2013 +
Resolves: #i122028# Fixed crash when processing .uno:SwPageColumn
Reported by: Ariel Constenla-Haile
Patch by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 717671a6ec6eab7d87fe7236bb792569151e6b08)
Conflicts:
sw/source/ui/uiview/viewtab.cxx
Change-Id: I127db2160c16789f672b5520a77e27d1f6dac719
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index b1ffc8f..cd66267 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -253,6 +253,7 @@ void SwView::ExecTabWin( SfxRequest rReq )
const sal_Bool bBrowse = rSh.GetViewOptions()-getBrowseMode();
const sal_uInt16 nSlot = rReq.GetSlot();
+const SfxItemSet* pReqArgs = rReq.GetArgs();
const sal_uInt16 nDescId= rSh.GetCurPageDesc();
const SwPageDesc rDesc = rSh.GetPageDesc( nDescId );
@@ -273,692 +274,698 @@ void SwView::ExecTabWin( SfxRequest rReq )
rSh.StartAllAction();
bool bSect = 0 != (nFrmType FRMTYPE_COLSECT);
-switch ( nSlot )
+switch (nSlot)
{
case SID_ATTR_LONG_LRSPACE:
-{
-SvxLongLRSpaceItem aLongLR( (const SvxLongLRSpaceItem)rReq.GetArgs()-
-Get( SID_ATTR_LONG_LRSPACE
) );
-SvxLRSpaceItem aLR(RES_LR_SPACE);
-if ( !bSect (bFrmSelection || nFrmType FRMTYPE_FLY_ANY) )
+if ( pReqArgs )
{
-SwFrmFmt* pFmt = ((SwFrmFmt*)rSh.GetFlyFrmFmt());
-const SwRect rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
-
-bool bVerticalFrame(false);
+SvxLongLRSpaceItem aLongLR( (const SvxLongLRSpaceItem)pReqArgs-
+Get(
SID_ATTR_LONG_LRSPACE ) );
+SvxLRSpaceItem aLR(RES_LR_SPACE);
+if ( !bSect (bFrmSelection || nFrmType FRMTYPE_FLY_ANY) )
{
-sal_Bool bRTL;
-sal_Bool bVertL2R;
-bVerticalFrame = ( bFrmSelection
- rSh.IsFrmVertical(sal_True, bRTL, bVertL2R)
) ||
- ( !bFrmSelection bVerticalWriting);
-}
-long nDeltaX = bVerticalFrame ?
-rRect.Right() - rPageRect.Right() + aLongLR.GetRight() :
-rPageRect.Left() + aLongLR.GetLeft() - rRect.Left();
+SwFrmFmt* pFmt = ((SwFrmFmt*)rSh.GetFlyFrmFmt());
+const SwRect rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
-SfxItemSet aSet( GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
-RES_VERT_ORIENT, RES_HORI_ORIENT,
-RES_COL, RES_COL, 0 );
+bool bVerticalFrame(false);
+{
+sal_Bool bRTL;
+sal_Bool bVertL2R;
+bVerticalFrame = ( bFrmSelection
+ rSh.IsFrmVertical(sal_True, bRTL,
bVertL2R) ) ||
+ ( !bFrmSelection bVerticalWriting);
+}
+long nDeltaX = bVerticalFrame ?
+rRect.Right() - rPageRect.Right() + aLongLR.GetRight() :
+rPageRect.Left() + aLongLR.GetLeft() - rRect.Left();
-if(bVerticalFrame)
-{
-SwFmtVertOrient aVertOrient(pFmt-GetVertOrient());
-aVertOrient.SetVertOrient(text::VertOrientation::NONE);
-aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaX );
-aSet.Put( aVertOrient );
-}
-else
-{
-SwFmtHoriOrient aHoriOrient( pFmt-GetHoriOrient() );
-aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
-aHoriOrient.SetPos( aHoriOrient.GetPos() + nDeltaX );
-aSet.Put( aHoriOrient );
-}
+SfxItemSet aSet( GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
+RES_VERT_ORIENT, RES_HORI_ORIENT,
+RES_COL, RES_COL, 0 );
-SwFmtFrmSize aSize( pFmt-GetFrmSize() );
-long nOldWidth = (long) aSize.GetWidth();
+if(bVerticalFrame)
+{
+SwFmtVertOrient aVertOrient(pFmt-GetVertOrient());
+aVertOrient.SetVertOrient(text::VertOrientation::NONE);
+aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaX );
+aSet.Put( aVertOrient );
+}
+else
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sc/source
sc/source/ui/view/formatsh.cxx | 76 +
1 file changed, 40 insertions(+), 36 deletions(-)
New commits:
commit 61b4764c96fa4425ab0c3239a232fa5ebd13fbf8
Author: Andre Fischer a...@apache.org
Date: Thu Apr 11 12:29:52 2013 +
Resolves: #i122027# Fixed crash when processing .uno:NumberType command
Reported by: Ariel Constenla-Haile
Patch by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 6a56f5db1d478297aedd3395a882fc2dcce80e82)
Change-Id: Idbcb46b617fc2d2e2d587cdd74226380a2019303
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3980751..2916810 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1131,45 +1131,49 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest rReq )
break;
case SID_NUMBER_TYPE_FORMAT:
+if ( pReqArgs )
{
-SfxInt16Item aFormatItem((const
SfxInt16Item)rReq.GetArgs()-Get(nSlot));
-sal_uInt16 nFormat = aFormatItem.GetValue();
-switch(nFormat)
+const SfxPoolItem* pItem;
+if ( pReqArgs-GetItemState( nSlot, sal_True, pItem ) ==
SFX_ITEM_SET )
{
-case 0:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER);
//Modify
-break;
-case 1:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER, 2 );
//Modify
-break;
-case 2:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_PERCENT );
-break;
-case 3:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_CURRENCY );
-break;
-case 4:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_DATE );
-break;
-case 5:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_TIME );
-break;
-case 6:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_SCIENTIFIC );
-break;
-case 7:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_FRACTION );
-break;
-case 8:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_LOGICAL );
-break;
-case 9:
-pTabViewShell-SetNumberFormat( NUMBERFORMAT_TEXT );
-break;
-default:
-;
+sal_uInt16 nFormat = ((SfxInt16Item *)pItem)-GetValue();
+switch(nFormat)
+{
+case 0:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER);
//Modify
+break;
+case 1:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_NUMBER, 2
); //Modify
+break;
+case 2:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_PERCENT );
+break;
+case 3:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_CURRENCY
);
+break;
+case 4:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_DATE );
+break;
+case 5:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_TIME );
+break;
+case 6:
+pTabViewShell-SetNumberFormat(
NUMBERFORMAT_SCIENTIFIC );
+break;
+case 7:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_FRACTION
);
+break;
+case 8:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_LOGICAL );
+break;
+case 9:
+pTabViewShell-SetNumberFormat( NUMBERFORMAT_TEXT );
+break;
+default:
+;
+}
+rReq.Done();
}
-rReq.Done();
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/ppt/pptin.cxx | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit aac0ada9914c87c8c1c017744548602374f80320
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 12:59:06 2012 +
Fix #i119545# Fixed import of master page layout from PPT.
Reported by: Li Feng Wang
Patch by: SunYing
Review by: Andre Fischer
(cherry picked from commit f7da26f51bfaddecd7b774bc237d6f5fa082e57c)
Conflicts:
sd/source/filter/ppt/pptin.cxx
Change-Id: Ic946de22b3f7ab1d498e71f3d5752ad6f89e2de5
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 1bbb915..4e67229 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -627,7 +627,13 @@ sal_Bool ImplSdPPTImport::Import()
{
sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE;
sal_uInt32 nOutlinerInstance = TSS_TYPE_BODY;
-
+const PptSlideLayoutAtom* pSlideLayout =
GetSlideLayoutAtom();
+sal_Bool bSwapStyleSheet = pSlideLayout-eLayout ==
PPT_LAYOUT_TITLEMASTERSLIDE;
+if ( bSwapStyleSheet )
+{
+nTitleInstance = TSS_TYPE_TITLE;
+nOutlinerInstance = TSS_TYPE_SUBTITLE;
+}
/
// titelstylesheet //
/
@@ -994,7 +1000,6 @@ sal_Bool ImplSdPPTImport::Import()
if( pStbMgr )
pStbMgr-SetState( nImportedPages++ );
}
-//
}
else
{
@@ -2261,7 +2266,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
{
if ( eAktPageKind == PPT_MASTERPAGE )
{
-sal_Bool bCreatePlaceHolder = ( pTextObj-GetInstance() !=
TSS_TYPE_SUBTITLE ) ( pTextObj-GetInstance() != TSS_TYPE_UNUSED );
+sal_Bool bCreatePlaceHolder = ( pTextObj-GetInstance() !=
TSS_TYPE_UNUSED );
sal_Bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) ||
(ePresKind == PRESOBJ_FOOTER)
|| (ePresKind == PRESOBJ_DATETIME) ||
(ePresKind == PRESOBJ_SLIDENUMBER);
if ( bCreatePlaceHolder ( pTextObj-GetInstance() ==
TSS_TYPE_TEXT_IN_SHAPE ) )
@@ -2293,6 +2298,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
rItemSet.Put(
(SdrTextLowerDistItem)pText-GetMergedItem( SDRATTR_TEXT_LOWERDIST ) );
rItemSet.Put(
(SdrTextVertAdjustItem)pText-GetMergedItem( SDRATTR_TEXT_VERTADJUST ) );
rItemSet.Put(
(SdrTextHorzAdjustItem)pText-GetMergedItem( SDRATTR_TEXT_HORZADJUST ) );
+if ( pTextObj-GetInstance() == TSS_TYPE_TITLE
+|| pTextObj-GetInstance() == TSS_TYPE_SUBTITLE)
+{
+rItemSet.Put( pText-GetMergedItemSet() );
+}
}
pText-NbcSetStyleSheet( pSheet2, sal_False );
}
@@ -2649,7 +2659,6 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream rSt,
DffObjData rObjData, voi
}
maAnimations[pMediaObj] =
pAnimation;
}
-//--
SdrObject::Free( pObj ), pObj =
pMediaObj; // SJ: hoping that pObj is not inserted in any list
pMediaObj-setURL( aMediaURL );
___
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/svdfppt.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 694ac8155517a88e7317170b189f9d5fabc270b0
Author: Andre Fischer a...@apache.org
Date: Tue Jun 12 11:06:43 2012 +
Resolves: #i119546# Set minimal ppt table border width to 1
for loading from ppt format.
Patch by: Lei Debin
Review by: Andre
(cherry picked from commit 2b747915abca3369178d177291d706377676b19e)
Conflicts:
filter/source/msfilter/svdfppt.cxx
Change-Id: I2c10ae8161c44f2c60e7605a529887a0925d456d
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 93aaeaf..1de1b2e 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7412,7 +7412,9 @@ void ApplyCellLineAttributes( const SdrObject* pLine,
Reference XTable xTabl
{
Color aLineColor( ((XLineColorItem)pLine-GetMergedItem(
XATTR_LINECOLOR )).GetColorValue() );
aBorderLine.Color = aLineColor.GetColor();
-aBorderLine.LineWidth = static_cast sal_Int16 ( ((const
XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 );
+// Avoid width = 0, the min value should be 1.
+sal_Int32 nLineWidth = std::max(sal_Int32(1), ((const
XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4);
+aBorderLine.LineWidth = static_cast sal_Int16 (
nLineWidth );
aBorderLine.LineStyle = eLineStyle == XLINE_SOLID ?
table::BorderLineStyle::SOLID : table::BorderLineStyle::DASHED;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/source
vcl/inc/vcl/alpha.hxx |2 +-
vcl/inc/vcl/bitmap.hxx |2 +-
vcl/source/gdi/gfxlink.cxx |5 +
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cbcdf190e86ed2874d8d5703ef4666f4074e7c7a
Author: Andre Fischer a...@apache.org
Date: Wed Jun 13 08:03:08 2012 +
Resolves: #i119965# Fixed saving slides where temporary files...
of background images were deleted outside the office.
Patch by: Steve Yin
Review by: Andre Fischer
(cherry picked from commit 2809da479a141ad2c5c90624edf411ac2ec04597)
Change-Id: I30318ef05408eb397cb26a0d433d265de90a6e74
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index effa86c..04fc666 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -375,6 +375,11 @@ sal_uInt8* ImpSwap::GetData() const
pData = new sal_uInt8[ mnDataSize ];
pIStm-Read( pData, mnDataSize );
sal_Bool bError = ( ERRCODE_NONE != pIStm-GetError() );
+sal_Size nActReadSize = pIStm-Tell();
+if (nActReadSize != mnDataSize)
+{
+bError = sal_True;
+}
delete pIStm;
if( bError )
commit d859e54534994d2e6f0c62e7711fa674406f8e22
Author: Herbert Dürr h...@apache.org
Date: Wed Jan 16 11:31:37 2013 +
AlphaMask derives from Bitmap so their destructors should be virtual
(cherry picked from commit 846a7425314d1782bae3b517d1394a46ff980256)
Conflicts:
vcl/inc/vcl/alpha.hxx
vcl/inc/vcl/bitmap.hxx
Change-Id: I8bf83e2edde33f9aee50a7feffe18bcb5c352dd4
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index ddad314..95bb0ea 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.hxx
@@ -47,7 +47,7 @@ public:
AlphaMask( const Bitmap rBitmap );
AlphaMask( const AlphaMask rAlphaMask );
AlphaMask( const Size rSizePixel, sal_uInt8* pEraseTransparency = NULL );
-~AlphaMask();
+virtual ~AlphaMask();
AlphaMask operator=( const Bitmap rBitmap );
AlphaMask operator=( const AlphaMask rAlphaMask )
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 7753083..c0ec5b1 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -379,7 +379,7 @@ public:
Bitmap( const Size rSizePixel, sal_uInt16 nBitCount, const BitmapPalette*
pPal = NULL );
Bitmap( const ResId rResId );
Bitmap( SalBitmap* pSalBitmap );
-~Bitmap();
+virtual ~Bitmap();
Bitmap operator=( const Bitmap rBitmap );
inline sal_Bool operator!() const;
___
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/doc/objstor.cxx | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
New commits:
commit a666862deffa33013d3df3bb62e87c67f9a89948
Author: Andre Fischer a...@apache.org
Date: Wed Jun 13 12:10:23 2012 +
Resolves: #i119492# Reset the modified flag on OLE objects after loading
Patch by: Clarence GUO
Review by: Andre Fischer
(cherry picked from commit 83777cd6e0f3f1a4458af896fd13344c696ecb1e)
Conflicts:
sfx2/source/doc/objstor.cxx
Change-Id: I51682ace6a5b233270e52070ef39c33480fd27c0
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 223ae5e..0008014 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2256,7 +2256,27 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium rMedium,
bool bInsert )
aArgs[nEnd-1].Value = (sal_Bool) sal_True;
}
-return xLoader-filter( aArgs );
+// #i119492# During loading, some OLE objects like chart will be set
+// modified flag, so needs to reset the flag to false after loading
+sal_Bool bRtn = xLoader-filter( aArgs );
+uno::Sequence OUString aNames =
GetEmbeddedObjectContainer().GetObjectNames();
+for ( sal_Int32 n = 0; n aNames.getLength(); ++n )
+{
+OUString aName = aNames[n];
+uno::Reference embed::XEmbeddedObject xObj =
GetEmbeddedObjectContainer().GetEmbeddedObject( aName );
+OSL_ENSURE( xObj.is(), An empty entry in the embedded objects
list!\n );
+if ( xObj.is() )
+{
+sal_Int32 nState = xObj-getCurrentState();
+if ( nState == embed::EmbedStates::LOADED || nState ==
embed::EmbedStates::RUNNING )// means that the object is not active
+{
+uno::Reference util::XModifiable xModifiable(
xObj-getComponent(), uno::UNO_QUERY );
+if ( xModifiable.is() )
+xModifiable-setModified(sal_False);
+}
+}
+}
+return bRtn;
}
catch (const packages::zip::ZipIOException)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx | 36
1 file changed, 16 insertions(+), 20 deletions(-)
New commits:
commit 4de8beed1c6dd77e379e460d359f79ea73b855f8
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 15:08:56 2012 +
Resolves: #i119953# Fixed crash on File-Insert.
Reported by: Yan Ji
Patch by: Oliver-Rainer Wittmann
Review by: Andre Fischer
(cherry picked from commit 66cef81342b38e23c6785c101fe204a9512f0646)
Conflicts:
sw/source/filter/ww8/ww8par.cxx
Change-Id: Ia014c0c3b9fb78caf8e1d40bd629eb685d40fdd3
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 6d890de..42c9765 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4580,31 +4580,27 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary
*pGloss, const SwPosition rPos)
if (!mbNewDoc)
{
-// in ein Dokument einfuegen ?
-// Da immer ganze Zeile eingelesen werden, muessen
-// evtl. Zeilen eingefuegt / aufgebrochen werden
-//
+// inserting into an existing document:
+// As only complete paragraphs are inserted, the current one
+// needs to be splitted - once or even twice.
const SwPosition* pPos = pPaM-GetPoint();
-SwTxtNode const*const pSttNd = pPos-nNode.GetNode().GetTxtNode();
-sal_uInt16 nCntPos = pPos-nContent.GetIndex();
+// split current paragraph to get new paragraph for the insertion
+rDoc.SplitNode( *pPos, false );
-// EinfuegePos nicht in leerer Zeile
-if (nCntPos pSttNd-GetTxt().getLength())
-rDoc.SplitNode( *pPos, false );// neue Zeile erzeugen
-
-if (pSttNd-GetTxt().getLength())
-{ // EinfuegePos nicht am Ende der Zeile
-rDoc.SplitNode( *pPos, false );// neue Zeile
-pPaM-Move( fnMoveBackward ); // gehe in leere Zeile
+// another split, if insertion position was not at the end of the
current paragraph.
+SwTxtNode const*const pTxtNd = pPos-nNode.GetNode().GetTxtNode();
+if ( pTxtNd-GetTxt().getLength() )
+{
+rDoc.SplitNode( *pPos, false );
+// move PaM back to the newly empty paragraph
+pPaM-Move( fnMoveBackward );
}
-// verhinder das Einlesen von Tabellen in Fussnoten / Tabellen
-sal_uLong nNd = pPos-nNode.GetIndex();
-bReadNoTbl = 0 != pSttNd-FindTableNode() ||
-( nNd rDoc.GetNodes().GetEndOfInserts().GetIndex()
-rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex()
- nNd );
+// suppress insertion of tables inside footnotes.
+const sal_uLong nNd = pPos-nNode.GetIndex();
+bReadNoTbl = ( nNd rDoc.GetNodes().GetEndOfInserts().GetIndex()
+ rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex()
nNd );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/region.hxx|1 +
vcl/source/gdi/region.cxx | 12 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit a5aeb9e0a0e8766ddaefb147f24ca858f0fff75b
Author: Andre Fischer a...@apache.org
Date: Thu Jul 5 14:49:29 2012 +
Resolves: #i120096# Detect empty polygon in Region constructor...
and set impl object accordingly.
Reported by: Du Jing
Fixed by: Andre Fischer
(cherry picked from commit dbd0cea6052c5198fc960883830c3daebb989a4c)
Change-Id: I210ec0e696e673309aad64a1e157e207bea10a66
diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx
index 9a5ed68..02eebc7 100644
--- a/vcl/inc/vcl/region.hxx
+++ b/vcl/inc/vcl/region.hxx
@@ -57,6 +57,7 @@ private:
SAL_DLLPRIVATE void ImplCopyData();
SAL_DLLPRIVATE void ImplCreateRectRegion( const Rectangle
rRect );
SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const
PolyPolygon rPolyPoly );
+SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const
basegfx::B2DPolyPolygon rPolyPoly );
SAL_DLLPRIVATE void ImplPolyPolyRegionToBandRegionFunc();
SAL_DLLPRIVATE inline void ImplPolyPolyRegionToBandRegion();
SAL_DLLPRIVATE const ImplRegion*ImplGetImplRegion() const { return
mpImplRegion; }
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index b46972a..e359f59 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1100,7 +1100,7 @@ Region::Region( const basegfx::B2DPolyPolygon rPolyPoly )
DBG_CTOR( Region, ImplDbgTestRegion );
DBG_CHKOBJ( rPolyPoly, PolyPolygon, NULL );
-mpImplRegion = new ImplRegion( rPolyPoly );
+ImplCreatePolyPolyRegion( rPolyPoly );
}
// ---
@@ -1190,6 +1190,16 @@ void Region::ImplCreatePolyPolyRegion( const
PolyPolygon rPolyPoly )
// ---
+void Region::ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon
rPolyPoly )
+{
+if (rPolyPoly.count()==0 || rPolyPoly.getB2DRange().isEmpty())
+mpImplRegion = (ImplRegion*)(aImplEmptyRegion);
+else
+mpImplRegion = new ImplRegion( rPolyPoly );
+}
+
+// ---
+
void Region::ImplPolyPolyRegionToBandRegionFunc()
{
// ensure to subdivide when bezier segemnts are used, it's going to
___
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/SidebarController.cxx | 22 +++---
1 file changed, 7 insertions(+), 15 deletions(-)
New commits:
commit e3860a6db8d11da357932b393fe7cc8a7f0684b3
Author: Andre Fischer a...@apache.org
Date: Fri Apr 19 14:27:16 2013 +
Resolves: #i122104# Fixed selection of sidebar button.
(cherry picked from commit 8d956f9ec332f818fbe49286ba8eec28179486f2)
Change-Id: If87b0dd13d1d333212d41f0a1e1122e4ef6c5ab2
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 55a384e..887e245 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -59,6 +59,7 @@ using namespace cssu;
using ::rtl::OUString;
+#undef VERBOSE
namespace sfx2 { namespace sidebar {
@@ -149,7 +150,6 @@ void SAL_CALL SidebarController::disposing (void)
if (mpCurrentDeck)
{
mpCurrentDeck-Dispose();
-OSL_TRACE(deleting deck window subtree);
mpCurrentDeck-PrintWindowTree();
mpCurrentDeck.reset();
}
@@ -256,7 +256,7 @@ void SidebarController::NotifyResize (void)
mnSavedSidebarWidth = nWidth;
RestrictWidth();
-#ifdef DEBUG
+#ifdef VERBOSE
if (mpCurrentDeck)
{
mpCurrentDeck-PrintWindowTree();
@@ -315,6 +315,10 @@ void SidebarController::UpdateConfigurations (const
Context rContext)
{
msCurrentDeckId = pDeckDescriptor-msId;
SwitchToDeck(*pDeckDescriptor, rContext);
+
+// Tell the tab bar to highlight the button associated
+// with the deck.
+mpTabBar-HighlightDeck(msCurrentDeckId);
}
#ifdef DEBUG
@@ -439,7 +443,6 @@ void SidebarController::SwitchToDeck (
{
// Panel already exists in current deck. Reuse it.
aNewPanels[nWriteIndex] = *iPanel;
-OSL_TRACE(reusing panel %s,
S2A(rPanelContexDescriptor.msId));
}
else
{
@@ -448,7 +451,6 @@ void SidebarController::SwitchToDeck (
rPanelContexDescriptor.msId,
mpCurrentDeck-GetPanelParentWindow(),
rPanelContexDescriptor.msMenuCommand);
-OSL_TRACE(creating panel %s,
S2A(rPanelContexDescriptor.msId));
bHasPanelSetChanged = true;
}
if (aNewPanels[nWriteIndex] != NULL)
@@ -471,10 +473,6 @@ void SidebarController::SwitchToDeck (
mpCurrentDeck-SetPanels(aNewPanels);
mpCurrentDeck-Show();
-// Tell the tab bar to highlight the button associated with the
-// deck.
-mpTabBar-HighlightDeck(rDeckDescriptor.msId);
-
mpParentWindow-SetText(rDeckDescriptor.msTitle);
if (bHasPanelSetChanged)
@@ -493,7 +491,7 @@ bool SidebarController::ArePanelSetsEqual (
const SharedPanelContainer rCurrentPanels,
const ResourceManager::PanelContextDescriptorContainer rRequestedPanels)
{
-#ifdef DEBUG
+#ifdef VERBOSE
OSL_TRACE(current panel list:);
for (SharedPanelContainer::const_iterator
iPanel(rCurrentPanels.begin()),
@@ -539,12 +537,6 @@ SharedPanel SidebarController::CreatePanel (
if (pPanelDescriptor == NULL)
return SharedPanel();
-#ifdef DEBUG
-// Prevent the panel not being created in the same memory of an old panel.
-::boost::scoped_arraychar pUnused (new char[sizeof(Panel)]);
-OSL_TRACE(allocated memory at %x, pUnused.get());
-#endif
-
// Create the panel which is the parent window of the UIElement.
SharedPanel pPanel (new Panel(
*pPanelDescriptor,
___
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/SidebarController.cxx | 28
sfx2/source/sidebar/SidebarController.hxx |6 +-
2 files changed, 21 insertions(+), 13 deletions(-)
New commits:
commit c07c242be32d61d991522cd59e87e0922854614a
Author: Andre Fischer a...@apache.org
Date: Mon Apr 22 15:01:51 2013 +
Resolves: #i122095# React asynchronously to context changes
In order to avoid problems in SFX2
(cherry picked from commit 61ed9eac0583e34a9b69f0a1adcc208509e336a1)
Change-Id: I375603a28e788ce9257be308dc09a589240d0e58
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 887e245..969cc04 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -91,6 +91,7 @@ SidebarController::SidebarController (
maCurrentContext(OUString(), OUString()),
msCurrentDeckId(A2S(PropertyDeck)),
maPropertyChangeForwarder(::boost::bind(SidebarController::BroadcastPropertyChange,
this)),
+
maContextChangeUpdate(::boost::bind(SidebarController::UpdateConfigurations,
this)),
mbIsDeckClosed(false),
mnSavedSidebarWidth(pParentWindow-GetSizePixel().Width())
{
@@ -167,10 +168,14 @@ void SAL_CALL SidebarController::disposing (void)
void SAL_CALL SidebarController::notifyContextChangeEvent (const
css::ui::ContextChangeEventObject rEvent)
throw(cssu::RuntimeException)
{
-UpdateConfigurations(
-Context(
-rEvent.ApplicationName,
-rEvent.ContextName));
+// Update to the requested new context asynchronously to avoid
+// subtle errors caused by SFX2 which in rare cases can not
+// properly handle a synchronous update.
+maRequestedContext = Context(
+rEvent.ApplicationName,
+rEvent.ContextName);
+if (maRequestedContext != maCurrentContext)
+maContextChangeUpdate.RequestCall();
}
@@ -277,17 +282,17 @@ void SidebarController::NotifyResize (void)
-void SidebarController::UpdateConfigurations (const Context rContext)
+void SidebarController::UpdateConfigurations (void)
{
-if (maCurrentContext != rContext)
+if (maCurrentContext != maRequestedContext)
{
-maCurrentContext = rContext;
+maCurrentContext = maRequestedContext;
// Notify the tab bar about the updated set of decks.
ResourceManager::IdContainer aDeckIds;
ResourceManager::Instance().GetMatchingDecks (
aDeckIds,
-rContext,
+maCurrentContext,
mxFrame);
mpTabBar-SetDecks(aDeckIds);
@@ -308,13 +313,13 @@ void SidebarController::UpdateConfigurations (const
Context rContext)
DeckDescriptor const* pDeckDescriptor = NULL;
if ( ! bCurrentDeckMatches)
-pDeckDescriptor =
ResourceManager::Instance().GetBestMatchingDeck(rContext, mxFrame);
+pDeckDescriptor =
ResourceManager::Instance().GetBestMatchingDeck(maCurrentContext, mxFrame);
else
pDeckDescriptor =
ResourceManager::Instance().GetDeckDescriptor(msCurrentDeckId);
if (pDeckDescriptor != NULL)
{
msCurrentDeckId = pDeckDescriptor-msId;
-SwitchToDeck(*pDeckDescriptor, rContext);
+SwitchToDeck(*pDeckDescriptor, maCurrentContext);
// Tell the tab bar to highlight the button associated
// with the deck.
@@ -327,7 +332,7 @@ void SidebarController::UpdateConfigurations (const
Context rContext)
{
DeckTitleBar* pTitleBar = mpCurrentDeck-GetTitleBar();
if (pTitleBar != NULL)
-pTitleBar-SetTitle(msCurrentDeckTitle+A2S(
()+rContext.msContext+A2S()));
+pTitleBar-SetTitle(msCurrentDeckTitle+A2S(
()+maCurrentContext.msContext+A2S()));
}
#endif
}
@@ -861,7 +866,6 @@ bool SidebarController::CanModifyChildWindowWidth (void)
const
SfxSplitWindow* pSplitWindow =
dynamic_castSfxSplitWindow*(mpParentWindow-GetParent());
if (pSplitWindow == NULL)
{
-OSL_ASSERT(pSplitWindow!=NULL);
return 0;
}
diff --git a/sfx2/source/sidebar/SidebarController.hxx
b/sfx2/source/sidebar/SidebarController.hxx
index 38ce50b..4ae0f7d 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -107,9 +107,11 @@ private:
::boost::scoped_ptrTabBar mpTabBar;
cssu::Referencecss::frame::XFrame mxFrame;
Context maCurrentContext;
+Context maRequestedContext;
::rtl::OUString msCurrentDeckId;
::rtl::OUString msCurrentDeckTitle;
AsynchronousCall maPropertyChangeForwarder;
+AsynchronousCall maContextChangeUpdate;
bool mbIsDeckClosed;
/** Before the deck is closed the sidebar width is saved into this
variable,
so that it can be restored when the deck is reopended.
@@ -118,7 +120,9 @@ private:
FocusManager
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - sfx2/source solenv/unxmacxp svx/source
sfx2/source/sidebar/ContextList.cxx | 12 +
sfx2/source/sidebar/ContextList.hxx |5
sfx2/source/sidebar/Deck.cxx | 52 +++-
sfx2/source/sidebar/Deck.hxx |1
sfx2/source/sidebar/Panel.cxx | 16 ++
sfx2/source/sidebar/Panel.hxx |7 -
sfx2/source/sidebar/ResourceManager.cxx | 24 +++
sfx2/source/sidebar/ResourceManager.hxx |8 +
sfx2/source/sidebar/SidebarController.cxx | 31 +++-
sfx2/source/sidebar/SidebarController.hxx |5
sfx2/source/sidebar/TabBar.cxx|8 +
sfx2/source/sidebar/TabBar.hxx|1
solenv/unxmacxp/inc/poll.h| 193 --
svx/source/svdraw/svdfmtf.cxx | 98 +++
14 files changed, 222 insertions(+), 239 deletions(-)
New commits:
commit f44ca372a2a88f996366e5cb44842ef79dd9df6e
Author: Andre Fischer a...@apache.org
Date: Wed May 8 12:35:53 2013 +
122082: Show correct deck title and tab bar highlight after switching
sidebar decks.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 2552c88..6d6250d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -390,7 +390,6 @@ void SidebarController::UpdateConfigurations (void)
maCurrentContext,
mbIsDocumentReadOnly,
mxFrame);
-mpTabBar-SetDecks(aDecks);
// Notify the tab bar about the updated set of decks.
mpTabBar-SetDecks(aDecks);
@@ -422,13 +421,12 @@ void SidebarController::UpdateConfigurations (void)
// We did not find a valid deck.
RequestCloseDeck();
return;
-
-// Tell the tab bar to highlight the button associated
-// with the deck.
-mpTabBar-HighlightDeck(sNewDeckId);
}
-msCurrentDeckId = sNewDeckId;
+// Tell the tab bar to highlight the button associated
+// with the deck.
+mpTabBar-HighlightDeck(sNewDeckId);
+
SwitchToDeck(
*ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
maCurrentContext);
commit 4a84ca3c6515bddb02a789d9386b6c6e74b037dc
Author: Andre Fischer a...@apache.org
Date: Wed May 8 12:01:43 2013 +
122251: Avoid compiler warning.
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 30f04a5..0521c7a 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -270,7 +270,7 @@ void TabBar::DataChanged (const DataChangedEvent
rDataChangedEvent)
-long TabBar::Notify (NotifyEvent rEvent)
+long TabBar::Notify (NotifyEvent)
{
return sal_False;
}
commit 2abab958f237c62abbd59b46b36354db60f23009
Author: Andre Fischer a...@apache.org
Date: Wed May 8 11:57:24 2013 +
122251: Prevent key events from being forwarded from sidebar tab bar to
Calc.
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 0fcbb14..30f04a5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -270,6 +270,14 @@ void TabBar::DataChanged (const DataChangedEvent
rDataChangedEvent)
+long TabBar::Notify (NotifyEvent rEvent)
+{
+return sal_False;
+}
+
+
+
+
RadioButton* TabBar::CreateTabItem (const DeckDescriptor rDeckDescriptor)
{
RadioButton* pItem = ControlFactory::CreateTabItem(this);
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 28684ac..6f18545 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -70,6 +70,7 @@ public:
virtual void Paint (const Rectangle rUpdateArea);
virtual void DataChanged (const DataChangedEvent rDataChangedEvent);
+virtual long Notify (NotifyEvent rEvent);
static sal_Int32 GetDefaultWidth (void);
commit 945f56f22d6b0f3a30e179b7b853a2e2de751fb1
Author: Herbert Dürr h...@apache.org
Date: Wed May 8 11:40:40 2013 +
poll.h has been available in OSX SDKs=10.3
even the macosxp target has a higher baseline than that
diff --git a/solenv/unxmacxp/inc/poll.h b/solenv/unxmacxp/inc/poll.h
deleted file mode 100644
index a978163..000
--- a/solenv/unxmacxp/inc/poll.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- *
- * 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
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy svx/source
dev/null|binary svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 15 +-- svx/source/sidebar/possize/PosSizePropertyPanel.hrc |2 -- svx/source/sidebar/possize/PosSizePropertyPanel.hxx |4 svx/source/sidebar/possize/PosSizePropertyPanel.src | 17 - 5 files changed, 9 insertions(+), 29 deletions(-) New commits: commit eca1929a77bc6234186368094ea16bf8d7ca9cc6 Author: Andre Fischer a...@apache.org Date: Tue Apr 23 10:41:58 2013 + Related: #i122144#: Use AOO icons for flipping shapes. (cherry picked from commit 52450684d9c02f0d6d96bff731c348d85ca4ced1) Conflicts: icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png Change-Id: I99e3d3b9e7046ee0de60075f49dc47f086e17dcc diff --git a/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png b/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png deleted file mode 100755 index 281ee46..000 Binary files a/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png b/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png deleted file mode 100755 index 7c9c4c4..000 Binary files a/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png and /dev/null differ diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 97abed5..0eb3125 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -27,6 +27,7 @@ #include sfx2/bindings.hxx #include sfx2/viewsh.hxx #include sfx2/objsh.hxx +#include sfx2/imagemgr.hxx #include svx/dlgutil.hxx #include unotools/viewoptions.hxx #include vcl/virdev.hxx @@ -95,8 +96,6 @@ PosSizePropertyPanel::PosSizePropertyPanel( maAutoWidthControl(SID_ATTR_TRANSFORM_AUTOWIDTH, *pBindings, *this), maAutoHeightControl(SID_ATTR_TRANSFORM_AUTOHEIGHT, *pBindings, *this), m_aMetricCtl(SID_ATTR_METRIC, *pBindings, *this), -maImgFlipHori(SVX_RES(IMG_HORI_FLIP)), -maImgFlipVert(SVX_RES(IMG_VERT_FLIP)), mxFrame(rxFrame), maContext(), mpBindings(pBindings), @@ -178,10 +177,14 @@ void PosSizePropertyPanel::Initialize() //flip: mpFlipTbx-SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) ); -mpFlipTbx-SetItemImage(FLIP_HORIZONTAL,maImgFlipHori); -mpFlipTbx-SetItemImage(FLIP_VERTICAL,maImgFlipVert); - mpFlipTbx-SetQuickHelpText(FLIP_HORIZONTAL,String(SVX_RES(STR_QH_HORI_FLIP))); //Add - mpFlipTbx-SetQuickHelpText(FLIP_VERTICAL,String(SVX_RES(STR_QH_VERT_FLIP))); //Add +mpFlipTbx-SetItemImage( +FLIP_HORIZONTAL, +GetImage(mxFrame, A2S(.uno:FlipHorizontal), sal_False)); +mpFlipTbx-SetItemImage( +FLIP_VERTICAL, +GetImage(mxFrame, A2S(.uno:FlipVertical), sal_False)); +mpFlipTbx-SetQuickHelpText(FLIP_HORIZONTAL, SVX_RESSTR(STR_QH_HORI_FLIP)); //Add +mpFlipTbx-SetQuickHelpText(FLIP_VERTICAL, SVX_RESSTR(STR_QH_VERT_FLIP)); //Add mpMtrPosX-SetAccessibleRelationLabeledBy(mpFtPosX.get()); mpMtrPosY-SetAccessibleRelationLabeledBy(mpFtPosY.get()); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hrc b/svx/source/sidebar/possize/PosSizePropertyPanel.hrc index 8a4caba..249d182 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hrc +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hrc @@ -33,8 +33,6 @@ #define DIAL_CONTROL17 #define FLIP_HORIZONTAL 18 #define FLIP_VERTICAL 19 -#define IMG_HORI_FLIP 20 -#define IMG_VERT_FLIP 21 #define FT_FLIP 22 #define STR_QH_HORI_FLIP23 #define STR_QH_VERT_FLIP24 diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 7beb082..fb5ce8e 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -121,10 +121,6 @@ private: ::sfx2::sidebar::ControllerItem maAutoHeightControl; ::sfx2::sidebar::ControllerItem m_aMetricCtl; -// images from ressource -Image maImgFlipHori; -Image maImgFlipVert; - cssu::Reference css::frame::XFramemxFrame; ::sfx2::sidebar::EnumContextmaContext; SfxBindings*mpBindings; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.src b/svx/source/sidebar/possize
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 officecfg/registry sfx2/source svx/source
include/sfx2/sidebar/EnumContext.hxx |6
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 102
+-
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |8
sfx2/source/sidebar/EnumContext.cxx|6
sfx2/source/sidebar/ResourceManager.cxx| 65 +++---
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 10
svx/source/sidebar/possize/PosSizePropertyPanel.cxx| 12 -
svx/source/sidebar/text/TextPropertyPanel.cxx | 10
8 files changed, 122 insertions(+), 97 deletions(-)
New commits:
commit a6830c7f2bf80eeaa5e570d834d6e1a29085d211
Author: Andre Fischer a...@apache.org
Date: Tue Apr 23 11:33:28 2013 +
Related: #i122051# Sidebar handles more Writer variants.
(cherry picked from commit dc36f82362dc1fb159668937cde7cedbc3fad503)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: I230b6dd3a68d2a17d0433f7919e74f1fcfae8d01
diff --git a/include/sfx2/sidebar/EnumContext.hxx
b/include/sfx2/sidebar/EnumContext.hxx
index 54b07e0..cad942e 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -33,7 +33,9 @@ public:
enum Application
{
Application_Writer,
+Application_WriterGlobal,
Application_WriterWeb,
+Application_WriterXML,
Application_Calc,
Application_Draw,
Application_Impress,
@@ -42,8 +44,8 @@ public:
// case that Draw and Impress use identical context configurations.
Application_DrawImpress,
-// Also for your convenience for either Writer or WriterWeb.
-Application_WriterAndWeb,
+// Also for your convenience for the different variants of Writer
documents.
+Application_WriterVariants,
// Used only by deck or panel descriptors. Matches any
// application.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 3187e52..b435c9a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -212,11 +212,11 @@
DrawImpress, OutlineText,visible;
DrawImpress, Table, visible;
DrawImpress, TextObject, visible;
-WriterAndWeb, Annotation, visible;
-WriterAndWeb, DrawText, visible;
-WriterAndWeb, Table, visible;
-WriterAndWeb, Text, visible;
-WriterAndWeb, default,visible;
+WriterVariants, Annotation, visible;
+WriterVariants, DrawText, visible;
+WriterVariants, Table, visible;
+WriterVariants, Text, visible;
+WriterVariants, default,visible;
/value
/prop
prop oor:name=ImplementationURL oor:type=xs:string
@@ -316,11 +316,11 @@
/prop
prop oor:name=ContextList
value oor:separator=;
-Calc, Draw, visible ;
-DrawImpress, 3DObject, visible ;
-DrawImpress, Draw, visible ;
-DrawImpress, TextObject, hidden ;
-WriterAndWeb, Draw, visible ;
+Calc, Draw, visible ;
+DrawImpress,3DObject, visible ;
+DrawImpress,Draw, visible ;
+DrawImpress,TextObject, hidden ;
+WriterVariants, Draw, visible ;
/value
/prop
prop oor:name=ImplementationURL oor:type=xs:string
@@ -346,13 +346,13 @@
/prop
prop oor:name=ContextList
value oor:separator=;
-Calc, Draw, visible ;
-Calc, Graphic,visible ;
-DrawImpress, 3DObject, visible ;
-DrawImpress, Draw, visible ;
-DrawImpress, Graphic,visible ;
-DrawImpress, TextObject, hidden ;
-WriterAndWeb, Draw, visible ;
+Calc, Draw, visible ;
+Calc, Graphic,visible ;
+DrawImpress,3DObject, visible ;
+DrawImpress,Draw, visible ;
+DrawImpress,Graphic,visible ;
+DrawImpress,TextObject, hidden ;
+WriterVariants, Draw, visible ;
/value
/prop
prop
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source
svx/source/sidebar/text/TextPropertyPanel.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13ab6230cc4e62e4705b646d6d1636b2445be476 Author: Andre Fischer a...@apache.org Date: Tue Apr 23 12:20:01 2013 + Related: #i121960# Fixed typo that made the superscript button... look like the subscript button. (cherry picked from commit eac056c47b2bf233ff36436136463cb3f3eb9e23) Change-Id: I1ba1a609954cd88aa38f76c8e329f35152951ae5 diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 4ef01c3..1042658 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -580,7 +580,7 @@ void TextPropertyPanel::SetupToolboxItems (void) maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScriptSw, TBI_SUPER_SW); maSubScriptControl.SetupToolBoxItem(*mpToolBoxScriptSw, TBI_SUB_SW); //for sc and sd -maSubScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUPER); +maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUPER); maSubScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUB); maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, TBI_SPACING); maHighlightControl.SetupToolBoxItem(*mpToolBoxHighlight, TBI_HIGHLIGHT); ___ 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/TitleBar.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit dbb9b218462cda204f718c80f58f5bc1aec8e25a Author: Andre Fischer a...@apache.org Date: Tue Apr 23 12:49:57 2013 + Related: #i122144# Paint titles of sidebar decks and titles bold (cherry picked from commit 4b7c52c48793d005d3bd618b025b890ff94e7774) Change-Id: I5e8ad1db7a962f002beb1b976d85a29bfcb5403f diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index 1a48d03..f5eac2a 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -133,6 +133,7 @@ void TitleBar::PaintTitle (const Rectangle rTitleBox) Push(PUSH_FONT | PUSH_TEXTCOLOR); Font aFont(GetFont()); +aFont.SetWeight(WEIGHT_BOLD); SetFont(aFont); // Paint title bar text. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sd/source
sd/source/ui/animations/CustomAnimationPane.cxx | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit c84a6f96f3e0d0f79bce7722fd63b8d0e688cb5f
Author: Andre Fischer a...@apache.org
Date: Tue Apr 23 12:56:35 2013 +
Resolves: #i122085# Fixed over-painting of fixed text
(cherry picked from commit 0ba322a27a8d0651f410741d79bbb7125a8ec2b7)
Change-Id: I208297d67bdb9e0277b39c0dc78b777f5eb2a7fa
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2327f14..61b8cc3 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1076,23 +1076,26 @@ void CustomAnimationPane::DataChanged (const
DataChangedEvent rEvent)
void CustomAnimationPane::UpdateLook (void)
{
-
SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
+const Wallpaper aBackground (
+::sfx2::sidebar::Theme::GetWallpaper(
+::sfx2::sidebar::Theme::Paint_PanelBackground));
+SetBackground(aBackground);
if (mpFLModify != NULL)
-mpFLModify-SetBackground(Wallpaper());
+mpFLModify-SetBackground(aBackground);
if (mpFLEffect != NULL)
-mpFLEffect-SetBackground(Wallpaper());
+mpFLEffect-SetBackground(aBackground);
if (mpFTStart != NULL)
-mpFTStart-SetBackground(Wallpaper());
+mpFTStart-SetBackground(aBackground);
if (mpFTProperty != NULL)
-mpFTProperty-SetBackground(Wallpaper());
+mpFTProperty-SetBackground(aBackground);
if (mpFTSpeed != NULL)
-mpFTSpeed-SetBackground(Wallpaper());
+mpFTSpeed-SetBackground(aBackground);
if (mpFTChangeOrder != NULL)
-mpFTChangeOrder-SetBackground(Wallpaper());
+mpFTChangeOrder-SetBackground(aBackground);
if (mpFLSeperator1 != NULL)
-mpFLSeperator1-SetBackground(Wallpaper());
+mpFLSeperator1-SetBackground(aBackground);
if (mpFLSeperator2 != NULL)
-mpFLSeperator2-SetBackground(Wallpaper());
+mpFLSeperator2-SetBackground(aBackground);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs | 28 ++ sfx2/source/sidebar/Deck.hxx |2 sfx2/source/sidebar/DeckDescriptor.hxx |2 sfx2/source/sidebar/PanelDescriptor.hxx|2 sfx2/source/sidebar/ResourceManager.cxx|8 + sfx2/source/sidebar/SidebarController.cxx | 46 ++ sfx2/source/sidebar/SidebarController.hxx |6 + sfx2/source/sidebar/TitleBar.cxx | 33 ++- sfx2/source/sidebar/TitleBar.hxx |2 9 files changed, 127 insertions(+), 2 deletions(-) New commits: commit 2d14c42e77b6706208cc38ccb692237e0ff1275a Author: Andre Fischer a...@apache.org Date: Tue Apr 23 14:08:04 2013 + Resolves: #i122086# Show icons in decks and titles (optionally) (cherry picked from commit 80b53edb04ed2d4b4f27f8256b754593902f0c23) Change-Id: Ic9aafce182b96aa44956d9ddbf165f4cc736e41b diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs index 49d6118..f7a35a3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs @@ -53,6 +53,20 @@ /info value/value /prop + prop oor:name=TitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the deck. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop + prop oor:name=HighContrastTitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the deck when high contrast mode is active. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop prop oor:name=HelpURL oor:type=xs:string info descHelp about the sidebar deck./desc @@ -142,6 +156,20 @@ /info value/value /prop + prop oor:name=TitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the panel. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop + prop oor:name=HighContrastTitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the panel when high contrast mode is active. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop prop oor:name=HelpURL oor:type=xs:string info descHelp about the sidebar content panel./desc diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index ae1cf19..07cdaec 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -93,6 +93,8 @@ private: ::boost::scoped_ptrScrollBar mpVerticalScrollBar; DECL_LINK(HandleVerticalScrollBarChange,void*); + + }; diff --git a/sfx2/source/sidebar/DeckDescriptor.hxx b/sfx2/source/sidebar/DeckDescriptor.hxx index 2c5a3d4..c7dc627 100644 --- a/sfx2/source/sidebar/DeckDescriptor.hxx +++ b/sfx2/source/sidebar/DeckDescriptor.hxx @@ -32,6 +32,8 @@ public: ::rtl::OUString msId; ::rtl::OUString msIconURL; ::rtl::OUString msHighContrastIconURL; +::rtl::OUString msTitleBarIconURL; +::rtl::OUString msHighContrastTitleBarIconURL; ::rtl::OUString msHelpURL; ::rtl::OUString msHelpText; ContextList maContextList; diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx index a9b3445..cb39dbb 100644 --- a/sfx2/source/sidebar/PanelDescriptor.hxx +++ b/sfx2/source/sidebar/PanelDescriptor.hxx @@ -32,6 +32,8 @@ public: sal_Bool mbIsTitleBarOptional; ::rtl::OUString msId; ::rtl::OUString msDeckId; +::rtl::OUString msTitleBarIconURL; +::rtl::OUString msHighContrastTitleBarIconURL; ::rtl::OUString msHelpURL; ContextList maContextList; ::rtl::OUString msImplementationURL; diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index c29ef9a..070bb1c 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -269,6 +269,10 @@ void ResourceManager::ReadDeckList (void) aDeckNode.getNodeValue(IconURL)); rDeckDescriptor.msHighContrastIconURL = ::comphelper::getString( aDeckNode.getNodeValue(HighContrastIconURL)); +rDeckDescriptor.msTitleBarIconURL = ::comphelper::getString
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sd/source svx/source
sd/source/ui/inc/DrawController.hxx |5 +
sd/source/ui/sidebar/LayoutMenu.cxx | 68 --
sd/source/ui/sidebar/LayoutMenu.hxx | 12
sd/source/ui/unoidl/DrawController.cxx| 50 +++
sd/source/ui/view/drviews1.cxx|2
svx/source/sidebar/text/TextPropertyPanel.cxx |2
svx/source/sidebar/text/TextPropertyPanel.hxx |2
7 files changed, 59 insertions(+), 82 deletions(-)
New commits:
commit cce9d07ada009655e005a9182abdfcccea2a61ec
Author: Andre Fischer a...@apache.org
Date: Wed Apr 24 07:35:03 2013 +
Resolves: #i122093# Don't show Impress layouts panel for master pages
(cherry picked from commit 573490c7240fc02dcf82bf0ba262863612e53187)
Conflicts:
sd/source/ui/sidebar/LayoutMenu.cxx
Change-Id: Ie5c0a1e15ea8db2d2b033efb1234492bd438658d
Related: #i122093# WaE in DrawController::BroadcastContextChenge()
(cherry picked from commit 26e4fcdbb8594696b45d0600e1b7a5e5946cd2aa)
Change-Id: I416215077643f3eb4d43eb761e457d0893bcc429
diff --git a/sd/source/ui/inc/DrawController.hxx
b/sd/source/ui/inc/DrawController.hxx
index a53f7b9..89b5050 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -133,6 +133,11 @@ public:
*/
void FireSwitchCurrentPage (SdPage* pCurrentPage) throw();
+/** Broadcast a sidebar context change that is caused by a view
+switch.
+*/
+void BroadcastContextChange (void) const;
+
/** Return a pointer to the ViewShellBase object that the DrawController
is connected to.
@return
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 5f34743..5252625 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -334,65 +334,6 @@ sal_Int32 LayoutMenu::GetMinimumWidth (void)
-void LayoutMenu::UpdateEnabledState (const MasterMode eMode)
-{
-bool bIsEnabled (false);
-
-::boost::shared_ptrViewShell pMainViewShell (mrBase.GetMainViewShell());
-if (pMainViewShell)
-{
-switch (pMainViewShell-GetShellType())
-{
-case ViewShell::ST_NONE:
-case ViewShell::ST_OUTLINE:
-case ViewShell::ST_PRESENTATION:
-case ViewShell::ST_SIDEBAR:
-// The complete task pane is disabled for these values or
-// not even visible. Disabling the LayoutMenu would be
-// logical but unnecessary. The main disadvantage is that
-// after re-enabling it (typically) another panel is
-// expanded.
-bIsEnabled = true;
-break;
-
-case ViewShell::ST_DRAW:
-case ViewShell::ST_IMPRESS:
-{
-switch (eMode)
-{
-case MM_UNKNOWN:
-{
-::boost::shared_ptrDrawViewShell pDrawViewShell (
-
::boost::dynamic_pointer_castDrawViewShell(pMainViewShell));
-if (pDrawViewShell)
-bIsEnabled = pDrawViewShell-GetEditMode() !=
EM_MASTERPAGE;
-break;
-}
-case MM_NORMAL:
-bIsEnabled = true;
-break;
-
-case MM_MASTER:
-bIsEnabled = false;
-break;
-}
-break;
-}
-
-case ViewShell::ST_HANDOUT:
-case ViewShell::ST_NOTES:
-case ViewShell::ST_SLIDE_SORTER:
-default:
-bIsEnabled = true;
-break;
-}
-}
-(void)bIsEnabled; //FIXME either this method is a no-op or this should do
something
-}
-
-
-
-
void LayoutMenu::Paint (const Rectangle rRect)
{
if (mbSelectionUpdatePending)
@@ -899,7 +840,6 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener,
::sd::tools::EventMultiplexerEve
case ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
mbIsMainViewChangePending = true;
-UpdateEnabledState(MM_UNKNOWN);
break;
case ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
@@ -914,14 +854,6 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener,
::sd::tools::EventMultiplexerEve
}
break;
-case ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL:
-UpdateEnabledState(MM_NORMAL);
-break;
-
-case ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER:
-UpdateEnabledState(MM_MASTER);
-break;
-
default:
/* Ignored */
break;
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx
b/sd/source/ui/sidebar/LayoutMenu.hxx
index eb80258
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source
sfx2/source/sidebar/Theme.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 0a9249f1e00a2792707e31976a7d45ae05240cef Author: Andre Fischer a...@apache.org Date: Fri Apr 26 06:45:40 2013 + Related: #i122144# Use same color for all sidebar backgrounds (cherry picked from commit ae86d3036171e63bfe193e678c9c05a1ec1a12bb) Change-Id: I4879d515f45f74b25e0319d3244c5722a449c7ed diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index d571885..b7ef8b5 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -212,7 +212,9 @@ void Theme::UpdateTheme (void) #define Alternatives(n,hc,sys) (mbIsHighContrastMode ? hc : (bUseSystemColors ? sys : n)) -const Color aBaseBackgroundColor (rStyle.GetDialogColor()); +Color aBaseBackgroundColor (rStyle.GetDialogColor()); +// UX says this should be a little brighter, but that looks off when compared to the other windows. +//aBaseBackgroundColor.IncreaseLuminance(7); Color aBorderColor (aBaseBackgroundColor); aBorderColor.DecreaseLuminance(15); Color aSecondColor (aBaseBackgroundColor); @@ -220,7 +222,7 @@ void Theme::UpdateTheme (void) setPropertyValue( maPropertyIdToNameMap[Paint_DeckBackground], -Any(sal_Int32(rStyle.GetMenuColor().GetRGBColor(; +Any(sal_Int32(aBaseBackgroundColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Paint_DeckTitleBarBackground], @@ -257,9 +259,7 @@ void Theme::UpdateTheme (void) rStyle.GetFloatTitleHeight(); setPropertyValue( maPropertyIdToNameMap[Paint_PanelBackground], -Any(sal_Int32(rStyle.GetDialogColor().GetRGBColor(; -//Any(sal_Int32(mbIsHighContrastMode ? 0x00 : -//0xff))); +Any(sal_Int32(aBaseBackgroundColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Paint_PanelTitleBarBackground], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy sc/source
dev/null |binary sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 30 ++--- sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc |5 --- sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx |7 sc/source/ui/sidebar/NumberFormatPropertyPanel.src | 20 -- 5 files changed, 20 insertions(+), 42 deletions(-) New commits: commit 3f306a9036ccf50d1f05d5897645db08bbcacb27 Author: Andre Fischer a...@apache.org Date: Fri Apr 26 07:37:47 2013 + Related: #i122144# Use standard icons for sidebar number formats (cherry picked from commit 7a309ee2def4ece46f78371ee18e94fae9fc3c05) Conflicts: icon-themes/galaxy/sc/res/sidebar/123.png icon-themes/galaxy/sc/res/sidebar/ABC.png icon-themes/galaxy/sc/res/sidebar/canlendar.png icon-themes/galaxy/sc/res/sidebar/money.png icon-themes/galaxy/sc/res/sidebar/percent.png Change-Id: I69c6c9b6f6cf887332186b68ca4b9e8775575855 diff --git a/icon-themes/galaxy/sc/res/sidebar/123.png b/icon-themes/galaxy/sc/res/sidebar/123.png deleted file mode 100755 index 0d0a6ef..000 Binary files a/icon-themes/galaxy/sc/res/sidebar/123.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/sidebar/ABC.png b/icon-themes/galaxy/sc/res/sidebar/ABC.png deleted file mode 100755 index fb7e5c8..000 Binary files a/icon-themes/galaxy/sc/res/sidebar/ABC.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/sidebar/canlendar.png b/icon-themes/galaxy/sc/res/sidebar/canlendar.png deleted file mode 100755 index b40421e..000 Binary files a/icon-themes/galaxy/sc/res/sidebar/canlendar.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/sidebar/money.png b/icon-themes/galaxy/sc/res/sidebar/money.png deleted file mode 100755 index 15b6ff2..000 Binary files a/icon-themes/galaxy/sc/res/sidebar/money.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/sidebar/percent.png b/icon-themes/galaxy/sc/res/sidebar/percent.png deleted file mode 100755 index 83f3751..000 Binary files a/icon-themes/galaxy/sc/res/sidebar/percent.png and /dev/null differ diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 9a7e2cb..10a12f7 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -25,6 +25,7 @@ #include scresid.hxx #include sfx2/bindings.hxx #include sfx2/dispatch.hxx +#include sfx2/imagemgr.hxx #include vcl/fixed.hxx #include vcl/lstbox.hxx #include vcl/field.hxx @@ -34,6 +35,7 @@ using namespace css; using namespace cssu; +using ::sfx2::sidebar::Theme; #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) @@ -67,11 +69,6 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel( // yes, grep for it in SC and symphony (!) maFormatControl(SID_NUMBER_FORMAT, *pBindings, *this), -maImgNumber(ScResId(IMG_NUMBER)), -maImgPercent(ScResId(IMG_PERCENT)), -maImgCurrency(ScResId(IMG_CURRENCY)), -maImgDate(ScResId(IMG_DATE)), -maImgText(ScResId(IMG_TEXT)), mnCategorySelected(0), mxFrame(rxFrame), maContext(), @@ -100,11 +97,24 @@ void NumberFormatPropertyPanel::Initialize() mpLbCategory-SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(Category))); //wj acc mpLbCategory-SetDropDownLineCount(mpLbCategory-GetEntryCount()); -mpTBCategory-SetItemImage(ID_NUMBER, maImgNumber); -mpTBCategory-SetItemImage(ID_PERCENT, maImgPercent); -mpTBCategory-SetItemImage(ID_CURRENCY, maImgCurrency); -mpTBCategory-SetItemImage(ID_DATE, maImgDate); -mpTBCategory-SetItemImage(ID_TEXT, maImgText); +// Note that we use icons from UNO commands that are not in every case the commands +// that are really dispatched. They just look right. +mpTBCategory-SetItemImage( +ID_NUMBER, +GetImage(mxFrame, A2S(.uno:NumericField), sal_False)); +mpTBCategory-SetItemImage( +ID_PERCENT, +GetImage(mxFrame, A2S(.uno:NumberFormatPercent), sal_False)); +mpTBCategory-SetItemImage( +ID_CURRENCY, +GetImage(mxFrame, A2S(.uno:NumberFormatCurrency), sal_False)); +mpTBCategory-SetItemImage( +ID_DATE, +GetImage(mxFrame, A2S(.uno:NumberFormatDate), sal_False)); +mpTBCategory-SetItemImage( +ID_TEXT, +GetImage(mxFrame, A2S(.uno:InsertFixedText), sal_False)); + Size aTbxSize( mpTBCategory-CalcWindowSizePixel() ); mpTBCategory-SetOutputSizePixel( aTbxSize ); mpTBCategory-SetBackground(Wallpaper()); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc index 13b17c3..08e66bc 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc @@ -29,11 +29,6 @@ #define
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy svx/source
dev/null |binary svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 166 - svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 10 - svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 14 - svx/source/sidebar/paragraph/ParaPropertyPanel.src | 77 - 5 files changed, 68 insertions(+), 199 deletions(-) New commits: commit e305def61831c3a54783a411ba140616e78fb17c Author: Andre Fischer a...@apache.org Date: Fri Apr 26 11:20:08 2013 + Related: #i122144# Replace more Symphony icons with standard icons ParaPropertyPanel (cherry picked from commit 8808ad841fd74a482c8b0f192c1a3a936f12dcfc) Conflicts: icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png icon-themes/galaxy/svx/res/symphony/Indent_16x16.png icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png icon-themes/galaxy/svx/res/symphony/para_vert01.png icon-themes/galaxy/svx/res/symphony/para_vert02.png icon-themes/galaxy/svx/res/symphony/para_vert03.png icon-themes/galaxy/svx/res/symphony/para_verth01.png icon-themes/galaxy/svx/res/symphony/para_verth02.png icon-themes/galaxy/svx/res/symphony/para_verth03.png icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png Change-Id: Idedcbb16b99a0fa7126d4e095e13e4f3a1f3f013 Fix build breaker: declare missing member variable (cherry picked from commit eb15aa364708f091c4c59a66f9c3f43e35dafd31) Change-Id: Ie53ff7cea8874048fe575003a0ae4ded25b6535b Fix build breaker: remove missing images (cherry picked from commit 2f116e91d1960503589ce10b726a5383dead800f) Change-Id: I6130c7b55b03b3962ec72f49d48084324dfdc3df diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png deleted file mode 100755 index 441e677..000 Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png deleted file mode 100755 index 1d57b1c..000 Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png deleted file mode 100755 index a258013..000 Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png deleted file mode 100755 index cbf816b..000 Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png b/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png deleted file mode 100755 index 9313737..000 Binary files a/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png b/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png deleted file mode 100755 index 7461944..000 Binary files a/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert01.png b/icon-themes/galaxy/svx/res/symphony/para_vert01.png deleted file mode 100755 index 275133c..000 Binary files a/icon-themes/galaxy/svx/res/symphony/para_vert01.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert02.png b/icon-themes/galaxy/svx/res/symphony/para_vert02.png deleted file mode 100755 index 919edab..000 Binary files a/icon-themes/galaxy/svx/res/symphony/para_vert02.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert03.png b/icon-themes/galaxy/svx/res/symphony/para_vert03.png deleted file mode 100755 index de22c24..000 Binary files a/icon-themes/galaxy/svx/res/symphony/para_vert03.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth01.png b/icon-themes/galaxy/svx/res/symphony/para_verth01.png deleted file mode 100755 index 9493fba..000 Binary files a/icon-themes/galaxy/svx/res/symphony/para_verth01.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth02.png b/icon-themes/galaxy/svx/res/symphony/para_verth02.png deleted file mode 100755 index 66470c7..000 Binary files a/icon-themes/galaxy/svx/res/symphony
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 officecfg/registry sfx2/source
include/sfx2/sidebar/SidebarChildWindow.hxx|2 include/sfx2/sidebar/Theme.hxx |1 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |9 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |6 sfx2/source/sidebar/PanelDescriptor.hxx|1 sfx2/source/sidebar/ResourceManager.cxx| 107 +- sfx2/source/sidebar/ResourceManager.hxx| 23 sfx2/source/sidebar/SidebarChildWindow.cxx | 23 sfx2/source/sidebar/SidebarController.cxx | 448 +++--- sfx2/source/sidebar/SidebarController.hxx | 60 + sfx2/source/sidebar/SidebarDockingWindow.cxx |6 sfx2/source/sidebar/TabBar.cxx | 36 sfx2/source/sidebar/TabBar.hxx |3 sfx2/source/sidebar/TabItem.cxx|5 sfx2/source/sidebar/Theme.cxx |8 15 files changed, 535 insertions(+), 203 deletions(-) New commits: commit f039e360fdad73305ba27a377613b7560b59195b Author: Andre Fischer a...@apache.org Date: Mon Apr 29 07:44:43 2013 + Resolves: #i122082# Hide sidebar panels for read only documents (cherry picked from commit aae247a34cd6f3bf421e57bbec08837d73ddf258) Conflicts: sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx sfx2/inc/sfx2/sidebar/Theme.hxx sfx2/source/sidebar/SidebarChildWindow.cxx sfx2/source/sidebar/SidebarController.cxx sfx2/source/sidebar/SidebarDockingWindow.cxx Change-Id: Ib59132d6d5e177d5a02ee24973b0fb07114db60a diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx index 23f9194..194f098 100644 --- a/include/sfx2/sidebar/SidebarChildWindow.hxx +++ b/include/sfx2/sidebar/SidebarChildWindow.hxx @@ -40,6 +40,8 @@ public: SfxChildWinInfo* pInfo); SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow); + +static sal_Int32 GetDefaultWidth (Window* pWindow); }; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index d34866b..0b75123 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -77,6 +77,7 @@ public: Image_PanelMenu, Image_ToolBoxItemSeparator, Image_Closer, +Image_CloseIndicator, __Image_Color, diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index b435c9a..9c9ff63 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -831,6 +831,9 @@ prop oor:name=TitleBarIsOptional oor:type=xs:boolean valuetrue/value /prop +prop oor:name=ShowForReadOnlyDocument oor:type=xs:boolean + valuetrue/value +/prop prop oor:name=Id oor:type=xs:string valueSwNavigatorPanel/value /prop @@ -857,6 +860,9 @@ prop oor:name=TitleBarIsOptional oor:type=xs:boolean valuetrue/value /prop +prop oor:name=ShowForReadOnlyDocument oor:type=xs:boolean + valuetrue/value +/prop prop oor:name=Id oor:type=xs:string valueScNavigatorPanel/value /prop @@ -883,6 +889,9 @@ prop oor:name=TitleBarIsOptional oor:type=xs:boolean valuetrue/value /prop +prop oor:name=ShowForReadOnlyDocument oor:type=xs:boolean + valuetrue/value +/prop prop oor:name=Id oor:type=xs:string valueSdNavigatorPanel/value /prop diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs index f7a35a3..8d096b3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs @@ -201,6 +201,12 @@ /info value1/value /prop + prop oor:name=ShowForReadOnlyDocument oor:type=xs:boolean +info + descThis flag controls whether the panel is shown when the document in the edit view is read only./desc +/info +valuefalse/value + /prop prop oor:name=WantsCanvas oor:type=xs:boolean info descExperimental: Set to true when panel wants to paint its content via a XCanvas./desc diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx index cb39dbb..d06fb03 100644 --- a/sfx2/source/sidebar/PanelDescriptor.hxx +++ b/sfx2/source/sidebar/PanelDescriptor.hxx @@ -38,6 +38,7 @@ public: ContextList maContextList; ::rtl::OUString msImplementationURL; sal_Int32 mnOrderIndex; +bool
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source
svx/source/sidebar/PanelFactory.cxx |2
svx/source/sidebar/text/TextPropertyPanel.cxx | 74 +-
svx/source/sidebar/text/TextPropertyPanel.hxx |7 --
svx/source/sidebar/text/TextPropertyPanel.src | 36
4 files changed, 43 insertions(+), 76 deletions(-)
New commits:
commit 244863b423f9eb77b22b544ba17b15ba96c305fd
Author: Andre Fischer a...@apache.org
Date: Mon Apr 29 08:34:09 2013 +
Resolved: #i122186# Rearranged controls in text property panel...
to make font selection box wider.
(cherry picked from commit 4484a62e0365fc36cc2a9e3ad1c71749d260d4d0)
Change-Id: I4a189c106b497da36e3ad0d13a8e6087b95e73c2
diff --git a/svx/source/sidebar/PanelFactory.cxx
b/svx/source/sidebar/PanelFactory.cxx
index 6073850..cb02d67 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -134,7 +134,7 @@ Referenceui::XUIElement SAL_CALL
PanelFactory::createUIElement (
#define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s))
if (DoesResourceEndWith(/TextPropertyPanel))
{
-pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings,
xSidebar);
+pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings);
}
else if (DoesResourceEndWith(/ParaPropertyPanel))
{
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 7534361..481184a 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -68,7 +68,6 @@ namespace svx { namespace sidebar {
#undef HAS_IA2
-#define TEXT_SECTIONPAGE_HEIGHT_S SECTIONPAGE_MARGIN_VERTICAL_TOP +
CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) + CONTROL_SPACING_VERTICAL * 1 +
SECTIONPAGE_MARGIN_VERTICAL_BOT
#define TEXT_SECTIONPAGE_HEIGHT SECTIONPAGE_MARGIN_VERTICAL_TOP +
CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) * 2 + CONTROL_SPACING_VERTICAL * 2 +
SECTIONPAGE_MARGIN_VERTICAL_BOT
//
@@ -135,8 +134,7 @@ long TextPropertyPanel::GetSelFontSize()
TextPropertyPanel* TextPropertyPanel::Create (
Window* pParent,
const cssu::Referencecss::frame::XFrame rxFrame,
-SfxBindings* pBindings,
-const cssu::Referencecss::ui::XSidebar rxSidebar)
+SfxBindings* pBindings)
{
if (pParent == NULL)
throw lang::IllegalArgumentException(A2S(no parent Window given to
TextPropertyPanel::Create), NULL, 0);
@@ -148,8 +146,7 @@ TextPropertyPanel* TextPropertyPanel::Create (
return new TextPropertyPanel(
pParent,
rxFrame,
-pBindings,
-rxSidebar);
+pBindings);
}
@@ -161,8 +158,7 @@ TextPropertyPanel* TextPropertyPanel::Create (
TextPropertyPanel::TextPropertyPanel (
Window* pParent,
const cssu::Referencecss::frame::XFrame rxFrame,
-SfxBindings* pBindings,
-const cssu::Referencecss::ui::XSidebar rxSidebar)
+SfxBindings* pBindings)
: Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
mpFontNameBox (new SvxSBFontNameBox(this, SVX_RES(CB_SBFONT_FONT))),
maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
@@ -225,8 +221,7 @@ TextPropertyPanel::TextPropertyPanel (
mxFrame(rxFrame),
maContext(),
-mpBindings(pBindings),
-mxSidebar(rxSidebar)
+mpBindings(pBindings)
{
Initialize();
FreeResource();
@@ -282,57 +277,36 @@ void TextPropertyPanel::HandleContextChange (
{
case CombinedEnumContext(Application_Calc, Context_Cell):
case CombinedEnumContext(Application_Calc, Context_Pivot):
-{
-mpToolBoxScript-Hide();
mpToolBoxScriptSw-Hide();
-mpToolBoxSpacing-Hide();
mpToolBoxHighlight-Hide();
+mpToolBoxScript-Disable();
+mpToolBoxSpacing-Disable();
+break;
-Size aSize(PROPERTYPAGE_WIDTH,TEXT_SECTIONPAGE_HEIGHT_S);
-aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
-aSize.setWidth(GetOutputSizePixel().Width());
-SetSizePixel(aSize);
-if (mxSidebar.is())
-mxSidebar-requestLayout();
+case CombinedEnumContext(Application_Calc, Context_EditCell):
+case CombinedEnumContext(Application_Calc, Context_DrawText):
+mpToolBoxScriptSw-Hide();
+mpToolBoxHighlight-Hide();
+mpToolBoxScript-Enable();
+mpToolBoxSpacing-Enable();
break;
-}
case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table):
-{
mpToolBoxScriptSw-Show();
mpToolBoxScript-Hide();
mpToolBoxHighlight-Show();
mpToolBoxSpacing-Show();
-
-Size aSize(PROPERTYPAGE_WIDTH, TEXT_SECTIONPAGE_HEIGHT);
-aSize = LogicToPixel
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sw/uiconfig
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/swxform/menubar/menubar.xml |1 + 5 files changed, 5 insertions(+) New commits: commit 0d3b3a9dffc3be017ad4417091f2504af8d53eef Author: Andre Fischer a...@apache.org Date: Mon Apr 29 10:43:22 2013 + Related: #i122157# Added sidebar menu entry to more writer variants (cherry picked from commit bbd95678a1ba46a715243c563c6a4a86bfa5ad91) Change-Id: Iea83e8778b293fc78e3aa7a0bd34e940e54755d7 diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index a856c2d..6e1342f 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -138,6 +138,7 @@ menu:menuitem menu:id=.uno:ViewDataSourceBrowser/ menu:menuitem menu:id=.uno:Navigator/ menu:menuitem menu:id=.uno:TaskPane/ + menu:menuitem menu:id=.uno:Sidebar/ menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ menu:menu menu:id=.uno:Zoom diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index c939f8f..72865d3 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -109,6 +109,7 @@ menu:menuitem menu:id=.uno:ViewDataSourceBrowser/ menu:menuitem menu:id=.uno:Navigator/ menu:menuitem menu:id=.uno:TaskPane/ + menu:menuitem menu:id=.uno:Sidebar/ menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ menu:menu menu:id=.uno:Zoom diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 80fa150..cf293b6 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -137,6 +137,7 @@ menu:menuitem menu:id=.uno:ViewDataSourceBrowser/ menu:menuitem menu:id=.uno:Navigator/ menu:menuitem menu:id=.uno:TaskPane/ + menu:menuitem menu:id=.uno:Sidebar/ menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ menu:menu menu:id=.uno:Zoom diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index f1d9177..ec45fea 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -138,6 +138,7 @@ menu:menuitem menu:id=.uno:ViewDataSourceBrowser/ menu:menuitem menu:id=.uno:Navigator/ menu:menuitem menu:id=.uno:TaskPane/ + menu:menuitem menu:id=.uno:Sidebar/ menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ menu:menu menu:id=.uno:Zoom diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 5ab825e..b17268e 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -139,6 +139,7 @@ menu:menuitem menu:id=.uno:ViewDataSourceBrowser/ menu:menuitem menu:id=.uno:Navigator/ menu:menuitem menu:id=.uno:TaskPane/ + menu:menuitem menu:id=.uno:Sidebar/ menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ menu:menu menu:id=.uno:Zoom ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 61 +--
svx/source/sidebar/graphic/GraphicPropertyPanel.hrc | 41 --
svx/source/sidebar/graphic/GraphicPropertyPanel.src | 80
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |1
4 files changed, 70 insertions(+), 113 deletions(-)
New commits:
commit 299f922763b613df993599d776800b50c22732d4
Author: Andre Fischer a...@apache.org
Date: Tue Apr 30 09:57:28 2013 +
Related: #i122144# Color mode control now looks like in toolbar
and fixed overlapping icons and metric fields.
(cherry picked from commit 835892332e2fda9e2082668679fb0385bf37eaaf)
Change-Id: I21a78328bf11f7368ba97fc47b72f247e7316706
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 14433b7..04bdbf5 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -27,6 +27,7 @@
#include svl/intitem.hxx
#include sfx2/bindings.hxx
#include sfx2/dispatch.hxx
+#include svx/dialogs.hrc
using namespace css;
using namespace cssu;
@@ -68,18 +69,10 @@ GraphicPropertyPanel::GraphicPropertyPanel(
maBlueControl(SID_ATTR_GRAF_BLUE, *pBindings, *this),
maGammaControl(SID_ATTR_GRAF_GAMMA, *pBindings, *this),
maModeControl(SID_ATTR_GRAF_MODE, *pBindings, *this),
-maImgNormal(SVX_RES(IMG_NORMAL)),
-maImgBW(SVX_RES(IMG_BW)),
-maImgGray(SVX_RES(IMG_GRAY)),
-maImgWater(SVX_RES(IMG_WATER)),
maImgRed(this, SVX_RES(IMG_RED)),
maImgGreen(this, SVX_RES(IMG_GREEN)),
maImgBlue(this, SVX_RES(IMG_BLUE)),
maImgGamma(this, SVX_RES(IMG_GAMMA)),
-msNormal(SVX_RES(STR_NORMAL)),
-msBW(SVX_RES(STR_BW)),
-msGray(SVX_RES(STR_GRAY)),
-msWater(SVX_RES(STR_WATER)),
mxFrame(rxFrame),
mpBindings(pBindings)
{
@@ -103,38 +96,58 @@ void GraphicPropertyPanel::Initialize()
mpFtTrans-SetBackground(Wallpaper());
mpMtrBrightness-SetModifyHdl( LINK( this, GraphicPropertyPanel,
ModifyBrightnessHdl ) );
-mpMtrBrightness-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Brightness)));//wj acc
+mpMtrBrightness-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Brightness)));
mpMtrContrast-SetModifyHdl( LINK( this, GraphicPropertyPanel,
ModifyContrastHdl ) );
-mpMtrContrast-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Contrast)));//wj acc
+mpMtrContrast-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Contrast)));
mpMtrTrans-SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl
) );
-mpMtrTrans-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Transparency))); //wj acc
+mpMtrTrans-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Transparency)));
-mpLBColorMode-InsertEntry( msNormal, maImgNormal );
-mpLBColorMode-InsertEntry( msGray, maImgGray );
-mpLBColorMode-InsertEntry( msBW, maImgBW );
-mpLBColorMode-InsertEntry( msWater, maImgWater );
+mpLBColorMode-InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_STANDARD)));
+mpLBColorMode-InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_GREYS)));
+mpLBColorMode-InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_MONO)));
+mpLBColorMode-InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_WATERMARK)));
mpLBColorMode-SetSelectHdl( LINK( this, GraphicPropertyPanel,
ClickColorModeHdl ));
-mpLBColorMode-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Color mode))); //wj acc
+mpLBColorMode-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Color mode)));
mpMtrRed-SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) );
mpMtrGreen-SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) );
mpMtrBlue-SetModifyHdl( LINK( this, GraphicPropertyPanel, BlueHdl ) );
mpMtrGamma-SetModifyHdl( LINK( this, GraphicPropertyPanel, GammaHdl ) );
-mpMtrRed-SetAccessibleName(mpMtrRed-GetQuickHelpText()); //wj acc
-mpMtrGreen-SetAccessibleName(mpMtrGreen-GetQuickHelpText()); //wj acc
-mpMtrBlue-SetAccessibleName(mpMtrBlue-GetQuickHelpText());//wj
acc
-mpMtrGamma-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Gamma value)));//wj acc
+mpMtrRed-SetAccessibleName(mpMtrRed-GetQuickHelpText());
+mpMtrGreen-SetAccessibleName(mpMtrGreen-GetQuickHelpText());
+mpMtrBlue-SetAccessibleName(mpMtrBlue-GetQuickHelpText());
+mpMtrGamma-SetAccessibleName(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Gamma value)));
mpMtrRed-SetAccessibleRelationLabeledBy(mpMtrRed.get());
mpMtrGreen-SetAccessibleRelationLabeledBy(mpMtrGreen.get());
mpMtrBlue-SetAccessibleRelationLabeledBy(mpMtrBlue.get());
mpMtrGamma-SetAccessibleRelationLabeledBy(mpMtrGamma.get());
-mpMtrBrightness-SetAccessibleRelationLabeledBy
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 officecfg/registry sfx2/source
include/sfx2/sidebar/EnumContext.hxx |1 +
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |1 +
sfx2/source/sidebar/EnumContext.cxx|1 +
sfx2/source/sidebar/ResourceManager.cxx|1 +
4 files changed, 4 insertions(+)
New commits:
commit 6d23bd36c57fe877e3ae55f022de3f9492e56f94
Author: Andre Fischer a...@apache.org
Date: Tue Apr 30 11:36:12 2013 +
Related: #i122056# Added another Writer variant to sidebar...
context handling.
(cherry picked from commit 542f0ff097c0e3eb71a1ad19f6d46a9860e754d9)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: Ib88f75d3dfdba5c14c2d3c747e90eecd00e6f249
diff --git a/include/sfx2/sidebar/EnumContext.hxx
b/include/sfx2/sidebar/EnumContext.hxx
index cad942e..819e837 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -36,6 +36,7 @@ public:
Application_WriterGlobal,
Application_WriterWeb,
Application_WriterXML,
+Application_WriterForm,
Application_Calc,
Application_Draw,
Application_Impress,
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index 8d096b3..de7d7fa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -82,6 +82,7 @@
com.sun.star.text.GlobalDocument
com.sun.star.text.WebDocument
com.sun.star.xforms.XMLFormDocument
+ com.sun.star.sdb.FormDesign
com.sun.star.sheet.SpreadsheetDocument
com.sun.star.presentation.PresentationDocument
com.sun.star.drawing.DrawingDocument
diff --git a/sfx2/source/sidebar/EnumContext.cxx
b/sfx2/source/sidebar/EnumContext.cxx
index acc5340..ce1d743 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -157,6 +157,7 @@ void EnumContext::ProvideApplicationContainers (void)
AddEntry(A2S(com.sun.star.text.GlobalDocument),
EnumContext::Application_WriterGlobal);
AddEntry(A2S(com.sun.star.text.WebDocument),
EnumContext::Application_WriterWeb);
AddEntry(A2S(com.sun.star.xforms.XMLFormDocument),
EnumContext::Application_WriterXML);
+AddEntry(A2S(com.sun.star.sdb.FormDesign),
EnumContext::Application_WriterForm);
AddEntry(A2S(com.sun.star.sheet.SpreadsheetDocument),
EnumContext::Application_Calc);
AddEntry(A2S(com.sun.star.drawing.DrawingDocument),
EnumContext::Application_Draw);
AddEntry(A2S(com.sun.star.presentation.PresentationDocument),
EnumContext::Application_Impress);
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index 725471a..26d6e4d 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -435,6 +435,7 @@ void ResourceManager::ReadContextList (
aApplications.push_back(EnumContext::Application_WriterGlobal);
aApplications.push_back(EnumContext::Application_WriterWeb);
aApplications.push_back(EnumContext::Application_WriterXML);
+aApplications.push_back(EnumContext::Application_WriterForm);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5603091e77ea3931d4361bfdfd5977b1fd69a137 Author: Andre Fischer a...@apache.org Date: Tue Apr 30 11:52:08 2013 + Related: #i122131# Fixed typo in cmd name for cell appearance 'more' dialog (cherry picked from commit d465ec90c0626857a9c30523daba63d7b713f9e6) Change-Id: Icb5389074faf5cf7d1b03f1203f0036f2eccb73a diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 9c9ff63..de9cadd 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -712,7 +712,7 @@ valuePropertyDeck/value /prop prop oor:name=DefaultMenuCommand - value.uno:FormatCellDialg/value + value.uno:FormatCellDialog/value /prop prop oor:name=ContextList value oor:separator=; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 include/svx officecfg/registry sd/source sfx2/source svx/AllLangResTarget_svx.mk svx/inc svx/Library_svx.mk svx/source
include/sfx2/sidebar/CommandInfoProvider.hxx | 94 ++
include/sfx2/sidebar/ResourceDefinitions.hrc | 42 -
include/sfx2/sidebar/Tools.hxx | 68 +
include/svx/dialogs.hrc |4
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 23
sd/source/ui/view/drviewsa.cxx |2
sfx2/source/sidebar/CommandInfoProvider.cxx |2
sfx2/source/sidebar/CommandInfoProvider.hxx | 92 --
sfx2/source/sidebar/ControllerItem.cxx |2
sfx2/source/sidebar/CustomImageRadioButton.cxx |2
sfx2/source/sidebar/Deck.cxx |2
sfx2/source/sidebar/DeckTitleBar.cxx |2
sfx2/source/sidebar/FocusManager.cxx |2
sfx2/source/sidebar/MenuButton.cxx |2
sfx2/source/sidebar/Paint.cxx|2
sfx2/source/sidebar/Panel.cxx|2
sfx2/source/sidebar/PanelTitleBar.cxx|2
sfx2/source/sidebar/ResourceManager.cxx |2
sfx2/source/sidebar/SidebarController.cxx| 39 -
sfx2/source/sidebar/SidebarController.hxx|2
sfx2/source/sidebar/SidebarToolBox.cxx |2
sfx2/source/sidebar/TabBar.cxx |2
sfx2/source/sidebar/TabItem.cxx |2
sfx2/source/sidebar/Theme.cxx|2
sfx2/source/sidebar/ToolBoxBackground.cxx|2
sfx2/source/sidebar/Tools.cxx| 34
sfx2/source/sidebar/Tools.hxx| 59 -
svx/AllLangResTarget_svx.mk |1
svx/Library_svx.mk |3
svx/inc/helpid.hrc |3
svx/source/sidebar/PanelFactory.cxx |5
svx/source/sidebar/insert/InsertPropertyPanel.cxx| 410 +++
svx/source/sidebar/insert/InsertPropertyPanel.hrc| 38 +
svx/source/sidebar/insert/InsertPropertyPanel.hxx| 92 ++
svx/source/sidebar/insert/InsertPropertyPanel.src| 142 +++
svx/source/sidebar/insert/SimpleToolBoxController.cxx| 79 ++
svx/source/sidebar/insert/SimpleToolBoxController.hxx| 50 +
37 files changed, 1087 insertions(+), 227 deletions(-)
New commits:
commit 05094c04638f150b8aae16458e12f1b2632e5e7c
Author: Andre Fischer a...@apache.org
Date: Fri May 3 13:01:13 2013 +
Resolves: #i122218# Add new sidebar panel...
for inserting shapes into Draw documents
(cherry picked from commit 5e09229d726cbc288719c7466b277a4eb5bb244b)
Conflicts:
sd/source/ui/view/drviewsa.cxx
sfx2/Package_inc.mk
svx/inc/svx/dialogs.hrc
Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar
(cherry picked from commit 99572ff12af758a256703884811c7915c79f27ec)
Conflicts:
sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
Related: #i122218# Added more missing files
(cherry picked from commit cdc8cb702630938c673255638aecbd2dd5c53ed7)
fix up to build
Change-Id: I098976d787e6a91d36aac98a5917f48b50872087
9c6f4d957924e177922e26606173d1b238b8006e
ceb9b720c08fb1db5b418c618e280b9b68eda2cf
01712631eacbd3e58e2cd04d1903bbcb0ecb9301
diff --git a/sfx2/source/sidebar/CommandInfoProvider.hxx
b/include/sfx2/sidebar/CommandInfoProvider.hxx
similarity index 98%
rename from sfx2/source/sidebar/CommandInfoProvider.hxx
rename to include/sfx2/sidebar/CommandInfoProvider.hxx
index 8278111..ba3db4b 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.hxx
+++ b/include/sfx2/sidebar/CommandInfoProvider.hxx
@@ -18,6 +18,8 @@
#ifndef SIDEBAR_COMMAND_INFO_PROVIDER_HXX
#define SIDEBAR_COMMAND_INFO_PROVIDER_HXX
+#include sfx2/dllapi.h
+
#include com/sun/star/frame/XFrame.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/ui/XAcceleratorConfiguration.hpp
@@ -31,7 +33,7 @@ namespace sfx2 { namespace sidebar {
/** Provide information about UNO commands like tooltip text with
keyboard accelerator.
*/
-class CommandInfoProvider
+class SFX2_DLLPUBLIC CommandInfoProvider
{
public:
/** Return the singleton instance.
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc
b/include/sfx2/sidebar/ResourceDefinitions.hrc
index b45e398..279e110 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -1,26 +1,22 @@
-/**
-*
-* Licensed to the Apache Software Foundation (ASF) under one
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - drawinglayer/inc drawinglayer/source sc/source sfx2/inc sfx2/Library_sfx.mk sfx2/source svx/source vcl/inc vcl/source
drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx | 14
drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx |2
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 257
+-
drawinglayer/source/processor2d/vclprocessor2d.cxx| 80 ---
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx |1
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |1
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx|3
sfx2/Library_sfx.mk |2
sfx2/inc/sfx2/sidebar/ControllerItem.hxx |2
sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx |6
sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx |5
sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx|3
sfx2/source/sidebar/ControllerItem.cxx| 10
svx/source/sidebar/insert/InsertPropertyPanel.cxx |9
svx/source/sidebar/insert/SimpleToolBoxController.cxx | 85 ---
svx/source/sidebar/insert/SimpleToolBoxController.hxx | 54 --
svx/source/sidebar/text/TextPropertyPanel.cxx | 70 +-
svx/source/sidebar/text/TextPropertyPanel.hxx |1
svx/source/sidebar/text/TextPropertyPanel.src | 16
vcl/inc/vcl/outdev.hxx|7
vcl/source/gdi/outdev.cxx | 58 ++
21 files changed, 398 insertions(+), 288 deletions(-)
New commits:
commit 784ed0d2e9cc2de7e3de8420d4708ee5c4631a5c
Author: Andre Fischer a...@apache.org
Date: Fri May 10 11:30:31 2013 +
122218: Replaced local tool box controller with existing
GenericToolboxController (cleanup).
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 4f4c3bb..2403f43 100755
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -23,7 +23,6 @@
#include InsertPropertyPanel.hxx
#include InsertPropertyPanel.hrc
-#include SimpleToolBoxController.hxx
#include sfx2/sidebar/CommandInfoProvider.hxx
#include sfx2/sidebar/Theme.hxx
@@ -32,6 +31,7 @@
#include svx/dialmgr.hxx
#include svtools/miscopt.hxx
+#include svtools/generictoolboxcontroller.hxx
#include vcl/toolbox.hxx
#include sfx2/tbxctrl.hxx
#include framework/sfxhelperfunctions.hxx
@@ -281,7 +281,12 @@ void InsertPropertyPanel::CreateController (
UNO_QUERY);
if ( ! aDescriptor.mxController.is())
aDescriptor.mxController.set(
-static_castXWeak*(new SimpleToolBoxController(mxFrame,
*pToolBox, nItemId, sCommandName)),
+static_castXWeak*(new svt::GenericToolboxController(
+::comphelper::getProcessServiceFactory(),
+mxFrame,
+pToolBox,
+nItemId,
+sCommandName)),
UNO_QUERY);
if ( ! aDescriptor.mxController.is())
return;
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.cxx
b/svx/source/sidebar/insert/SimpleToolBoxController.cxx
deleted file mode 100755
index dda97d9..000
--- a/svx/source/sidebar/insert/SimpleToolBoxController.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- *
- * 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_svx.hxx
-
-#include SimpleToolBoxController.hxx
-
-#include comphelper/processfactory.hxx
-#include vcl/toolbox.hxx
-#include vos/mutex.hxx
-#include vcl/svapp.hxx
-
-
-using namespace ::com::sun::star;
-
-namespace svx { namespace sidebar {
-
-SimpleToolBoxController::SimpleToolBoxController(
-const cssu::Referencecss::frame::XFrame rxFrame,
-ToolBox rToolBox,
-const sal_uInt16 nItemId,
-const rtl::OUString rsCommand)
-: svt::ToolboxController(::comphelper::getProcessServiceFactory
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source
svx/source/sidebar/EmptyPanel.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5aef497b3c9f949eb1dfb6b5ca91a7929522c9b5
Author: Andre Fischer a...@apache.org
Date: Mon May 6 08:40:39 2013 +
Resolves: #i122049# Changed text of 'empty' panel
(cherry picked from commit 1f317e0580d267b3cc6b6b410bc3d14a4e70e1fe)
Change-Id: I348ea9c84db10268d964e788ed5622123a9fa405
diff --git a/svx/source/sidebar/EmptyPanel.src
b/svx/source/sidebar/EmptyPanel.src
index 77e375b..3979ec1 100644
--- a/svx/source/sidebar/EmptyPanel.src
+++ b/svx/source/sidebar/EmptyPanel.src
@@ -24,6 +24,6 @@ Control RID_SIDEBAR_EMPTY_PANEL
{
Pos = MAP_APPFONT(2,2);
Size = MAP_APPFONT(100,24);
-Text [en-US] = Properties for the task that you are performing are
not available in the sidebar at this time.;
+Text [en-US] = Properties for the task that you are performing are
not available for the current selection;
};
};
___
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 svx/source
sfx2/source/sidebar/Deck.cxx | 33 +
sfx2/source/sidebar/Deck.hxx |6
sfx2/source/sidebar/FocusManager.cxx | 450 +++--
sfx2/source/sidebar/FocusManager.hxx | 63 ++
sfx2/source/sidebar/Panel.cxx |4
sfx2/source/sidebar/SidebarController.cxx | 13
sfx2/source/sidebar/SidebarController.hxx |6
sfx2/source/sidebar/SidebarDockingWindow.cxx | 25 -
sfx2/source/sidebar/SidebarDockingWindow.hxx |1
sfx2/source/sidebar/SidebarToolBox.cxx | 17
sfx2/source/sidebar/SidebarToolBox.hxx |1
sfx2/source/sidebar/TitleBar.cxx | 12
sfx2/source/sidebar/TitleBar.hxx |1
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 16
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 12
svx/source/sidebar/text/TextPropertyPanel.cxx | 16
svx/source/sidebar/text/TextPropertyPanel.hxx |8
17 files changed, 420 insertions(+), 264 deletions(-)
New commits:
commit e604df6d147e636a4c51d0ca1e8f416d4ffa2260
Author: Andre Fischer a...@apache.org
Date: Mon May 6 13:12:20 2013 +
Resolves: #i122230# Fixed focus traveling in the sidebar
(cherry picked from commit bab3ddce4b3d5330835494f54b68406335821b76)
Conflicts:
sfx2/source/sidebar/FocusManager.cxx
Change-Id: I8853a92da3c4fe41a0110c630cc6af556ffc2ce4
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 91929f8..ad3751c 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -260,6 +260,39 @@ void Deck::RequestLayout (void)
+void Deck::ShowPanel (const Panel rPanel)
+{
+if (mpVerticalScrollBar mpVerticalScrollBar-IsVisible())
+{
+// Get vertical extent of the panel.
+sal_Int32 nPanelTop (rPanel.GetPosPixel().Y());
+const sal_Int32 nPanelBottom (nPanelTop +
rPanel.GetSizePixel().Height() - 1);
+// Add the title bar into the extent.
+if (rPanel.GetTitleBar() != NULL rPanel.GetTitleBar()-IsVisible())
+nPanelTop = rPanel.GetTitleBar()-GetPosPixel().Y();
+
+
+// Determine what the new thumb position should be like.
+// When the whole panel does not fit then make its top visible
+// and it off at the bottom.
+sal_Int32 nNewThumbPos (mpVerticalScrollBar-GetThumbPos());
+if (nPanelBottom = nNewThumbPos+mpVerticalScrollBar-GetVisibleSize())
+nNewThumbPos = nPanelBottom -
mpVerticalScrollBar-GetVisibleSize();
+if (nPanelTop nNewThumbPos)
+nNewThumbPos = nPanelTop;
+
+mpVerticalScrollBar-SetThumbPos(nNewThumbPos);
+mpScrollContainer-SetPosPixel(
+Point(
+mpScrollContainer-GetPosPixel().X(),
+-nNewThumbPos));
+
+}
+}
+
+
+
+
const char* GetWindowClassification (const Window* pWindow)
{
const String rsName (pWindow-GetText());
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 07cdaec..e3c3b6f 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -61,6 +61,12 @@ public:
void RequestLayout (void);
::Window* GetPanelParentWindow (void);
+/** Try to make the panel completely visible.
+When the whole panel does not fit then make its top visible
+and it off at the bottom.
+*/
+void ShowPanel (const Panel rPanel);
+
virtual void Paint (const Rectangle rUpdateArea);
virtual void DataChanged (const DataChangedEvent rEvent);
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index f213a8c..b3c83d3 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -18,6 +18,7 @@
#include FocusManager.hxx
#include Panel.hxx
+#include DeckTitleBar.hxx
#include sfx2/sidebar/Tools.hxx
#include TitleBar.hxx
#include vcl/button.hxx
@@ -27,36 +28,20 @@
namespace sfx2 { namespace sidebar {
-namespace
+FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent,
const sal_Int32 nIndex)
+: meComponent(eComponent),
+ mnIndex(nIndex)
{
-enum PanelComponent
-{
-PC_TitleBar,
-PC_ToolBox,
-PC_Content,
-PC_None
-};
-
-PanelComponent GetFocusedComponent (const Panel rPanel)
-{
-if (rPanel.HasFocus())
-return PC_Content;
-else if (rPanel.GetTitleBar() != NULL)
-{
-if (rPanel.GetTitleBar()-HasFocus())
-return PC_TitleBar;
-else if (rPanel.GetTitleBar()-GetToolBox().HasFocus())
-return PC_ToolBox;
-}
-return PC_None;
-}
}
-FocusManager::FocusManager (void)
-: maPanels(),
+
+
+FocusManager::FocusManager (const ::boost::functionvoid(const Panel)
rShowPanelFunctor
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source
sfx2/source/sidebar/FocusManager.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c367a1e8628f125373a8be0108b05f27ca2117dd
Author: Andre Fischer a...@apache.org
Date: Tue May 7 11:33:50 2013 +
Resolves: #i122230# Fixes for sidebar focus traveling
(cherry picked from commit 2b1bd27c95821000241b6f038b62b009ab94bda7)
Change-Id: Id54bb7367d736629a43869c58d6d840fc8fd7da8
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index b3c83d3..081fa25 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -98,8 +98,9 @@ void FocusManager::ClearPanels (void)
void FocusManager::ClearButtons (void)
{
-::std::vectorWindow* aButtons;
-for (::std::vectorWindow*::iterator
iButton(aButtons.begin()),iEnd(aButtons.end());
+::std::vectorButton* aButtons;
+aButtons.swap(maButtons);
+for (::std::vectorButton*::iterator
iButton(aButtons.begin()),iEnd(aButtons.end());
iButton!=iEnd;
++iButton)
{
@@ -278,6 +279,8 @@ bool FocusManager::IsDeckTitleVisible (void) const
void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
{
+if (nPanelIndex0 || nPanelIndex=static_castsal_Int32(maPanels.size()))
+return;
Panel rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar!=NULL pTitleBar-IsVisible())
___
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 | 52 ++-
sfx2/source/sidebar/Deck.hxx |1
2 files changed, 52 insertions(+), 1 deletion(-)
New commits:
commit 77c85da8b7cbad2e2904af81554d65afcd868a23
Author: Andre Fischer a...@apache.org
Date: Wed May 8 07:21:37 2013 +
Resolves: #i122254# Process mouse wheel events over sidebar scroll bar
(cherry picked from commit db9602cbf627e1a7af56f3a419ec7c7445dcfb85)
Change-Id: I272763eb24e58443d8c8a980eca9b0f654a9e899
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index ad3751c..0a319e1 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -215,6 +215,56 @@ void Deck::DataChanged (const DataChangedEvent rEvent)
+long Deck::Notify (NotifyEvent rEvent)
+{
+if (rEvent.GetType() != EVENT_COMMAND)
+return sal_False;
+
+CommandEvent* pCommandEvent =
reinterpret_castCommandEvent*(rEvent.GetData());
+if (pCommandEvent == NULL)
+return sal_False;
+
+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;
+}
+
+
+
+
void Deck::SetPanels (const SharedPanelContainer rPanels)
{
maPanels = rPanels;
@@ -271,7 +321,6 @@ void Deck::ShowPanel (const Panel rPanel)
if (rPanel.GetTitleBar() != NULL rPanel.GetTitleBar()-IsVisible())
nPanelTop = rPanel.GetTitleBar()-GetPosPixel().Y();
-
// Determine what the new thumb position should be like.
// When the whole panel does not fit then make its top visible
// and it off at the bottom.
@@ -414,4 +463,5 @@ void Deck::ScrollContainerWindow::SetSeparators (const
::std::vectorsal_Int32
maSeparators = rSeparators;
}
+
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index e3c3b6f..171fff7 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -69,6 +69,7 @@ public:
virtual void Paint (const Rectangle rUpdateArea);
virtual void DataChanged (const DataChangedEvent rEvent);
+virtual long Notify (NotifyEvent rEvent);
void PrintWindowTree (void);
void PrintWindowTree (const ::std::vectorPanel* rPanels);
___
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/ContextList.cxx | 12
sfx2/source/sidebar/ContextList.hxx |5 -
sfx2/source/sidebar/Panel.cxx | 16 +---
sfx2/source/sidebar/Panel.hxx |7 +--
sfx2/source/sidebar/ResourceManager.cxx | 24
sfx2/source/sidebar/ResourceManager.hxx |8
sfx2/source/sidebar/SidebarController.cxx | 21 -
sfx2/source/sidebar/SidebarController.hxx |5 -
8 files changed, 86 insertions(+), 12 deletions(-)
New commits:
commit 219f0935fb3480cd2fde86619028c15cb69943ef
Author: Andre Fischer a...@apache.org
Date: Wed May 8 09:48:36 2013 +
Resolves: #i122255# Store sidebar panel extension state
(non persistent)
(cherry picked from commit f6f8c047b73f8fc8b4c78b321761a26ef7ed96ba)
Change-Id: I917050dd57b3fa952200dd536b371f902661e88f
diff --git a/sfx2/source/sidebar/ContextList.cxx
b/sfx2/source/sidebar/ContextList.cxx
index aebfdbd..f7028c3 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -50,6 +50,18 @@ const ContextList::Entry* ContextList::GetMatch (const
Context rContext) const
+ContextList::Entry* ContextList::GetMatch (const Context rContext)
+{
+const ::std::vectorEntry::const_iterator iEntry =
FindBestMatch(rContext);
+if (iEntry != maEntries.end())
+return const_castEntry*(*iEntry);
+else
+return NULL;
+}
+
+
+
+
::std::vectorContextList::Entry::const_iterator ContextList::FindBestMatch
(const Context rContext) const
{
sal_Int32 nBestMatch (Context::NoMatch);
diff --git a/sfx2/source/sidebar/ContextList.hxx
b/sfx2/source/sidebar/ContextList.hxx
index f026ff9..8d9886f 100644
--- a/sfx2/source/sidebar/ContextList.hxx
+++ b/sfx2/source/sidebar/ContextList.hxx
@@ -27,7 +27,8 @@
namespace sfx2 { namespace sidebar {
-
+/** Per context data for deck and panel descriptors.
+*/
class ContextList
{
public:
@@ -46,6 +47,8 @@ public:
*/
const Entry* GetMatch (
const Context rContext) const;
+Entry* GetMatch (
+const Context rContext);
void AddContextDescription (
const Context rContext,
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 59eeb05..0840c4c 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -21,6 +21,7 @@
#include PanelDescriptor.hxx
#include sfx2/sidebar/Theme.hxx
#include Paint.hxx
+#include ResourceManager.hxx
#ifdef DEBUG
#include sfx2/sidebar/Tools.hxx
@@ -47,7 +48,9 @@ namespace sfx2 { namespace sidebar {
Panel::Panel (
const PanelDescriptor rPanelDescriptor,
Window* pParentWindow,
-const ::boost::functionvoid(void) rDeckLayoutTrigger)
+const bool bIsInitiallyExpanded,
+const ::boost::functionvoid(void) rDeckLayoutTrigger,
+const ::boost::functionContext(void) rContextAccess)
: Window(pParentWindow),
msPanelId(rPanelDescriptor.msId),
mpTitleBar(new PanelTitleBar(
@@ -57,8 +60,9 @@ Panel::Panel (
mbIsTitleBarOptional(rPanelDescriptor.mbIsTitleBarOptional),
mxElement(),
mxPanelComponent(),
- mbIsExpanded(true),
- maDeckLayoutTrigger(rDeckLayoutTrigger)
+ mbIsExpanded(bIsInitiallyExpanded),
+ maDeckLayoutTrigger(rDeckLayoutTrigger),
+ maContextAccess(rContextAccess)
{
SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper());
@@ -153,6 +157,12 @@ void Panel::SetExpanded (const bool bIsExpanded)
{
mbIsExpanded = bIsExpanded;
maDeckLayoutTrigger();
+
+if (maContextAccess)
+ResourceManager::Instance().StorePanelExpansionState(
+msPanelId,
+bIsExpanded,
+maContextAccess());
}
}
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index 5a7ca1c..27c771a 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -18,6 +18,7 @@
#ifndef SFX_SIDEBAR_PANEL_HXX
#define SFX_SIDEBAR_PANEL_HXX
+#include Context.hxx
#include vcl/window.hxx
#include com/sun/star/ui/XUIElement.hpp
@@ -45,7 +46,9 @@ public:
Panel (
const PanelDescriptor rPanelDescriptor,
Window* pParentWindow,
-const ::boost::functionvoid(void) rDeckLayoutTrigger );
+const bool bIsInitiallyExpanded,
+const ::boost::functionvoid(void) rDeckLayoutTrigger,
+const ::boost::functionContext(void) rContextAccess);
virtual ~Panel (void);
void Dispose (void);
@@ -76,7 +79,7 @@ private:
cssu::Referencecss::ui::XSidebarPanel mxPanelComponent;
bool mbIsExpanded;
const ::boost::functionvoid(void) maDeckLayoutTrigger;
-Rectangle maBoundingBox;
+const ::boost::functionContext(void) maContextAccess;
};
typedef ::boost::shared_ptrPanel SharedPanel;
typedef ::std::vectorSharedPanel SharedPanelContainer;
diff --git
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - 2 commits - sfx2/source
sfx2/source/sidebar/TabBar.cxx |8
sfx2/source/sidebar/TabBar.hxx |1 +
2 files changed, 9 insertions(+)
New commits:
commit df70b1d1796a35afd30810f3f670f8f2bf32ba98
Author: Andre Fischer a...@apache.org
Date: Wed May 8 12:01:43 2013 +
Related: #i122251# Avoid compiler warning
(cherry picked from commit 4a84ca3c6515bddb02a789d9386b6c6e74b037dc)
Change-Id: I24bac356682aff5905010485eac833037f585764
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 5f8c4f5..11f8e2e 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -254,7 +254,7 @@ void TabBar::DataChanged (const DataChangedEvent
rDataChangedEvent)
-long TabBar::Notify (NotifyEvent rEvent)
+long TabBar::Notify (NotifyEvent)
{
return sal_False;
}
commit c06569bd310804ae09b411adc6d279fc665d3a96
Author: Andre Fischer a...@apache.org
Date: Wed May 8 11:57:24 2013 +
Resolves: #i122251# Prevent key events from being forwarded...
from sidebar tab bar to Calc
(cherry picked from commit 2abab958f237c62abbd59b46b36354db60f23009)
Change-Id: Ie47d086699986b64cbdc15df649adea705351307
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index bde7039..5f8c4f5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -254,6 +254,14 @@ void TabBar::DataChanged (const DataChangedEvent
rDataChangedEvent)
+long TabBar::Notify (NotifyEvent rEvent)
+{
+return sal_False;
+}
+
+
+
+
RadioButton* TabBar::CreateTabItem (const DeckDescriptor rDeckDescriptor)
{
RadioButton* pItem = ControlFactory::CreateTabItem(this);
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 2f158cb..a9479cb 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -66,6 +66,7 @@ public:
virtual void Paint (const Rectangle rUpdateArea);
virtual void DataChanged (const DataChangedEvent rDataChangedEvent);
+virtual long Notify (NotifyEvent rEvent);
static sal_Int32 GetDefaultWidth (void);
___
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/SidebarController.cxx | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit a080ba5ed71607b8b2540f6c1ab855c825ade662 Author: Andre Fischer a...@apache.org Date: Wed May 8 12:35:53 2013 + Resolves: #i122082# Show correct deck title and tab bar highlight... after switching sidebar decks (cherry picked from commit f44ca372a2a88f996366e5cb44842ef79dd9df6e) Change-Id: I2162b2eafb8bd1fc8c803a398b475cdf71b6c34d diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 3a28941..6656714 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -382,7 +382,6 @@ void SidebarController::UpdateConfigurations (void) maCurrentContext, mbIsDocumentReadOnly, mxFrame); -mpTabBar-SetDecks(aDecks); // Notify the tab bar about the updated set of decks. mpTabBar-SetDecks(aDecks); @@ -414,13 +413,12 @@ void SidebarController::UpdateConfigurations (void) // We did not find a valid deck. RequestCloseDeck(); return; - -// Tell the tab bar to highlight the button associated -// with the deck. -mpTabBar-HighlightDeck(sNewDeckId); } -msCurrentDeckId = sNewDeckId; +// Tell the tab bar to highlight the button associated +// with the deck. +mpTabBar-HighlightDeck(sNewDeckId); + SwitchToDeck( *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId), maCurrentContext); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 sfx2/source svx/source
include/sfx2/sidebar/ControllerItem.hxx |2
sfx2/source/sidebar/ControllerItem.cxx| 10 ++--
svx/source/sidebar/text/TextPropertyPanel.cxx | 63 ++
svx/source/sidebar/text/TextPropertyPanel.hxx |1
svx/source/sidebar/text/TextPropertyPanel.src | 16 ++
5 files changed, 68 insertions(+), 24 deletions(-)
New commits:
commit 63bb2c7e910c59258074eb42b0c80f3fe93d8f8d
Author: Andre Fischer a...@apache.org
Date: Fri May 10 08:51:15 2013 +
Related: #i122082# Disable controls of text property sidebar...
panel for disabled document parts
(cherry picked from commit ffcc8c326640dfbc6b765cd25875adf9e0ab66ad)
Conflicts:
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
svx/source/sidebar/text/TextPropertyPanel.cxx
Change-Id: I9f38c71c6415f3d255b5607a67a110bca47358b0
Related: #i122082# Remove temporary change
(cherry picked from commit f213ea43fac43326a643f30ff13abd9d77f6aed7)
Change-Id: I157542fd5dbbda17b63900be9a41782ee581309c
diff --git a/include/sfx2/sidebar/ControllerItem.hxx
b/include/sfx2/sidebar/ControllerItem.hxx
index 0797e41..f8cb1fe 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -88,7 +88,7 @@ public:
Changes of this state are notified via the
ItemUpdateReceiverInterface::NotifyContextChang() method.
*/
-bool IsEnabled (void) const;
+bool IsEnabled (const SfxItemState eState) const;
/** Force the controller item to call its NotifyItemUpdate
callback with up-to-date data.
diff --git a/sfx2/source/sidebar/ControllerItem.cxx
b/sfx2/source/sidebar/ControllerItem.cxx
index 521a295..5abc109 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -133,15 +133,17 @@ void ControllerItem::StateChanged (
SfxItemState eState,
const SfxPoolItem* pState)
{
-mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState, IsEnabled());
+mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState,
IsEnabled(eState));
}
-bool ControllerItem::IsEnabled (void) const
+bool ControllerItem::IsEnabled (SfxItemState eState) const
{
-if ( !
SvtCommandOptions().HasEntries(SvtCommandOptions::CMDOPTION_DISABLED))
+if (eState == SFX_ITEM_DISABLED)
+return false;
+else if ( !
SvtCommandOptions().HasEntries(SvtCommandOptions::CMDOPTION_DISABLED))
{
// There are no disabled commands.
return true;
@@ -168,7 +170,7 @@ void ControllerItem::RequestUpdate (void)
{
SfxPoolItem* pState = NULL;
const SfxItemState eState (GetBindings().QueryState(GetId(), pState));
-mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState,
IsEnabled());
+mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState,
IsEnabled(eState));
}
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 3a9d605..3a67193 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -68,10 +68,7 @@ namespace svx { namespace sidebar {
#undef HAS_IA2
-#define TEXT_SECTIONPAGE_HEIGHT SECTIONPAGE_MARGIN_VERTICAL_TOP +
CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) * 2 + CONTROL_SPACING_VERTICAL * 2 +
SECTIONPAGE_MARGIN_VERTICAL_BOT
-
-
-PopupControl* TextPropertyPanel::CreateCharacterSpacingControl
(PopupContainer* pParent)
+PopupControl* TextPropertyPanel::CreateCharacterSpacingControl
(PopupContainer* pParent)
{
return new TextCharacterSpacingControl(pParent, *this, mpBindings);
}
@@ -335,6 +332,7 @@ void TextPropertyPanel::DataChanged (const
DataChangedEvent rEvent)
+
void TextPropertyPanel::Initialize (void)
{
//modify fill font list
@@ -420,11 +418,6 @@ void TextPropertyPanel::Initialize (void)
maFontSizeBox.SetSelectHdl(aLink);
aLink = LINK(this, TextPropertyPanel, FontSizeLoseFocus);
maFontSizeBox.SetLoseFocusHdl(aLink);
-
-Size aSize(PROPERTYPAGE_WIDTH, TEXT_SECTIONPAGE_HEIGHT);
-aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
-aSize.setWidth(GetOutputSizePixel().Width());
-SetSizePixel(aSize);
}
void TextPropertyPanel::EndSpacingPopupMode (void)
@@ -944,16 +937,38 @@ void TextPropertyPanel::NotifyItemUpdate (
{
mpHeightItem = (SvxFontHeightItem*)pState;//const
SvxFontHeightItem*
SfxMapUnit eUnit = maFontSizeControl.GetCoreMetric();
-long iValue = (long)CalcToPoint( mpHeightItem-GetHeight(),
eUnit, 10 );
+const sal_Int64 nValue (CalcToPoint(mpHeightItem-GetHeight(),
eUnit, 10 ));
mpToolBoxIncDec-Enable();
mpToolBoxIncDec-SetItemState(TBI_INCREASE, STATE_NOCHECK);
mpToolBoxIncDec-SetItemState(TBI_DECREASE, STATE_NOCHECK);
+// For Writer we have to update
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/sidebar/text/TextPropertyPanel.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 9123449daa07ec053dd5d9b1db7fe7a24bd34842 Author: Andre Fischer a...@apache.org Date: Fri May 10 13:16:15 2013 + 122082: Reverting accidental modification. diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 58d209c..b5a6519 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -45,7 +45,6 @@ #include sfx2/sidebar/ResourceDefinitions.hrc #include sfx2/sidebar/ControlFactory.hxx #include sfx2/sidebar/Theme.hxx -#include sfx2/sidebar/PanelLayouter.hxx #include sfx2/imagemgr.hxx #include svtools/ctrltool.hxx #include svtools/unitconv.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/accelerators/acceleratorconfiguration.cxx | 27
+-
framework/source/accelerators/globalacceleratorconfiguration.cxx | 19
+++
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 19
+++
framework/source/inc/accelerators/acceleratorconfiguration.hxx |6 ++
framework/source/inc/accelerators/globalacceleratorconfiguration.hxx |3 +
framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx |3 +
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx|3 +
framework/source/uielement/menubarmanager.cxx|3 +
framework/source/uielement/toolbarmanager.cxx|3 +
9 files changed, 84 insertions(+), 2 deletions(-)
New commits:
commit 11f8e53d6c9942185702552445a751c6f542942d
Author: Andre Fischer a...@apache.org
Date: Wed Jun 20 11:58:32 2012 +
Resolves: #i120029# Unregister on dispose.
Patch by: zhang jianfang
Review by: Andre Fischer
(cherry picked from commit e0d5abb649958e48660357d3fa37ab6e9707b61f)
Conflicts:
framework/source/uielement/toolbarmanager.cxx
Change-Id: I4c6a112b27396fc7e5d42f3feef11ac1fe81efcd
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index c2cd26c..01a4339 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -634,21 +634,23 @@ OUString
XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
//---
// XInterface, XTypeProvider
-DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration ,
+DEFINE_XINTERFACE_8(XCUBasedAcceleratorConfiguration ,
OWeakObject,
DIRECT_INTERFACE(css::lang::XTypeProvider ),
DIRECT_INTERFACE(css::ui::XAcceleratorConfiguration ),
DIRECT_INTERFACE(css::util::XChangesListener ),
DIRECT_INTERFACE(css::form::XReset),
+DIRECT_INTERFACE(css::lang::XComponent),
DIRECT_INTERFACE(css::ui::XUIConfigurationPersistence),
DIRECT_INTERFACE(css::ui::XUIConfigurationStorage),
DIRECT_INTERFACE(css::ui::XUIConfiguration ))
-DEFINE_XTYPEPROVIDER_7(XCUBasedAcceleratorConfiguration ,
+DEFINE_XTYPEPROVIDER_8(XCUBasedAcceleratorConfiguration ,
css::lang::XTypeProvider ,
css::ui::XAcceleratorConfiguration ,
css::util::XChangesListener ,
css::form::XReset,
+css::lang::XComponent,
css::ui::XUIConfigurationPersistence,
css::ui::XUIConfigurationStorage,
css::ui::XUIConfiguration )
@@ -1250,6 +1252,27 @@ void SAL_CALL
XCUBasedAcceleratorConfiguration::disposing(const css::lang::Event
}
//---
+void SAL_CALL XCUBasedAcceleratorConfiguration::dispose()
+throw(css::uno::RuntimeException)
+{
+// nop
+}
+
+//---
+void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const
::com::sun::star::uno::Reference ::com::sun::star::lang::XEventListener
/*xListener*/ )
+throw(css::uno::RuntimeException)
+{
+// nop
+}
+
+//---
+void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const
::com::sun::star::uno::Reference ::com::sun::star::lang::XEventListener
/*xListener*/ )
+throw(css::uno::RuntimeException)
+{
+// nop
+}
+
+//---
void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred,
const css::uno::Reference css::container::XNameAccess xCfg )
{
AcceleratorCache aReadCache = AcceleratorCache();
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 92320ea..f69825f 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -111,6 +111,25 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
{}
}
+//---
+//
+// XComponent.dispose(), #i120029#, to release the cyclic reference
+//
+void SAL_CALL GlobalAcceleratorConfiguration::dispose()
+throw(css::uno::RuntimeException)
+{
+try
+{
+css::uno::Reference css::util::XChangesNotifier
[Libreoffice-commits] core.git: tomcat/build.xml
tomcat/build.xml | 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) New commits: commit 17a3a44f8949b2e37d45338f5c5702d0bb20f4a7 Author: Andre Fischer a...@apache.org Date: Tue Jul 3 11:44:39 2012 + Resolves: #i120174# Do not build tomcat code that is not delivered. (cherry picked from commit 48856f602fc5375586fe48a82ff0c47745ee69f2) Conflicts: solenv/bin/build.pl tomcat/tomcat.patch Change-Id: If5b5495d767b715e7fefde1870024064947790ea diff --git a/tomcat/build.xml b/tomcat/build.xml index 2d54d3d..10982e6 100644 --- a/tomcat/build.xml +++ b/tomcat/build.xml @@ -1,25 +1,15 @@ -project name=jsr152 and jsr154 in Debian default=debuild basedir=. +project name=jsr154 in LibreOffice default=debuild basedir=. target name=debuild - description=Build jsr154 and jsr152 for Debian (Default) + description=Build jsr154 for LibreOffice (Default) echo message=Building Servlet 2.4 API/ ant antfile=jsr154/build.xml - target=dist - inheritAll=false -/ -echo message=Building JSP 2.0 API/ -ant antfile=jsr152/build.xml - target=dist + target=jar inheritAll=false / /target target name=clean description=Clean -echo message=Cleaning JSP 2.0 API/ -ant antfile=jsr152/build.xml - target=clean - inheritAll=false -/ echo message=Cleaning Servlet 2.4 API/ ant antfile=jsr154/build.xml target=clean ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/docshell/docshel4.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 4da833308a496363cd05baad577a073e5bfb0872
Author: Andre Fischer a...@apache.org
Date: Fri Jul 6 10:45:08 2012 +
Resolves: #i119902# Rename all master pages in a template...
not only the first one.
Patch by: Ma Bingbing
Review by: Andre Fischer
(cherry picked from commit 7daa651fbc74a6fc08d713282b9e25cda14e39e9)
Change-Id: Ibd8bf8c6f04785c93b7dae70b57fd9eb14623aaf
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 9422ba9..9c998a3 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -867,8 +867,17 @@ sal_Bool DrawDocShell::SaveAsOwnFormat( SfxMedium rMedium
)
if( aLayoutName.Len() )
{
-String aOldPageLayoutName = mpDoc-GetSdPage(0,
PK_STANDARD)-GetLayoutName();
-mpDoc-RenameLayoutTemplate(aOldPageLayoutName, aLayoutName);
+sal_uInt32 nCount = mpDoc-GetMasterSdPageCount(PK_STANDARD);
+for (sal_uInt32 i = 0; i nCount; ++i)
+{
+OUString aOldPageLayoutName = mpDoc-GetMasterSdPage(i,
PK_STANDARD)-GetLayoutName();
+OUString aNewLayoutName = aLayoutName;
+// Don't add suffix for the first master page
+if( i 0 )
+aNewLayoutName += OUString::number(i);
+
+mpDoc-RenameLayoutTemplate(aOldPageLayoutName,
aNewLayoutName);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptexanimations.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 9e0b99a78b1fdb545eefc76a0931e908481bbdb6
Author: Andre Fischer a...@apache.org
Date: Mon Jun 25 08:09:05 2012 +
Resolves: #i119740# Fixed export of fill property of animations to PPT
Patch by: Tang Meng
Review by: Andre Fischer
(cherry picked from commit c4c014f74afaa9ca1b31c750b0445cf3f34e61a6)
Change-Id: I5a57fed3b8ee13d88eaed6ed6e98a6d167f9fa89
diff --git a/sd/source/filter/eppt/pptexanimations.cxx
b/sd/source/filter/eppt/pptexanimations.cxx
index 6dbaeec..d112fb4 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -278,6 +278,16 @@ AnimationExporter::AnimationExporter( const
EscherSolverContainer rSolverContai
sal_Int16 AnimationExporter::GetFillMode( const Reference XAnimationNode
xNode, const sal_Int16 nFillDefault )
{
sal_Int16 nFill = xNode-getFill();
+//#i119699 Animation The animation effect Emphasis-FlashBulb play
incorrectly in Aoo saves a .ppt to another .ppt and plays the saved one.
+//#i119740 Animation The animation effect Entrance-Flash Once fails
to play in Aoo while Aoo saves a .ppt to another .ppt and plays the saved one.
+if ((xNode-getType() == AnimationNodeType::ANIMATE)
+||(xNode-getType() == AnimationNodeType::SET)
+||(xNode-getType() == AnimationNodeType::TRANSITIONFILTER))
+{
+if ( nFill == AnimationFill::DEFAULT )
+return nFill;
+}
+
if ( ( nFill == AnimationFill::DEFAULT ) ||
( nFill == AnimationFill::INHERIT ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/container/embeddedobjectcontainer.cxx | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
New commits:
commit dbec45e8136a6de7968d93b2fc891d7409133b13
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 14:39:47 2012 +
Resolves: #i120168# Do not call storeOwn() when not necessary
Patch by: lizh.fee
Review by: Andre Fischer
(cherry picked from commit 822661c165198467b56fa2a1034ddc002ba99f7e)
Change-Id: Ibb8e39b98360ef918890a627449c654e311f0f21
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 870eb28..6acf6d8 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1508,7 +1508,29 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool
_bOasisFormat,sal_Bool
try
{
//TODO/LATER: only storing if changed!
-xPersist-storeOwn();
+//xPersist-storeOwn(); //commented, i120168
+
+// begin:all charts will be persited as xml format on disk when
saving, which is time consuming.
+// '_bObjectsOnly' mean we are storing to alien formats.
+// 'isStorageElement' mean current object is NOT an MS
OLE format. (may also include in future), i120168
+if (_bObjectsOnly (nCurState ==
embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING)
+ (pImpl-mxStorage-isStorageElement( *pIter ) ))
+{
+uno::Reference util::XModifiable xModifiable(
xObj-getComponent(), uno::UNO_QUERY );
+if ( xModifiable.is() xModifiable-isModified())
+{
+xPersist-storeOwn();
+}
+else
+{
+//do nothing.embeded model is not modified, no
need to persist.
+}
+}
+else //the embeded object is in active status, always
store back it.
+{
+xPersist-storeOwn();
+}
+//end i120168
}
catch (const uno::Exception)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx |6 ++
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 39 -
2 files changed, 31 insertions(+), 14 deletions(-)
New commits:
commit 8056d92635dd1cb03798d4691611d2484bf680af
Author: Andre Fischer a...@apache.org
Date: Wed Jul 11 11:17:48 2012 +
Resolves: #i118813# Update slide sorter after page format is modified
(cherry picked from commit b8f5370aeea74b68333885450f7ec34918c1d8c8)
Conflicts:
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
Change-Id: I42553defdce1636190e8c5c226774135e179e25d
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 67de31c..3f73b56 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -122,6 +122,12 @@ private:
const BitmapEx rOverlay,
const OutputDevice* pReferenceDevice) const;
void InvalidateBitmaps (void);
+
+/** Update the local pointer to the page object layouter to the
+one owned by the general layouter.
+Return TRUE/ when after the call we have a valid page object
layouter.
+*/
+bool UpdatePageObjectLayouter (void);
};
} } } // end of namespace sd::slidesorter::view
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 9bf75e6..c20acf9 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -82,26 +82,37 @@ void PageObjectPainter::PaintPageObject (
OutputDevice rDevice,
const model::SharedPageDescriptor rpDescriptor)
{
+if (UpdatePageObjectLayouter())
+{
+// Turn off antialiasing to avoid the bitmaps from being
+// shifted by fractions of a pixel and thus show blurry edges.
+const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing());
+rDevice.SetAntialiasing(nSavedAntialiasingMode
~ANTIALIASING_ENABLE_B2DDRAW);
+
+PaintBackground(rDevice, rpDescriptor);
+PaintPreview(rDevice, rpDescriptor);
+PaintPageNumber(rDevice, rpDescriptor);
+PaintTransitionEffect(rDevice, rpDescriptor);
+
+rDevice.SetAntialiasing(nSavedAntialiasingMode);
+}
+}
+
+
+
+
+bool PageObjectPainter::UpdatePageObjectLayouter (void)
+{
// The page object layouter is quite volatile. It may have been replaced
// since the last call. Update it now.
mpPageObjectLayouter = mrLayouter.GetPageObjectLayouter();
if ( ! mpPageObjectLayouter)
{
OSL_ASSERT(mpPageObjectLayouter);
-return;
+return false;
}
-
-// Turn off antialiasing to avoid the bitmaps from being shifted by
-// fractions of a pixel and thus show blurry edges.
-const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing());
-rDevice.SetAntialiasing(nSavedAntialiasingMode
~ANTIALIASING_ENABLE_B2DDRAW);
-
-PaintBackground(rDevice, rpDescriptor);
-PaintPreview(rDevice, rpDescriptor);
-PaintPageNumber(rDevice, rpDescriptor);
-PaintTransitionEffect(rDevice, rpDescriptor);
-
-rDevice.SetAntialiasing(nSavedAntialiasingMode);
+else
+return true;
}
@@ -112,7 +123,7 @@ void PageObjectPainter::NotifyResize (const bool bForce)
mpPageObjectLayouter = mrLayouter.GetPageObjectLayouter();
if (bForce || ! mpPageObjectLayouter)
InvalidateBitmaps();
-else
+else if (UpdatePageObjectLayouter())
{
const Size aSize (mpPageObjectLayouter-GetSize(
PageObjectLayouter::FocusIndicator,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drawview.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit e0dfd32be2e4c3ee389b180fd45348fb1b800e9d Author: Andre Fischer a...@apache.org Date: Fri Jul 13 07:33:02 2012 + Resolves: #i120172# Add missing undo action for changing PresObj index Reported by: Shan Zhu Fixed by: Andre Fischer (cherry picked from commit 1289f5be48f50b38b16fb0ad34c7743317e8c79d) Change-Id: I6c65dbe9bc87a64ebb2b46a9dc2fda855900c810 diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index ff7f3c4..0d7839f 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -588,6 +588,13 @@ void DrawView::DeleteMarked() Rectangle aRect( pObj-GetLogicRect() ); SdrObject* pNewObj = pPage-InsertAutoLayoutShape( 0, ePresObjKind, bVertical, aRect, true ); +// Move the new PresObj to the position before the +// object it will replace. +pUndoManager-AddUndoAction( +mpDoc-GetSdrUndoFactory().CreateUndoObjectOrdNum( +*pNewObj, +pNewObj-GetOrdNum(), +pObj-GetOrdNum())); pPage-SetObjectOrdNum( pNewObj-GetOrdNum(), pObj-GetOrdNum() ); bResetLayout = 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' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0763a83fb20825c66d8a3ecc50327753f7508bf9 Author: Andre Fischer a...@apache.org Date: Mon May 13 11:00:09 2013 + 122272: Select correct sidebar button after changing decks via menu. diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 6d6250d..3e5c05e 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -488,6 +488,7 @@ void SidebarController::SwitchToDeck ( msCurrentDeckId = rDeckDescriptor.msId; } +mpTabBar-HighlightDeck(msCurrentDeckId); // Determine the panels to display in the deck. ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/view/drviews1.cxx |5 + sd/source/ui/view/drviewsa.cxx |5 - 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8 Author: Andre Fischer a...@apache.org Date: Mon May 13 13:34:46 2013 + 122275: Don't show the layout panel for master pages. diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 8f87947..615063f 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -516,6 +516,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) Invalidate( SID_TITLE_MASTERPAGE ); Invalidate( SID_NOTES_MASTERPAGE ); Invalidate( SID_HANDOUT_MASTERPAGE ); + +if (meEditMode == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +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 8420a23..211907c 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -156,7 +156,10 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase rViewShellBas mpSelectionChangeHandler-Connect(); - SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +if (mpFrameView-GetViewShEditMode(mePageKind) == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +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: xmlsecurity/test_docs
dev/null |binary
xmlsecurity/test_docs/tools/README.txt|5 -
xmlsecurity/test_docs/tools/httpserv/build.xml|5 +
xmlsecurity/test_docs/tools/httpserv/dist/README.TXT | 33
--
xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties |2
5 files changed, 9 insertions(+), 36 deletions(-)
New commits:
commit 1e8482db2d8b0b19fac88673384c227047a862b1
Author: Andre Fischer a...@apache.org
Date: Tue Aug 21 11:27:12 2012 +
Resolves: #i120635# Removed httpserv.jar and changed its dist directory
(cherry picked from commit efc6346ef6a3a9b618979230036d877149ce0d7d)
Change-Id: I983b106ef46bd9b95f6ef12d3c2432d604dd08a8
diff --git a/xmlsecurity/test_docs/tools/README.txt
b/xmlsecurity/test_docs/tools/README.txt
index dd1431b..159d2c0 100644
--- a/xmlsecurity/test_docs/tools/README.txt
+++ b/xmlsecurity/test_docs/tools/README.txt
@@ -11,8 +11,9 @@ java -jar httpserv/dist/httpserv.jar --accept portnumber
portnumber: an arbitrary port number to which the server should listen.
httpserv looks for the requested file relativ to the current directory. For
-example, you are in a directory which contains the index.html. From there
-you run httpserv.jar:
+example, you are in
+$(SRC_ROOT)/xmlsecurity/$(INPATH)/httpserv/dist/javadoc,
+a directory which contains the index.html. From there you run httpserv.jar:
java -jar path_to_wherever_it_is/httpserv.jar --accept 8000
diff --git a/xmlsecurity/test_docs/tools/httpserv/build.xml
b/xmlsecurity/test_docs/tools/httpserv/build.xml
index 831e963..aacabc8 100644
--- a/xmlsecurity/test_docs/tools/httpserv/build.xml
+++ b/xmlsecurity/test_docs/tools/httpserv/build.xml
@@ -71,4 +71,9 @@
nbproject/build-impl.xml file.
--
+!-- Import the environment as properties to make them available in
project.properties
+--
+target name=-pre-init
+ property environment=env /
+/target
/project
diff --git a/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT
b/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT
deleted file mode 100755
index 28db189..000
--- a/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT
+++ /dev/null
@@ -1,33 +0,0 @@
-
-BUILD OUTPUT DESCRIPTION
-
-
-When you build an Java application project that has a main class, the IDE
-automatically copies all of the JAR
-files on the projects classpath to your projects dist/lib folder. The IDE
-also adds each of the JAR files to the Class-Path element in the application
-JAR files manifest file (MANIFEST.MF).
-
-To run the project from the command line, go to the dist folder and
-type the following:
-
-java -jar httpserv.jar
-
-To distribute this project, zip up the dist folder (including the lib folder)
-and distribute the ZIP file.
-
-Notes:
-
-* If two JAR files on the project classpath have the same name, only the first
-JAR file is copied to the lib folder.
-* Only JAR files are copied to the lib folder.
-If the classpath contains other types of files or folders, none of the
-classpath elements are copied to the lib folder. In such a case,
-you need to copy the classpath elements to the lib folder manually after the
build.
-* If a library on the projects classpath also has a Class-Path element
-specified in the manifest,the content of the Class-Path element has to be on
-the projects runtime path.
-* To set a main class in a standard Java project, right-click the project node
-in the Projects window and choose Properties. Then click Run and enter the
-class name in the Main Class field. Alternatively, you can manually type the
-class name in the manifest Main-Class element.
diff --git a/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar
b/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar
deleted file mode 100755
index b80b609..000
Binary files a/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar and
/dev/null differ
diff --git a/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
b/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
index 049b553..a0ec60a 100644
--- a/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
+++ b/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
@@ -18,7 +18,7 @@ debug.classpath=\
debug.test.classpath=\
${run.test.classpath}
# This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=../../../${env.INPATH}/misc/httpserv
dist.jar=${dist.dir}/httpserv.jar
dist.javadoc.dir=${dist.dir}/javadoc
excludes=
___
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/ControllerFactory.hxx |2 ++
sfx2/source/sidebar/FocusManager.cxx|2 ++
sfx2/source/sidebar/SidebarToolBox.cxx |3 +++
3 files changed, 7 insertions(+)
New commits:
commit a7d457da0e9d7d2ede3906d346869322801b9707
Author: Andre Fischer a...@apache.org
Date: Tue May 14 16:23:55 2013 +
122302: Added missing includes.
diff --git a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
index 802d3e7..8a08050 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
@@ -29,6 +29,8 @@
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
+class ToolBox;
+
namespace sfx2 { namespace sidebar {
/** Convenience class for easy creation of toolbox controllers.
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index b1e6dd0..93ff036 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -194,10 +194,12 @@ FocusManager::FocusLocation
FocusManager::GetFocusLocation (const Window rWindo
{
// Check the deck title.
if (mpDeckTitleBar != NULL)
+{
if (mpDeckTitleBar == rWindow)
return FocusLocation(PC_DeckTitle, -1);
else if (mpDeckTitleBar-GetToolBox() == rWindow)
return FocusLocation(PC_DeckToolBox, -1);
+}
// Search the panels.
for (sal_Int32 nIndex=0,nCount(maPanels.size()); nIndexnCount; ++nIndex)
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx
b/sfx2/source/sidebar/SidebarToolBox.cxx
index 30a0dab..20408dd 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -28,6 +28,9 @@
#include sfx2/sidebar/Tools.hxx
#include vcl/gradient.hxx
+#include svtools/miscopt.hxx
+#include framework/imageproducer.hxx
+#include com/sun/star/frame/XSubToolbarController.hpp
using namespace ::com::sun::star;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - 2 commits - include/sfx2 sc/source sfx2/Library_sfx.mk sfx2/source
include/sfx2/sidebar/IContextChangeReceiver.hxx |7 ++--
include/sfx2/sidebar/ILayoutableWindow.hxx |5 ++-
include/sfx2/sidebar/SidebarPanelBase.hxx|3 +-
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx |1
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |1
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx |1
sfx2/Library_sfx.mk |2 +
sfx2/source/sidebar/AsynchronousCall.cxx |2 -
sfx2/source/sidebar/IContextChangeReceiver.cxx | 28 +++
sfx2/source/sidebar/ILayoutableWindow.cxx| 28 +++
sfx2/source/sidebar/SidebarPanelBase.cxx |8 -
11 files changed, 68 insertions(+), 18 deletions(-)
New commits:
commit 43d022d31ac774837273e35f8a1d738efd811de1
Author: Andre Fischer a...@apache.org
Date: Mon May 13 07:40:20 2013 +
Related: #i122047# Added missing implementation of virtual destructors
(cherry picked from commit 107eb08386046f1e78dc32b21f569c6aa7352cd1)
Change-Id: Icc57d8910a390e9b608b5aa4a0fa6d8c8659208d
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx
b/sfx2/source/sidebar/AsynchronousCall.cxx
index 54f5883..a4b85bd 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -66,7 +66,7 @@ void AsynchronousCall::CancelRequest (void)
if (mnCallId != 0)
{
Application::RemoveUserEvent(mnCallId);
-mnCallId = -1;
+mnCallId = 0;
}
}
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx
b/sfx2/source/sidebar/IContextChangeReceiver.cxx
new file mode 100644
index 000..1aa7a50
--- /dev/null
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -0,0 +1,28 @@
+/*
+ * 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 sfx2/sidebar/IContextChangeReceiver.hxx
+
+
+namespace sfx2 { namespace sidebar {
+
+
+IContextChangeReceiver::~IContextChangeReceiver (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx
b/sfx2/source/sidebar/ILayoutableWindow.cxx
new file mode 100644
index 000..dccd15d
--- /dev/null
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -0,0 +1,28 @@
+/*
+ * 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 sfx2/sidebar/ILayoutableWindow.hxx
+
+
+namespace sfx2 { namespace sidebar {
+
+
+ILayoutableWindow::~ILayoutableWindow (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 6a17fb7..9aef9fa 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -240,12 +240,4 @@ ui::LayoutSize SAL_CALL
SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
return ui::LayoutSize(0,0,0);
}
-IContextChangeReceiver::~IContextChangeReceiver()
-{
-}
-
-ILayoutableWindow::~ILayoutableWindow()
-{
-}
-
} } // end of namespace sfx2::sidebar
commit decee367674661cf2535c0b8686eb9cec8658c09
Author: Andre Fischer a...@apache.org
Date: Fri May 10 11:03:45 2013 +
Resolves: #i122047# Adding virtual destructors to interfaces...
to prevent problems with older compilers
(cherry picked from commit 8f3625e6cf098c3fd5e6701b7b687a0423d78f51)
Conflicts:
sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/Library_svx.mk
svx/Library_svx.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 92d660b5f1d2e4848041a69fb54d543f19fbb0a6 Author: Andre Fischer a...@apache.org Date: Mon May 13 07:41:14 2013 + Related: #i122047# Remove last traces of unused toolbox controller (cherry picked from commit ba6704b01ebc30b06485ef7f914b873201a08e85) Change-Id: I6107fd3f840e07f546e8ae7aa8e6eb60f8b4d566 diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index b4b4051..76f54c9 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -202,7 +202,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/sidebar/tools/Popup \ svx/source/sidebar/tools/ValueSetWithTextControl \ svx/source/sidebar/insert/InsertPropertyPanel \ -svx/source/sidebar/insert/SimpleToolBoxController \ svx/source/stbctrls/pszctrl \ svx/source/stbctrls/insctrl \ svx/source/stbctrls/selctrl \ ___ 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/SidebarController.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit dca16f8c819a1c657c5d0eb7e3c6ff884843f9a7 Author: Andre Fischer a...@apache.org Date: Mon May 13 11:00:09 2013 + Resolves: #i122272# Select correct sidebar button... after changing decks via menu. (cherry picked from commit 0763a83fb20825c66d8a3ecc50327753f7508bf9) Change-Id: Ief24fa9191848ad6004ea7c28cd28b73b7e54f9f diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 6656714..b508cf4 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -480,6 +480,7 @@ void SidebarController::SwitchToDeck ( msCurrentDeckId = rDeckDescriptor.msId; } +mpTabBar-HighlightDeck(msCurrentDeckId); // Determine the panels to display in the deck. ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sd/source
sd/source/ui/view/drviews1.cxx |5 + sd/source/ui/view/drviewsa.cxx |5 - 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 5f7fc90810a4bab148e0de745b980813cd4ad542 Author: Andre Fischer a...@apache.org Date: Mon May 13 13:34:46 2013 + Resolves: #i122275# Don't show the layout panel for master pages (cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8) Conflicts: sd/source/ui/view/drviewsa.cxx Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5 diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index faf114f..552f61b 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -458,6 +458,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) Invalidate( SID_TITLE_MASTERPAGE ); Invalidate( SID_NOTES_MASTERPAGE ); Invalidate( SID_HANDOUT_MASTERPAGE ); + +if (meEditMode == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +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 a747165..a580d60 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -137,7 +137,10 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase rViewShellBas mpSelectionChangeHandler-Connect(); - SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +if (mpFrameView-GetViewShEditMode(mePageKind) == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +else + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage)); doShow(); } ___ 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/DeckTitleBar.cxx | 15 +--
sfx2/source/sidebar/PanelTitleBar.cxx |5 +
sfx2/source/sidebar/Sidebar.hrc |3 +++
sfx2/source/sidebar/Sidebar.src |9 +
4 files changed, 26 insertions(+), 6 deletions(-)
New commits:
commit 17383db8f19de33c2adac783ac91c2cbf3cab438
Author: Andre Fischer a...@apache.org
Date: Mon May 13 14:41:07 2013 +
Resolves: #i122298# Added quick help texts to title bar buttons of
sidebar...
panels and deck
(cherry picked from commit 2f18055a153f4e66ec72b0c20673032d6edeebab)
Change-Id: Ic573030d5b8a437e09a763fb0350c22ef33e151a
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 0370ef8..ed7fd17 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -18,6 +18,8 @@
#include DeckTitleBar.hxx
#include sfx2/sidebar/Theme.hxx
+#include sfx2/sfxresid.hxx
+#include Sidebar.hrc
#include vcl/image.hxx
@@ -39,16 +41,12 @@ DeckTitleBar::DeckTitleBar (
: TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
mnCloserItemIndex(1),
maCloserAction(rCloserAction),
- mbIsCloserVisible(rCloserAction)
+ mbIsCloserVisible(false)
{
OSL_ASSERT(pParentWindow != NULL);
if (maCloserAction)
-{
-maToolBox.InsertItem(
-mnCloserItemIndex,
-Theme::GetImage(Theme::Image_Closer));
-}
+SetCloserVisible(true);
#ifdef DEBUG
SetText(A2S(DeckTitleBar));
@@ -72,9 +70,14 @@ void DeckTitleBar::SetCloserVisible (const bool
bIsCloserVisible)
mbIsCloserVisible = bIsCloserVisible;
if (mbIsCloserVisible)
+{
maToolBox.InsertItem(
mnCloserItemIndex,
Theme::GetImage(Theme::Image_Closer));
+maToolBox.SetQuickHelpText(
+mnCloserItemIndex,
+String(SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK)));
+}
else
maToolBox.RemoveItem(
maToolBox.GetItemPos(mnCloserItemIndex));
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 0175741..9b67e3c 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -17,6 +17,8 @@
*/
#include PanelTitleBar.hxx
+#include sfx2/sfxresid.hxx
+#include Sidebar.hrc
#include Paint.hxx
#include Panel.hxx
@@ -73,6 +75,9 @@ void PanelTitleBar::SetMenuAction ( const
::boost::functionvoid(void) rMenuAc
mnMenuItemIndex,
Theme::GetImage(Theme::Image_PanelMenu));
maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
+maToolBox.SetQuickHelpText(
+mnMenuItemIndex,
+String(SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS)));
}
else if ( maMenuAction !rMenuAction )
{
diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
index 852648c..c9c4d79 100644
--- a/sfx2/source/sidebar/Sidebar.hrc
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -51,3 +51,6 @@
#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL 132
#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)
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index 64eef88..6ec57c1 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -155,4 +155,13 @@ Resource RID_SIDEBAR_RESOURCE
};
};
+String SFX_STR_SIDEBAR_MORE_OPTIONS
+{
+Text [en-US] = More Options;
+};
+
+String SFX_STR_SIDEBAR_CLOSE_DECK
+{
+Text [en-US] = Close Sidebar Deck;
+};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source
svx/source/sidebar/insert/InsertPropertyPanel.cxx |9 +-
svx/source/sidebar/insert/SimpleToolBoxController.cxx | 79 --
svx/source/sidebar/insert/SimpleToolBoxController.hxx | 50 ---
3 files changed, 7 insertions(+), 131 deletions(-)
New commits:
commit aee443a35f07bd69b32311e0298af220491f9c0b
Author: Andre Fischer a...@apache.org
Date: Fri May 10 11:30:31 2013 +
Related: #i122218# Replaced local tool box controller...
with existing GenericToolboxController (cleanup)
(cherry picked from commit 784ed0d2e9cc2de7e3de8420d4708ee5c4631a5c)
Conflicts:
svx/source/sidebar/insert/SimpleToolBoxController.cxx
svx/source/sidebar/insert/SimpleToolBoxController.hxx
Change-Id: I9c409c2979982ccd5d7a76c10db6c3f7dd59c307
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index fc40f92..2d30e6a 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -17,7 +17,6 @@
*/
#include InsertPropertyPanel.hxx
#include InsertPropertyPanel.hrc
-#include SimpleToolBoxController.hxx
#include sfx2/sidebar/CommandInfoProvider.hxx
#include sfx2/sidebar/Theme.hxx
@@ -26,6 +25,7 @@
#include svx/dialmgr.hxx
#include svtools/miscopt.hxx
+#include svtools/generictoolboxcontroller.hxx
#include vcl/toolbox.hxx
#include sfx2/tbxctrl.hxx
#include framework/sfxhelperfunctions.hxx
@@ -275,7 +275,12 @@ void InsertPropertyPanel::CreateController (
UNO_QUERY);
if ( ! aDescriptor.mxController.is())
aDescriptor.mxController.set(
-static_castXWeak*(new SimpleToolBoxController(mxFrame,
*pToolBox, nItemId, sCommandName)),
+static_castXWeak*(new svt::GenericToolboxController(
+::comphelper::getProcessServiceFactory(),
+mxFrame,
+pToolBox,
+nItemId,
+sCommandName)),
UNO_QUERY);
if ( ! aDescriptor.mxController.is())
return;
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.cxx
b/svx/source/sidebar/insert/SimpleToolBoxController.cxx
deleted file mode 100644
index c60b6ef..000
--- a/svx/source/sidebar/insert/SimpleToolBoxController.cxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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 SimpleToolBoxController.hxx
-
-#include comphelper/processfactory.hxx
-#include vcl/toolbox.hxx
-#include vcl/svapp.hxx
-
-
-using namespace ::com::sun::star;
-
-namespace svx { namespace sidebar {
-
-SimpleToolBoxController::SimpleToolBoxController(
-const cssu::Referencecss::frame::XFrame rxFrame,
-ToolBox rToolBox,
-const sal_uInt16 nItemId,
-const rtl::OUString rsCommand)
-:
svt::ToolboxController(comphelper::getComponentContext(comphelper::getProcessServiceFactory()),
-rxFrame, rsCommand),
- mrToolbox(rToolBox),
- mnItemId(nItemId)
-{
-}
-
-
-
-
-SimpleToolBoxController::~SimpleToolBoxController (void)
-{
-}
-
-
-
-
-void SAL_CALL SimpleToolBoxController::statusChanged (const
css::frame::FeatureStateEvent rEvent)
-throw (cssu::RuntimeException)
-{
-SolarMutexGuard aSolarMutexGuard;
-
-if (m_bDisposed)
-return;
-
-mrToolbox.EnableItem(mnItemId, rEvent.IsEnabled);
-
-sal_uInt16 nItemBits = mrToolbox.GetItemBits(mnItemId);
-nItemBits = ~TIB_CHECKABLE;
-TriState eState = STATE_NOCHECK;
-
-sal_Bool bValue = sal_False;
-if (rEvent.State = bValue)
-{
-// Boolean, treat it as checked/unchecked
-mrToolbox.CheckItem(mnItemId, bValue);
-if ( bValue )
-eState = STATE_CHECK;
-nItemBits |= TIB_CHECKABLE;
-}
-
-mrToolbox.SetItemState(mnItemId, eState);
-mrToolbox.SetItemBits(mnItemId, nItemBits);
-}
-
-} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.hxx
b/svx/source/sidebar/insert/SimpleToolBoxController.hxx
deleted file mode 100644
index b10bda7..000
--- a/svx/source/sidebar/insert
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/epptso.cxx | 57 ---
1 file changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 8c23e31acc61406103c1565960e4c5b391902754
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 08:04:21 2012 +
Resolves: #i119551# Avoid grouping shapes on import from PPT...
under certain conditions.
Reported by: Li Feng Wang
Patch and review by: Ma Bingbing and Armin Le Grand
(cherry picked from commit f425d556504e055216d9402241ff598a97204509)
Conflicts:
sd/source/filter/eppt/epptso.cxx
Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 356ddfb..65c5b33 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2242,7 +2242,10 @@ void PPTWriter::ImplCreateTextShape(
EscherPropertyContainer rPropOpt, EscherSo
void PPTWriter::ImplWritePage( const PHLayout rLayout, EscherSolverContainer
aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber )
{
-sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nGroupLevel = 0, nOlePictureId;
+// #i119551# PPT does not support groups of polygons and text (MS patch
KB2289187)
+// sal_uInt32 nGroupLevel = 0;
+
+sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nOlePictureId;
sal_uInt16 nEffectCount;
::com::sun::star::awt::Point aTextRefPoint;
@@ -2497,8 +2500,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)(
mnAngle / 10 ) );
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of
polygons and text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bNeedText = sal_False;
bAdditionalText = sal_True;
mnTextSize = 0;
@@ -2693,7 +2697,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aTextRefPoint = ::com::sun::star::awt::Point(
maRect.Left(), maRect.Top() );
mnTextSize = 0;
bAdditionalText = sal_True;
-mpPptEscherEx-EnterGroup( maRect,0 );
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( maRect,0 );
}
mpPptEscherEx-OpenContainer( ESCHER_SpContainer );
sal_uInt32 nFlags = 0xa00; //
Flags: Connector | HasSpt
@@ -2711,8 +2716,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2730,8 +2736,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2749,8 +2756,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2768,8 +2776,9 @@ void PPTWriter
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/epptso.cxx | 57 ---
1 file changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 578bd45644657a9f7ae99f525eeb5c653103dcf8
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 08:04:21 2012 +
Resolves: #i119551# Avoid grouping shapes on import from PPT...
under certain conditions.
Reported by: Li Feng Wang
Patch and review by: Ma Bingbing and Armin Le Grand
(cherry picked from commit f425d556504e055216d9402241ff598a97204509)
Conflicts:
sd/source/filter/eppt/epptso.cxx
(cherry picked from commit 8c23e31acc61406103c1565960e4c5b391902754)
Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 356ddfb..f5ebfa5 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2242,7 +2242,10 @@ void PPTWriter::ImplCreateTextShape(
EscherPropertyContainer rPropOpt, EscherSo
void PPTWriter::ImplWritePage( const PHLayout rLayout, EscherSolverContainer
aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber )
{
-sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nGroupLevel = 0, nOlePictureId;
+// #i119551# PPT does not support groups of polygons and text (MS patch
KB2289187)
+// sal_uInt32 nGroupLevel = 0;
+
+sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nOlePictureId;
sal_uInt16 nEffectCount;
::com::sun::star::awt::Point aTextRefPoint;
@@ -2497,8 +2500,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)(
mnAngle / 10 ) );
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of
polygons and text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bNeedText = sal_False;
bAdditionalText = sal_True;
mnTextSize = 0;
@@ -2693,7 +2697,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aTextRefPoint = ::com::sun::star::awt::Point(
maRect.Left(), maRect.Top() );
mnTextSize = 0;
bAdditionalText = sal_True;
-mpPptEscherEx-EnterGroup( maRect,0 );
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( maRect,0 );
}
mpPptEscherEx-OpenContainer( ESCHER_SpContainer );
sal_uInt32 nFlags = 0xa00; //
Flags: Connector | HasSpt
@@ -2711,8 +2716,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2730,8 +2736,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2749,8 +2756,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/cellsuno.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 694d65b5097062f26c532d7c123905bf07b106f2 Author: Andre Fischer a...@apache.org Date: Wed Jul 11 08:07:30 2012 + Resolves: #i20044# Fixed queryEmptyCell() Reported by: Steffen Grund Patch by: hanya: Review by: Andre Fischer (cherry picked from commit f42a00437a682d479e82256b2fdf873dd097c428) Conflicts: sc/source/ui/unoobj/cellsuno.cxx Change-Id: I43db011e138a79bd3a871e68a7331d26267e7899 diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 40c602f..93192ae 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3569,8 +3569,8 @@ uno::Referencesheet::XSheetCellRanges SAL_CALL ScCellRangesBase::queryEmptyCel ScRangeList aNewRanges; // IsMultiMarked reicht hier nicht (wird beim deselektieren nicht zurueckgesetzt) -if (aMarkData.HasAnyMultiMarks()) -aMarkData.FillRangeListWithMarks( aNewRanges, false ); +//if (aMarkData.HasAnyMultiMarks()) // #i20044# should be set for all empty range +aMarkData.FillRangeListWithMarks( aNewRanges, false ); return new ScCellRangesObj( pDocShell, aNewRanges );// aNewRanges kann leer sein } ___ 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/svdfppt.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 3db0865845c79d9ea4ae854aa82a239329ba542c Author: Andre Fischer a...@apache.org Date: Thu Jul 12 10:19:38 2012 + Resolves: #i119493# Fixed import of tables with connectors. Reported by: liupingtan Patch by: SunYing Review by: Andre Fischer (cherry picked from commit 8be0972c9b38efbb43a0b8fc3658028ede58378c) Change-Id: Ic9a1325ccc9bc9c9a4501269df9de0f7e29a8e1d diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f9323ed..8b7ea08 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7592,6 +7592,16 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab if ( pPtr-pBObj == pPartObj ) pPtr-pBObj = NULL; } +//In MS, the one_row_one_col table is made up of five +//shape,the connector is connected to some part of a +//table. But for us, the connector is connected to the +//whole group table,so the connector obj is a group +//table when export by us. We should process this +//situation when importing. +if ( pPtr-pAObj == pGroup ) +pPtr-pAObj = pTable; +if ( pPtr-pBObj == pGroup ) +pPtr-pBObj = pTable; } } pTable-uno_unlock(); ___ 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
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 +++
6 files changed, 67 insertions(+), 13 deletions(-)
New commits:
commit ca7264d7ab7e8b70693362d60227c7dd7626df8b
Author: Andre Fischer a...@apache.org
Date: Thu May 16 09:51:11 2013 +
122320: Show closer after docking sidebar. Prevent sidebar from being
docked above or below edit view.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 910e6dd..f2f9a4d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1022,11 +1022,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;
}
@@ -1078,17 +1080,23 @@ void SidebarController::RestrictWidth (void)
SfxSplitWindow* SidebarController::GetSplitWindow (void)
{
-if (mpSplitWindow == NULL)
+if (mpParentWindow != NULL)
{
-if (mpParentWindow != NULL)
+SfxSplitWindow* pSplitWindow =
dynamic_castSfxSplitWindow*(mpParentWindow-GetParent());
+if (pSplitWindow != mpSplitWindow)
{
-mpSplitWindow =
dynamic_castSfxSplitWindow*(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 a119613..1b6dcd8 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -108,4 +108,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 55347be..338e31e 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -53,6 +53,10 @@ protected:
// Window overridables
virtual void GetFocus (void);
+virtual SfxChildAlignment CheckAlignment (
+SfxChildAlignment eCurrentAlignment,
+SfxChildAlignment eRequestedAlignment);
+
private:
::rtl::Referencesfx2::sidebar::SidebarController mpSidebarController;
commit e785c5125994bbfdb4e69108b5a73a184b3ced49
Author: Andre Fischer a...@apache.org
Date: Thu May 16 08:49:36 2013 +
122271: Provide accessible for panels that includes the panel title.
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index d8bfb25..7a5191e 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -48,7 +48,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),
@@ -57,6 +57,12 @@ PanelTitleBar::PanelTitleBar (
{
OSL_ASSERT(mpPanel != NULL);
+const ::rtl::OUString sAccessibleName(
+String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sfx2/inc sfx2/source svx/source
sfx2/inc/sfx2/sidebar/ControlFactory.hxx | 29
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx | 16 ++
sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx |4
sfx2/inc/sfx2/sidebar/Tools.hxx |3
sfx2/source/sidebar/ControlFactory.cxx|5
sfx2/source/sidebar/ControllerFactory.cxx | 132 +++---
sfx2/source/sidebar/Deck.cxx | 86 +++---
sfx2/source/sidebar/Deck.hxx |5
sfx2/source/sidebar/FocusManager.cxx |8 +
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
16 files changed, 279 insertions(+), 110 deletions(-)
New commits:
commit 3608a33d8362cbc44a2eb7203b7d1bffe481c7ab
Author: Andre Fischer a...@apache.org
Date: Thu May 16 11:43:55 2013 +
121960: Improve creation of toolbox/toolbar controllers.
diff --git a/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
b/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
index 623abf1..f232835 100644
--- a/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
@@ -32,26 +32,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::Referencecom::sun::star::frame::XFrame
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 TRUE/ 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/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
index 8a08050..3f9e45b 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
@@ -23,8 +23,9 @@
#define SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
#include sfx2/dllapi.h
-#include com/sun/star/frame/XToolbarController.hpp
+#include com/sun/star/awt/XWindow.hpp
#include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/frame/XToolbarController.hpp
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
@@ -33,7 +34,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
{
@@ -42,7 +43,16 @@ public:
ToolBox* pToolBox,
const sal_uInt16 nItemId,
const ::rtl::OUString rsCommandName,
-const cssu::Referencecss::frame::XFrame rxFrame);
+const cssu::Referencecss::frame::XFrame rxFrame,
+const cssu::Referencecss::awt::XWindow rxParentWindow,
+const sal_Int32 nItemWidth);
+
+private:
+static cssu::Referencecss::frame::XToolbarController
CreateToolBarController(
+ToolBox* pToolBox,
+const ::rtl::OUString rsCommandName,
+const cssu::Referencecss::frame::XFrame rxFrame,
+const sal_Int32 nWidth
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 60169637833bf39f646162ef156347eec4b5da39 Author: Andre Fischer a...@apache.org Date: Thu Aug 30 11:32:06 2012 + Resolves: #i120764# Reduce grid size for snake wipe transition to 8*8. Patch by: Wang Zhe Review by: Andre Fischer (cherry picked from commit 2de9df3bc309f480c68a970b3353b718ca4e9c68) Change-Id: I33b5d9975d52492d296e77b191ae1a394c8443a0 diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx index 64c2a0f..ca1d198 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx @@ -143,7 +143,7 @@ namespace slideshow return ParametricPolyPolygonSharedPtr( new SnakeWipe( // elements: -64 * 64, +8 * 8, // diagonal: nSubType == TOPLEFTDIAGONAL || nSubType == TOPRIGHTDIAGONAL || @@ -158,7 +158,7 @@ namespace slideshow return ParametricPolyPolygonSharedPtr( new ParallelSnakesWipe( // elements: -64 * 64, +8 * 8, // diagonal: nSubType == DIAGONALBOTTOMLEFTOPPOSITE || nSubType == DIAGONALTOPLEFTOPPOSITE, @@ -178,7 +178,7 @@ namespace slideshow return ParametricPolyPolygonSharedPtr( new SpiralWipe( // elements: -64 * 64, +8 * 8, // flipOnYAxis: nSubType == TOPLEFTCOUNTERCLOCKWISE || nSubType == TOPRIGHTCOUNTERCLOCKWISE || @@ -188,7 +188,7 @@ namespace slideshow return ParametricPolyPolygonSharedPtr( new BoxSnakesWipe( // elements: -64 * 64, +8 * 8, // fourBox: nSubType == FOURBOXVERTICAL || nSubType == FOURBOXHORIZONTAL ) ); ___ 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 a...@apache.org
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 tools/svborder.hxx
#include vcl/gradient.hxx
#include vcl/image.hxx
#include toolkit/helper/vclunohelper.hxx
-#ifdef DEBUG
-#include sfx2/sidebar/Tools.hxx
-#endif
using namespace css;
using namespace cssu;
commit b83fb522809c9b54427f60200164f878ae7f4658
Author: Oliver-Rainer Wittmann o...@apache.org
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 a...@apache.org
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 pavelja...@apache.org
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 pavelja...@apache.org
Date: Fri May 17 10:17:32 2013
[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 a...@apache.org
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 @@
value oor:separator=;
Calc, Auditing, visible ;
Calc, Cell, visible ;
+Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot,visible ;
/value
@@ -781,6 +782,7 @@
value oor:separator=;
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot,hidden ;
/value
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 '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 a...@apache.org
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 '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 a...@apache.org
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_castSfxSplitWindow*(mpParentWindow-GetParent());
+if (pSplitWindow != mpSplitWindow)
{
-mpSplitWindow =
dynamic_castSfxSplitWindow*(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::Referencesfx2::sidebar::SidebarController 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/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 a...@apache.org
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_castCommandEvent*(rEvent.GetData());
+if (pCommandEvent != NULL)
+switch (pCommandEvent-GetCommand())
+{
+case COMMAND_WHEEL:
+return ProcessWheelEvent(pCommandEvent, rEvent)
+? sal_True
+: sal_False;
+
+default:
+break;
+}
+}
-CommandEvent* pCommandEvent =
reinterpret_castCommandEvent*(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_ptrScrollBar 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, ChildEventListener,
VclSimpleEvent*, pEvent)
break
[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 a...@apache.org
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: 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 a...@apache.org
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 a...@apache.org
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_castCommandEvent*(rEvent.GetData());
+if (pCommandEvent != NULL)
+switch (pCommandEvent-GetCommand())
+{
+case COMMAND_WHEEL:
+return ProcessWheelEvent(pCommandEvent, rEvent)
+? sal_True
+: sal_False;
+
+default:
+break;
+}
+}
-CommandEvent* pCommandEvent =
reinterpret_castCommandEvent*(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 '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 a...@apache.org
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 a...@apache.org
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 a...@apache.org
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::vectorTabBar::DeckMenuData rDeckSelectionData,
-const ::std::vectorTabBar::DeckMenuData rDeckShowData) const
+const ::std::vectorTabBar::DeckMenuData rMenuData) const
{
-::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rDeckSelectionData,
rDeckShowData);
+::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rMenuData);
pMenu
[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 a...@apache.org
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::Referencecom::sun::star::frame::XFrame
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 TRUE/ 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 com/sun/star/frame/XToolbarController.hpp
+#include com/sun/star/awt/XWindow.hpp
#include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/frame/XToolbarController.hpp
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::Referencecss::frame::XFrame rxFrame);
+const cssu::Referencecss::frame::XFrame rxFrame,
+const
[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 a...@apache.org
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 @@
value oor:separator=;
Calc, Auditing, visible ;
Calc, Cell, visible ;
+Calc, EditCell, visible ;
Calc, default, visible ;
Calc, Pivot,visible ;
/value
@@ -753,6 +754,7 @@
value oor:separator=;
Calc, Auditing, hidden ;
Calc, Cell, hidden ;
+Calc, EditCell, hidden ;
Calc, default, hidden ;
Calc, Pivot,hidden ;
/value
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: 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 a...@apache.org
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::vectorTabBar::DeckMenuData rDeckSelectionData,
-const ::std::vectorTabBar::DeckMenuData rDeckShowData) const
+const ::std::vectorTabBar::DeckMenuData rMenuData) const
{
-::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rDeckSelectionData,
rDeckShowData);
+::boost::shared_ptrPopupMenu 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_ptrPopupMenu SidebarController::CreatePopupMenu (
-const ::std::vectorTabBar::DeckMenuData rDeckSelectionData,
-const ::std::vectorTabBar::DeckMenuData rDeckShowData) const
+const ::std::vectorTabBar::DeckMenuData rMenuData) const
{
+// Create the top level popup menu.
::boost::shared_ptrPopupMenu pMenu (new PopupMenu());
FloatingWindow* pMenuWindow =
dynamic_castFloatingWindow*(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::vectorTabBar::DeckMenuData::const_iterator
+iItem(rMenuData.begin()),
+iEnd(rMenuData.end());
+iItem!=iEnd;
+++iItem,++nIndex)
{
-sal_Int32 nIndex (MID_FIRST_PANEL);
-for(::std::vectorTabBar::DeckMenuData::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-mbIsEnablediItem-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-get0(), MIB_RADIOCHECK);
-pMenu-CheckItem(nIndex, iItem-get2());
-++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
[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 a...@apache.org
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/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 a...@apache.org
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
Referenceframe::XFrame 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++]);
rPanelDescriptor.msTitle =
::comphelper::getString
[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 a...@apache.org
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: 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 a...@apache.org
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 @@
menu:menuseparator/
menu:menuitem menu:id=.uno:ViewDataSourceBrowser/
menu:menuitem menu:id=.uno:Navigator/
- menu:menuitem menu:id=.uno:TaskPane/
menu:menuitem menu:id=.uno:Sidebar/
menu:menuseparator/
menu:menuitem menu:id=.uno:FullScreen/
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 @@
/menu:menupopup
/menu:menu
menu:menuseparator/
- menu:menuitem menu:id=.uno:TaskPane/
menu:menuitem menu:id=.uno:Sidebar/
menu:menuitem menu:id=.uno:LeftPaneImpress/
menu:menuitem menu:id=.uno:AvailableToolbars/
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 @@
menu:menuseparator/
menu:menuitem menu:id=.uno:ViewDataSourceBrowser/
menu:menuitem menu:id=.uno:Navigator/
- menu:menuitem menu:id=.uno:TaskPane/
menu:menuitem menu:id=.uno:Sidebar/
menu:menuseparator/
menu:menuitem menu:id=.uno:FullScreen/
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 @@
menu:menuseparator/
menu:menuitem menu:id
[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 a...@apache.org
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::vectorDeckMenuData 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 boost/scoped_ptr.hpp
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -94,7 +95,7 @@ public:
private:
cssu::Referencecss::frame::XFrame mxFrame;
-::boost::scoped_ptrButton mpMenuButton;
+::boost::scoped_ptrCheckBox 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: sd/source
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0314533d3ba5a2601bc18037c4a1fbc6a54910d3
Author: Andre Fischer a...@apache.org
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: 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 a...@apache.org
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 a...@apache.org
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::vectorDeckMenuData 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 boost/scoped_ptr.hpp
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -94,7 +95,7 @@ public:
private:
cssu::Referencecss::frame::XFrame mxFrame;
-::boost::scoped_ptrButton mpMenuButton;
+::boost::scoped_ptrCheckBox mpMenuButton;
class Item
[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 a...@apache.org
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 style:style style:name=\dp,$slideNum,\
style:family=\drawing-page\\n;
print $OUTstyle:drawing-page-properties
presentation:transition-type=\automatic\
presentation:duration=\PT00H00M01S\ presentation:background-visible=\true\
presentation:background-objects-visible=\true\ draw:fill=\solid\
draw:fill-color=\#ff,$slideNum % 2 ? ff99 : cc99,\
smil:type=\,$transitionType,\ smil:subtype=\,$transitionSubType,\
,$direction == 0 ? : smil:direction=\reverse\ ,$mode == 0 ? :
smil:mode=\out\,/\n;
print $OUT /style:style\n;
@@ -214,6 +218,8 @@ sub writeSlide
my $transitionType = pop @_;
my $slideNum = pop @_;
+return if $slideNum$FirstTransitionIndex || ($LastTransitionIndex=0
$slideNum$LastTransitionIndex);
+
print $OUTdraw:page draw:name=\page,$slideNum,\
draw:style-name=\dp,$slideNum,\ draw:master-page-name=\Default\
presentation:presentation-page-layout-name=\AL1T19\;
print $OUT draw:frame presentation:style-name=\pr1\
draw:layer=\layout\ svg:width=\25.199cm\ svg:height=\3.256cm\
svg:x=\1.4cm\ svg:y=\0.962cm\ presentation:class=\title\\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: animations/source
animations/source/animcore/targetpropertiescreator.cxx | 23 ++---
1 file changed, 14 insertions(+), 9 deletions(-)
New commits:
commit edba4119fffb83d7a001f5a2845d20ce3d6c6a1e
Author: Andre Fischer a...@apache.org
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: 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 a...@apache.org
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 comphelper/mediadescriptor.hxx
#include sfx2/docfile.hxx
+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: 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 a...@apache.org
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::functionvoid(const Panel) 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 (nPanelIndex0 || nPanelIndex=static_castsal_Int32(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 (nPanelIndex0 || nPanelIndex=static_castsal_Int32(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 FocusManager::MoveFocusInsidePanel (
+bool FocusManager
[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 a...@apache.org
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::functionvoid(const Panel) 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 (nPanelIndex0 || nPanelIndex=static_castsal_Int32(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 (nPanelIndex0 || nPanelIndex=static_castsal_Int32(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())
-FocusPanel(0);
+FocusPanel(0, true
[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 a...@apache.org
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::functionvoid(const Panel) 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 (nPanelIndex0 || nPanelIndex=static_castsal_Int32(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 (nPanelIndex0 || nPanelIndex=static_castsal_Int32(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
