[Libreoffice-commits] core.git: 2 commits - cui/source offapi/com officecfg/registry sfx2/source sw/inc sw/source
Ariel Constenla-Haile
arielch at apache.org
Sat May 18 06:26:36 PDT 2013
cui/source/customize/acccfg.cxx | 3 ++-
cui/source/customize/acccfg.src | 2 +-
offapi/com/sun/star/text/ViewSettings.idl | 7 +++++++
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 9 +++++----
sfx2/source/appl/newhelp.cxx | 2 +-
sw/inc/viewopt.hxx | 10 +++++-----
sw/source/ui/config/usrpref.cxx | 6 +++---
sw/source/ui/docvw/edtwin2.cxx | 2 +-
sw/source/ui/uno/unomod.cxx | 8 ++++----
9 files changed, 29 insertions(+), 20 deletions(-)
New commits:
commit 852bf3ad922ab8e5dfd8da2f5861b8b30d6c5782
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Wed Aug 15 08:31:46 2012 +0000
Resolves: #i120571# Enhancements in "Save/Load Keyboard Config" dialog
(cherry picked from commit fe75dbb733e6b25da8233d4a1dc12a8288e1b608)
Conflicts:
cui/source/customize/acccfg.cxx
Change-Id: I967ed2b4b7b3c9dfeebf07af544216afc8bead8d
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a5770f1..77ec9c3 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1387,7 +1387,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle )
{
bool bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS );
- short nDialogType = bSave ? css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE
+ short nDialogType = bSave ? css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION
: css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
if ( m_pFileDlg )
delete m_pFileDlg;
@@ -1396,6 +1396,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
m_pFileDlg->SetTitle( rTitle );
m_pFileDlg->AddFilter( aFilterAllStr, OUString(FILEDIALOG_FILTER_ALL) );
m_pFileDlg->AddFilter( aFilterCfgStr, OUString("*.cfg") );
+ m_pFileDlg->SetCurrentFilter( aFilterCfgStr );
Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
: LINK( this, SfxAcceleratorConfigPage, LoadHdl );
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index f88c33d..81abe9d 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -193,7 +193,7 @@ TabPage RID_SVXPAGE_KEYBOARD
};
String STR_FILTERNAME_CFG
{
- Text [ en-US ] = "Configuration" ;
+ Text [ en-US ] = "Configuration (*.cfg)" ;
};
};
commit 74970948bbd410278964bd02cb5741c6c87eb30d
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu Jul 19 22:32:34 2012 +0000
Resolves: #i120300# Add new property "ShowContentTips"...
in com.sun.star.text.ViewSettings
(cherry picked from commit 8c5cd0cbad918949f898d7fccb4f1a00a8a9f5f5)
Conflicts:
offapi/com/sun/star/text/ViewSettings.idl
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
sfx2/source/appl/newhelp.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/uno/unomod.cxx
Change-Id: Ia03bea5c7a81efbf1f3f40e8299168887140fe40
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index 5fcb790..702f73e 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -247,6 +247,13 @@ published service ViewSettings
@since OOo 3.1
*/
[optional, property] long VerticalRulerMetric;
+ //-------------------------------------------------------------------------
+ /** If this property is <TRUE/>, tips for document content are shown,
+ typically in a help balloon when the mouse is over the content.
+
+ @since LibreOffice 4.1
+ */
+ [optional, property] boolean ShowContentTips;
};
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 161d1d9..5a1d564 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1046,13 +1046,14 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="PreventTips" oor:type="xs:boolean" oor:nillable="false">
+ <prop oor:name="ShowContentTips" oor:type="xs:boolean">
+ <!-- OldPath: Writer/Content/Display/PreventTips -->
<!-- UIHints: Not accessible via user interface -->
<info>
- <desc>Enables the writer to prevent the display of help tips programmatically.</desc>
- <label>Prevent help tips</label>
+ <desc>Enables the writer to prevent the display of tips for document content programmatically.</desc>
+ <label>Show document content tips</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="NonprintingCharacter">
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 55ef86a..cf1ba04 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -3114,7 +3114,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL ,
Reference < XPropertySet > xViewProps = xSettings->getViewSettings();
Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo();
Any aBoolAny = makeAny( sal_Bool( sal_True ) );
- xViewProps->setPropertyValue( "PreventHelpTips", aBoolAny );
+ xViewProps->setPropertyValue( "ShowContentTips", makeAny( sal_Bool( sal_False ) ) );
xViewProps->setPropertyValue( "ShowGraphics", aBoolAny );
xViewProps->setPropertyValue( "ShowTables", aBoolAny );
xViewProps->setPropertyValue( "HelpURL", makeAny( OUString("HID:SFX2_HID_HELP_ONHELP") ) );
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index a306bcf..f13e6c5 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -83,7 +83,7 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_2_MODIFIED 0x00010000L
#define VIEWOPT_2_KEEPASPECTRATIO 0x00020000L
#define VIEWOPT_2_GRFKEEPZOOM 0x00040000L
-#define VIEWOPT_2_PREVENT_TIPS 0x00100000L
+#define VIEWOPT_2_CONTENT_TIPS 0x00100000L
#define VIEWOPT_2_RESERVED3 0x00200000L
#define VIEWOPT_2_RESERVED4 0x00400000L
#define VIEWOPT_2_PRTFORMAT 0x00800000L
@@ -464,8 +464,8 @@ public:
{ return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False; }
sal_Bool IsGrfKeepZoom() const
{ return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False; }
- sal_Bool IsPreventTips() const
- { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? sal_True : sal_False; }
+ sal_Bool IsShowContentTips() const
+ { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? sal_True : sal_False; }
sal_Bool IsPrtFormat() const
{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; }
@@ -481,8 +481,8 @@ public:
{ b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); }
void SetGrfKeepZoom (sal_Bool b)
{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); }
- void SetPreventTips( sal_Bool b)
- { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); }
+ void SetShowContentTips( sal_Bool b)
+ { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); }
void SetPrtFormat( sal_Bool b)
{ b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 286ca22..2a58f61c 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -83,7 +83,7 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames()
"Display/DrawingControl", // 2
"Display/FieldCode", // 3
"Display/Note", // 4
- "Display/PreventTips", // 5
+ "Display/ShowContentTips", // 5
"NonprintingCharacter/MetaCharacters", // 6
"NonprintingCharacter/ParagraphEnd", // 7
"NonprintingCharacter/OptionalHyphen", // 8
@@ -145,7 +145,7 @@ void SwContentViewConfig::Commit()
case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl",
case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode",
case 4: bVal = rParent.IsPostIts(); break;// "Display/Note",
- case 5: bVal = rParent.IsPreventTips(); break; // "Display/PreventTips"
+ case 5: bVal = rParent.IsShowContentTips(); break; // "Display/ShowContentTips"
case 6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
case 7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd",
case 8: bVal = rParent.IsSoftHyph(); break;// "NonprintingCharacter/OptionalHyphen",
@@ -186,7 +186,7 @@ void SwContentViewConfig::Load()
case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl",
case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode",
case 4: rParent.SetPostIts(bSet); break;// "Display/Note",
- case 5: rParent.SetPreventTips(bSet); break;// "Display/PreventTips",
+ case 5: rParent.SetShowContentTips(bSet); break;// "Display/ShowContentTips",
case 6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
case 7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
case 8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 2b02886..eb97eed 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -98,7 +98,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
{
SwWrtShell &rSh = m_rView.GetWrtShell();
bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
- if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips())
+ if(bQuickBalloon && !rSh.GetViewOptions()->IsShowContentTips())
return;
bool bWeiter = true;
SET_CURR_SHELL(&rSh);
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index d194ccf..54423f6 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -77,7 +77,7 @@ enum SwViewSettingsPropertyHandles
HANDLE_VIEWSET_SMOOTH_SCROLLING,
HANDLE_VIEWSET_ZOOM_TYPE,
HANDLE_VIEWSET_ZOOM,
- HANDLE_VIEWSET_PREVENT_TIPS,
+ HANDLE_VIEWSET_SHOW_CONTENT_TIPS,
HANDLE_VIEWSET_HELP_URL,
HANDLE_VIEWSET_VRULER_RIGHT,
HANDLE_VIEWSET_SHOW_RULER,
@@ -122,7 +122,7 @@ static ChainablePropertySetInfo * lcl_createViewSettingsInfo()
{ RTL_CONSTASCII_STRINGPARAM ( "IsRasterVisible"), HANDLE_VIEWSET_IS_RASTER_VISIBLE, CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "IsSnapToRaster"), HANDLE_VIEWSET_IS_SNAP_TO_RASTER, CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PreventHelpTips" ), HANDLE_VIEWSET_PREVENT_TIPS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowContentTips" ), HANDLE_VIEWSET_SHOW_CONTENT_TIPS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionX"), HANDLE_VIEWSET_RASTER_RESOLUTION_X, CPPUTYPE_INT32, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionY"), HANDLE_VIEWSET_RASTER_RESOLUTION_Y, CPPUTYPE_INT32, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionX"), HANDLE_VIEWSET_RASTER_SUBDIVISION_X, CPPUTYPE_INT32, PROPERTY_NONE, 0},
@@ -638,7 +638,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, sal_True); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break;
- case HANDLE_VIEWSET_PREVENT_TIPS : mpViewOption->SetPreventTips(bVal); break;
+ case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : mpViewOption->SetShowContentTips(bVal); break;
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : mpViewOption->SetGridVisible(bVal); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : mpViewOption->SetSnap(bVal); break;
case HANDLE_VIEWSET_RASTER_RESOLUTION_X :
@@ -865,7 +865,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = SwViewOption::IsTableBoundaries(); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = SwViewOption::IsDocBoundaries(); break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break;
- case HANDLE_VIEWSET_PREVENT_TIPS : bBoolVal = mpConstViewOption->IsPreventTips(); break;
+ case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : bBoolVal = mpConstViewOption->IsShowContentTips(); break;
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : bBoolVal = mpConstViewOption->IsGridVisible(); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : bBoolVal = mpConstViewOption->IsSnap(); break;
case HANDLE_VIEWSET_RASTER_RESOLUTION_X :
More information about the Libreoffice-commits
mailing list