From 50c6c0aaebeda0f131e35da61729479180184192 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]"
Date: Fri, 4 Jun 2010 13:46:22 +0200
Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString,
fill in dummies for all explicit help ids
---
fpicker/source/office/OfficeControlAccess.cxx | 17 +++---
fpicker/source/office/iodlg.cxx | 74 ++++++++++++++++++---------
2 files changed, 57 insertions(+), 34 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index e0b5d259302d..c51a326477fa 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -206,14 +206,13 @@ namespace svt
String sHelpURL( _rURL );
if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) )
{
- String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 );
- sal_Int32 nHelpId = sID.ToInt32();
-
+ // FIXME: HELPID
+ rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
if ( _bFileView )
// the file view "overloaded" the SetHelpId
- static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId );
+ static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
else
- _pControl->SetHelpId( nHelpId );
+ _pControl->SetHelpId( sID );
}
else
{
@@ -224,13 +223,13 @@ namespace svt
//---------------------------------------------------------------------
::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
{
- sal_Int32 nHelpId = _pControl->GetHelpId();
+ // FIXME: HELPID
+ rtl::OString aHelpId = _pControl->GetHelpId();
if ( _bFileView )
// the file view "overloaded" the SetHelpId
- nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
+ aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
- ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
- sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId );
+ rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
return sHelpURL;
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c7a18050c3ff..87df9e404b6a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -600,7 +600,8 @@ void SvtFileDialog::Init_Impl
bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode );
pURLBox->SetNoURLSelection( bSaveMode );
- _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX );
+ // FIXME: HELPID
+ _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ );
_pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) );
_pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) );
@@ -649,7 +650,8 @@ void SvtFileDialog::Init_Impl
_pFileView->SetUrlFilter( &m_aURLFilter );
_pFileView->EnableAutoResize();
- _pFileView->SetHelpId( HID_FILEDLG_STANDARD );
+ // FIXME: HELPID
+ _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ );
_pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP );
// Positionen und Groessen der Knoepfe bestimmen.
@@ -701,7 +703,8 @@ void SvtFileDialog::Init_Impl
if ( nStyle & SFXWB_READONLY )
{
_pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) );
- _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY );
+ // FIXME: HELPID
+ _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ );
_pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) );
AddControl( _pCbReadOnly );
ReleaseOwnerShip( _pCbReadOnly );
@@ -810,15 +813,23 @@ void SvtFileDialog::Init_Impl
{
// different help ids if in save-as mode
// 90744 - 09.08.2001 - frank.schoenheit@sun.com
- SetHelpId( HID_FILESAVE_DIALOG );
-
- _pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL );
- _pImp->_pBtnFileOpen->SetHelpId( HID_FILESAVE_DOSAVE );
- _pImp->_pBtnNewFolder->SetHelpId( HID_FILESAVE_CREATEDIRECTORY );
- _pImp->_pBtnStandard->SetHelpId( HID_FILESAVE_DEFAULTDIRECTORY );
- _pImp->_pBtnUp->SetHelpId( HID_FILESAVE_LEVELUP );
- _pImp->GetFilterListControl()->SetHelpId( HID_FILESAVE_FILETYPE );
- _pFileView->SetHelpId( HID_FILESAVE_FILEVIEW );
+ // FIXME: HELPID
+ SetHelpId( ""/*HID_FILESAVE_DIALOG*/ );
+
+ // FIXME: HELPID
+ _pImp->_pEdFileName->SetHelpId( ""/*HID_FILESAVE_FILEURL*/ );
+ // FIXME: HELPID
+ _pImp->_pBtnFileOpen->SetHelpId( ""/*HID_FILESAVE_DOSAVE*/ );
+ // FIXME: HELPID
+ _pImp->_pBtnNewFolder->SetHelpId( ""/*HID_FILESAVE_CREATEDIRECTORY*/ );
+ // FIXME: HELPID
+ _pImp->_pBtnStandard->SetHelpId( ""/*HID_FILESAVE_DEFAULTDIRECTORY*/ );
+ // FIXME: HELPID
+ _pImp->_pBtnUp->SetHelpId( ""/*HID_FILESAVE_LEVELUP*/ );
+ // FIXME: HELPID
+ _pImp->GetFilterListControl()->SetHelpId( ""/*HID_FILESAVE_FILETYPE*/ );
+ // FIXME: HELPID
+ _pFileView->SetHelpId( ""/*HID_FILESAVE_FILEVIEW*/ );
// formerly, there was only _pLbFileVersion, which was used for 3 different
// use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates)
@@ -827,16 +838,23 @@ void SvtFileDialog::Init_Impl
// tests I made lead to a dialog where _no_ of the three list boxes was present.
// 96930 - 15.08.2002 - fs@openoffice.org
if ( _pImp->_pLbFileVersion )
- _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE );
+ // FIXME: HELPID
+ _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ );
if ( _pImp->_pLbTemplates )
- _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE );
+ // FIXME: HELPID
+ _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ );
if ( _pImp->_pLbImageTemplates )
- _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE );
+ // FIXME: HELPID
+ _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ );
- if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( HID_FILESAVE_SAVEWITHPASSWORD );
- if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( HID_FILESAVE_AUTOEXTENSION );
- if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( HID_FILESAVE_CUSTOMIZEFILTER );
- if ( _pCbSelection ) _pCbSelection->SetHelpId( HID_FILESAVE_SELECTION );
+ // FIXME: HELPID
+ if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( ""/*HID_FILESAVE_SAVEWITHPASSWORD*/ );
+ // FIXME: HELPID
+ if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( ""/*HID_FILESAVE_AUTOEXTENSION*/ );
+ // FIXME: HELPID
+ if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( ""/*HID_FILESAVE_CUSTOMIZEFILTER*/ );
+ // FIXME: HELPID
+ if ( _pCbSelection ) _pCbSelection->SetHelpId( ""/*HID_FILESAVE_SELECTION*/ );
}
// correct the z-order of the controls
@@ -2981,7 +2999,8 @@ void SvtFileDialog::AddControls_Impl( )
{
_pCbLinkBox = new CheckBox( this );
_pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) );
- _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB );
+ // FIXME: HELPID
+ _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ );
AddControl( _pCbLinkBox );
ReleaseOwnerShip( _pCbLinkBox );
_pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
@@ -2998,7 +3017,8 @@ void SvtFileDialog::AddControls_Impl( )
// "Vorschau"
_pCbPreviewBox = new CheckBox( this );
_pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) );
- _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB );
+ // FIXME: HELPID
+ _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ );
AddControl( _pCbPreviewBox );
ReleaseOwnerShip( _pCbPreviewBox );
_pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
@@ -3046,7 +3066,8 @@ void SvtFileDialog::AddControls_Impl( )
{
_pPbPlay = new PushButton( this );
_pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) );
- _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY );
+ // FIXME: HELPID
+ _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ );
AddControl( _pPbPlay );
ReleaseOwnerShip( _pPbPlay );
_pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) );
@@ -3058,7 +3079,8 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) );
_pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) );
- _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION );
+ // FIXME: HELPID
+ _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ );
}
else if ( _nExtraBits & SFX_EXTRA_TEMPLATES )
{
@@ -3066,7 +3088,8 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) );
_pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) );
- _pImp->_pLbTemplates->SetHelpId( HID_FILEOPEN_VERSION );
+ // FIXME: HELPID
+ _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ );
// This is strange. During the re-factoring during 96930, I discovered that this help id
// is set in the "Templates mode". This was hidden in the previous implementation.
// Shouldn't this be a more meaningfull help id.
@@ -3078,7 +3101,8 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) );
_pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) );
- _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE );
+ // FIXME: HELPID
+ _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ );
}
}
--
cgit
From f24b1da07ebfbc95e76af93fc9c7133f7d52daa5 Mon Sep 17 00:00:00 2001
From: Mathias Bauer
Date: Sat, 10 Jul 2010 18:21:24 +0200
Subject: CWS changehid: #i111874#: change code to support HelpIds as byte
strings
---
fpicker/source/office/OfficeControlAccess.cxx | 22 +++-----
fpicker/source/office/iodlg.cxx | 74 +++++++++------------------
fpicker/source/office/iodlg.hrc | 32 ++++++------
3 files changed, 49 insertions(+), 79 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index c51a326477fa..1e34b2eee840 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -205,32 +205,26 @@ namespace svt
{
String sHelpURL( _rURL );
if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) )
- {
- // FIXME: HELPID
- rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
- if ( _bFileView )
- // the file view "overloaded" the SetHelpId
- static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
- else
- _pControl->SetHelpId( sID );
- }
+ sHelpURL = sHelpURL.Copy( sizeof( "HID:" ) - 1 );
+
+ // URLs should always be UTF8 encoded and escaped
+ rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
+ if ( _bFileView )
+ // the file view "overloaded" the SetHelpId
+ static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
else
- {
- DBG_ERRORFILE( "OControlAccess::setHelpURL: unsupported help URL type!" );
- }
+ _pControl->SetHelpId( sID );
}
//---------------------------------------------------------------------
::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
{
- // FIXME: HELPID
rtl::OString aHelpId = _pControl->GetHelpId();
if ( _bFileView )
// the file view "overloaded" the SetHelpId
aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
-
return sHelpURL;
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 87df9e404b6a..c7a18050c3ff 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -600,8 +600,7 @@ void SvtFileDialog::Init_Impl
bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode );
pURLBox->SetNoURLSelection( bSaveMode );
- // FIXME: HELPID
- _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ );
+ _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX );
_pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) );
_pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) );
@@ -650,8 +649,7 @@ void SvtFileDialog::Init_Impl
_pFileView->SetUrlFilter( &m_aURLFilter );
_pFileView->EnableAutoResize();
- // FIXME: HELPID
- _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ );
+ _pFileView->SetHelpId( HID_FILEDLG_STANDARD );
_pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP );
// Positionen und Groessen der Knoepfe bestimmen.
@@ -703,8 +701,7 @@ void SvtFileDialog::Init_Impl
if ( nStyle & SFXWB_READONLY )
{
_pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) );
- // FIXME: HELPID
- _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ );
+ _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY );
_pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) );
AddControl( _pCbReadOnly );
ReleaseOwnerShip( _pCbReadOnly );
@@ -813,23 +810,15 @@ void SvtFileDialog::Init_Impl
{
// different help ids if in save-as mode
// 90744 - 09.08.2001 - frank.schoenheit@sun.com
- // FIXME: HELPID
- SetHelpId( ""/*HID_FILESAVE_DIALOG*/ );
-
- // FIXME: HELPID
- _pImp->_pEdFileName->SetHelpId( ""/*HID_FILESAVE_FILEURL*/ );
- // FIXME: HELPID
- _pImp->_pBtnFileOpen->SetHelpId( ""/*HID_FILESAVE_DOSAVE*/ );
- // FIXME: HELPID
- _pImp->_pBtnNewFolder->SetHelpId( ""/*HID_FILESAVE_CREATEDIRECTORY*/ );
- // FIXME: HELPID
- _pImp->_pBtnStandard->SetHelpId( ""/*HID_FILESAVE_DEFAULTDIRECTORY*/ );
- // FIXME: HELPID
- _pImp->_pBtnUp->SetHelpId( ""/*HID_FILESAVE_LEVELUP*/ );
- // FIXME: HELPID
- _pImp->GetFilterListControl()->SetHelpId( ""/*HID_FILESAVE_FILETYPE*/ );
- // FIXME: HELPID
- _pFileView->SetHelpId( ""/*HID_FILESAVE_FILEVIEW*/ );
+ SetHelpId( HID_FILESAVE_DIALOG );
+
+ _pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL );
+ _pImp->_pBtnFileOpen->SetHelpId( HID_FILESAVE_DOSAVE );
+ _pImp->_pBtnNewFolder->SetHelpId( HID_FILESAVE_CREATEDIRECTORY );
+ _pImp->_pBtnStandard->SetHelpId( HID_FILESAVE_DEFAULTDIRECTORY );
+ _pImp->_pBtnUp->SetHelpId( HID_FILESAVE_LEVELUP );
+ _pImp->GetFilterListControl()->SetHelpId( HID_FILESAVE_FILETYPE );
+ _pFileView->SetHelpId( HID_FILESAVE_FILEVIEW );
// formerly, there was only _pLbFileVersion, which was used for 3 different
// use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates)
@@ -838,23 +827,16 @@ void SvtFileDialog::Init_Impl
// tests I made lead to a dialog where _no_ of the three list boxes was present.
// 96930 - 15.08.2002 - fs@openoffice.org
if ( _pImp->_pLbFileVersion )
- // FIXME: HELPID
- _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ );
+ _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE );
if ( _pImp->_pLbTemplates )
- // FIXME: HELPID
- _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ );
+ _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE );
if ( _pImp->_pLbImageTemplates )
- // FIXME: HELPID
- _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ );
+ _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE );
- // FIXME: HELPID
- if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( ""/*HID_FILESAVE_SAVEWITHPASSWORD*/ );
- // FIXME: HELPID
- if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( ""/*HID_FILESAVE_AUTOEXTENSION*/ );
- // FIXME: HELPID
- if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( ""/*HID_FILESAVE_CUSTOMIZEFILTER*/ );
- // FIXME: HELPID
- if ( _pCbSelection ) _pCbSelection->SetHelpId( ""/*HID_FILESAVE_SELECTION*/ );
+ if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( HID_FILESAVE_SAVEWITHPASSWORD );
+ if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( HID_FILESAVE_AUTOEXTENSION );
+ if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( HID_FILESAVE_CUSTOMIZEFILTER );
+ if ( _pCbSelection ) _pCbSelection->SetHelpId( HID_FILESAVE_SELECTION );
}
// correct the z-order of the controls
@@ -2999,8 +2981,7 @@ void SvtFileDialog::AddControls_Impl( )
{
_pCbLinkBox = new CheckBox( this );
_pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) );
- // FIXME: HELPID
- _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ );
+ _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB );
AddControl( _pCbLinkBox );
ReleaseOwnerShip( _pCbLinkBox );
_pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
@@ -3017,8 +2998,7 @@ void SvtFileDialog::AddControls_Impl( )
// "Vorschau"
_pCbPreviewBox = new CheckBox( this );
_pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) );
- // FIXME: HELPID
- _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ );
+ _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB );
AddControl( _pCbPreviewBox );
ReleaseOwnerShip( _pCbPreviewBox );
_pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
@@ -3066,8 +3046,7 @@ void SvtFileDialog::AddControls_Impl( )
{
_pPbPlay = new PushButton( this );
_pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) );
- // FIXME: HELPID
- _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ );
+ _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY );
AddControl( _pPbPlay );
ReleaseOwnerShip( _pPbPlay );
_pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) );
@@ -3079,8 +3058,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) );
_pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) );
- // FIXME: HELPID
- _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ );
+ _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION );
}
else if ( _nExtraBits & SFX_EXTRA_TEMPLATES )
{
@@ -3088,8 +3066,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) );
_pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) );
- // FIXME: HELPID
- _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ );
+ _pImp->_pLbTemplates->SetHelpId( HID_FILEOPEN_VERSION );
// This is strange. During the re-factoring during 96930, I discovered that this help id
// is set in the "Templates mode". This was hidden in the previous implementation.
// Shouldn't this be a more meaningfull help id.
@@ -3101,8 +3078,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) );
_pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) );
- // FIXME: HELPID
- _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ );
+ _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE );
}
}
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 9f5997a4089c..e27ec2cbe3bc 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -86,22 +86,22 @@
#define SID_SFX_START 5000
#define SID_OPENURL (SID_SFX_START + 596)
-#define HID_FILEDLG_STANDARD (HID_SFX_START + 27)
-#define HID_FILEDLG_MANAGER (HID_SFX_START + 28)
-#define HID_FILEDLG_URL (HID_SFX_START + 29)
-#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31)
-#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32)
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227)
+#define HID_FILEDLG_STANDARD "FPICKER_HID_FILEDLG_STANDARD"
+#define HID_FILEDLG_MANAGER "FPICKER_HID_FILEDLG_MANAGER"
+#define HID_FILEDLG_URL "FPICKER_HID_FILEDLG_URL"
+#define HID_FILEDLG_USE_PASSWD "FPICKER_HID_FILEDLG_USE_PASSWD"
+#define HID_FILEDLG_READ_ONLY "FPICKER_HID_FILEDLG_READ_ONLY"
+
+#define HID_FILEDLG_AUTOCOMPLETEBOX "FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX"
+#define HID_FILEDLG_SAVE_BTN "FPICKER_HID_FILEDLG_SAVE_BTN"
+#define HID_FILEDLG_SAVE_FILENAME "FPICKER_HID_FILEDLG_SAVE_FILENAME"
+#define HID_FILEDLG_SAVE_FILETYPE "FPICKER_HID_FILEDLG_SAVE_FILETYPE"
+#define HID_FILEDLG_INSERT_BTN "FPICKER_HID_FILEDLG_INSERT_BTN"
+#define HID_FILEDLG_PATH_BTN "FPICKER_HID_FILEDLG_PATH_BTN"
+#define HID_FILEDLG_PATH_FILENAME "FPICKER_HID_FILEDLG_PATH_FILENAME"
+#define HID_FILEDLG_FOLDER_BTN "FPICKER_HID_FILEDLG_FOLDER_BTN"
+#define HID_FILEDLG_FOLDER_FILENAME "FPICKER_HID_FILEDLG_FOLDER_FILENAME"
+#define HID_FILEDLG_SRCHFOLDER_BTN "FPICKER_HID_FILEDLG_SRCHFOLDER_BTN"
#endif
--
cgit
From ab22ac073431af69a5c59cecbff92db6737bd3db Mon Sep 17 00:00:00 2001
From: Mathias Bauer
Date: Mon, 19 Jul 2010 17:20:31 +0200
Subject: CWS changehid: #i111784#: fix error in fpicker HelpURL
---
fpicker/source/office/OfficeControlAccess.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 1e34b2eee840..7d33030ed2a9 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -224,7 +224,8 @@ namespace svt
// the file view "overloaded" the SetHelpId
aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
- rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
+ ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
+ sHelpURL += rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 );
return sHelpURL;
}
--
cgit
From db369db99b2f897b1a304a4c010dfd1998e2fa40 Mon Sep 17 00:00:00 2001
From: Mathias Bauer
Date: Tue, 20 Jul 2010 14:50:49 +0200
Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove
unused SetDialogHelpId methods
---
fpicker/source/office/OfficeControlAccess.cxx | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 7d33030ed2a9..50e99f2b590b 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -33,9 +33,8 @@
#include
#include
#include
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_
#include
-#endif
+#include
#include
#include
@@ -201,14 +200,15 @@ namespace svt
}
//---------------------------------------------------------------------
- void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView )
+ void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView )
{
- String sHelpURL( _rURL );
- if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) )
- sHelpURL = sHelpURL.Copy( sizeof( "HID:" ) - 1 );
+ rtl::OUString sHelpID( sHelpURL );
+ INetURLObject aHID( sHelpURL );
+ if ( aHID.GetProtocol() == INET_PROT_HID )
+ sHelpID = aHID.GetURLPath();
// URLs should always be UTF8 encoded and escaped
- rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
if ( _bFileView )
// the file view "overloaded" the SetHelpId
static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
@@ -224,8 +224,12 @@ namespace svt
// the file view "overloaded" the SetHelpId
aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
- ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
- sHelpURL += rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 );
+ ::rtl::OUString sHelpURL;
+ ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
+ INetURLObject aHID( aTmp );
+ if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+ sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME );
+ sHelpURL += aTmp;
return sHelpURL;
}
--
cgit
From 594aabf05fc7b553acc137889bd7bb6f95bdd98d Mon Sep 17 00:00:00 2001
From: Caol?n McNamara
Date: Thu, 24 Jun 2010 20:59:17 +0100
Subject: cmcfixes76: #i112656# osl_setEnvironment/osl_clearEnvironment
---
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 39 ++---------------------
fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 3 +-
fpicker/source/unx/gnome/SalGtkPicker.cxx | 41 +++++++++++++++++++++++++
fpicker/source/unx/gnome/SalGtkPicker.hxx | 2 +-
4 files changed, 46 insertions(+), 39 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index c6b0acd6a33f..4766bb844a90 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -33,13 +33,13 @@
//------------------------------------------------------------------------
#include
#include
-#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -126,41 +126,8 @@ void SalGtkFilePicker::InitialMapping()
gtk_widget_set_size_request (m_pPreview, -1, -1);
}
-static void lcl_setGTKLanguage(const uno::Reference& xServiceMgr)
-{
- static bool bSet = false;
- if (bSet)
- return;
-
- OUString sUILocale;
- try
- {
- uno::Reference xConfigMgr =
- uno::Reference(xServiceMgr->createInstance(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
- UNO_QUERY_THROW );
-
- Sequence< Any > theArgs(1);
- theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
-
- uno::Reference< container::XNameAccess > xNameAccess =
- uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
- UNO_QUERY_THROW );
-
- if (xNameAccess.is())
- xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
- } catch (...) {}
-
- if (sUILocale.getLength())
- {
- sUILocale = rtl::OUString::createFromAscii("LANGUAGE=") + sUILocale.replace('-', '_');
- putenv(strdup(rtl::OUStringToOString(sUILocale, osl_getThreadTextEncoding()).getStr()));
- }
- bSet = true;
-}
-
SalGtkFilePicker::SalGtkFilePicker( const uno::Reference& xServiceMgr ) :
+ SalGtkPicker(xServiceMgr),
cppu::WeakComponentImplHelper10<
XFilterManager,
XFilterGroupManager,
@@ -184,8 +151,6 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference& xServiceMgr ) :
- m_xServiceMgr( xServiceMgr )
+ SalGtkPicker(xServiceMgr),
+ m_xServiceMgr(xServiceMgr)
{
CResourceProvider aResProvider;
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 1a685e0981e6..6fd19b2f7f79 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -202,6 +203,46 @@ gint RunDialog::run()
return nStatus;
}
+static void lcl_setGTKLanguage(const uno::Reference& xServiceMgr)
+{
+ static bool bSet = false;
+ if (bSet)
+ return;
+
+ OUString sUILocale;
+ try
+ {
+ uno::Reference xConfigMgr =
+ uno::Reference(xServiceMgr->createInstance(
+ OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+ UNO_QUERY_THROW );
+
+ Sequence< Any > theArgs(1);
+ theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
+
+ uno::Reference< container::XNameAccess > xNameAccess =
+ uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
+ OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
+ UNO_QUERY_THROW );
+
+ if (xNameAccess.is())
+ xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
+ } catch (...) {}
+
+ if (sUILocale.getLength())
+ {
+ sUILocale = sUILocale.replace('-', '_');
+ rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("LANGUAGE"));
+ osl_setEnvironment(envVar.pData, sUILocale.pData);
+ }
+ bSet = true;
+}
+
+SalGtkPicker::SalGtkPicker(const uno::Reference& xServiceMgr) : m_pDialog(0)
+{
+ lcl_setGTKLanguage(xServiceMgr);
+}
+
SalGtkPicker::~SalGtkPicker()
{
if (m_pDialog)
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx
index 6349d3ed4988..94e7a11de99a 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx
@@ -53,7 +53,7 @@
class SalGtkPicker
{
public:
- SalGtkPicker() : m_pDialog(0) {}
+ SalGtkPicker(const ::com::sun::star::uno::Reference& xServiceMgr);
virtual ~SalGtkPicker();
protected:
osl::Mutex m_rbHelperMtx;
--
cgit
From 9a7bec4a045fa95f849c729b0be3bc295aa6d0ff Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]"
Date: Tue, 13 Jul 2010 13:30:24 +0200
Subject: vcl113: #i112411# fix output format handling (thanks muthusuba!)
---
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index c6b0acd6a33f..8f9796b71719 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -935,6 +935,9 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
{
static const OUString aStarDot = OUString::createFromAscii( "*." );
+ ::rtl::OUString aNewFilter;
+ ::rtl::OUString aOldFilter = getCurrentFilter();
+ sal_Bool bChangeFilter = sal_True;
for ( FilterList::iterator aListIter = m_pFilterList->begin();
aListIter != m_pFilterList->end();
++aListIter
@@ -942,11 +945,17 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
{
if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 )
{
- setCurrentFilter( aListIter->getTitle() );
+ if( !aNewFilter.getLength() )
+ aNewFilter = aListIter->getTitle();
+
+ if( aOldFilter == aListIter->getTitle() )
+ bChangeFilter = sal_False;
+
bExtensionTypedIn = true;
- break;
}
}
+ if( bChangeFilter )
+ setCurrentFilter( aNewFilter );
}
}
--
cgit
From 8dfe965a32b7d99d5bd70489f5f45652114ca889 Mon Sep 17 00:00:00 2001
From: Daniel Rentz
Date: Tue, 13 Jul 2010 18:26:57 +0200
Subject: dr77: #i113097# make Sequence(sal_Int32) explicit
---
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index c6b0acd6a33f..266748f8d792 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -1471,7 +1471,7 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t
OSL_ASSERT( m_pDialog != NULL );
// TODO return m_pImpl->getSupportedImageFormats();
- return 0;
+ return uno::Sequence();
}
sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException )
--
cgit
From 9551bf5a1ee5c9275a26f8ec4021e0b7f5665176 Mon Sep 17 00:00:00 2001
From: sb
Date: Fri, 10 Sep 2010 13:10:07 +0200
Subject: sb129: #i113189# change UNO components to use passive registration
---
fpicker/prj/d.lst | 10 ++++---
fpicker/source/aqua/FPentry.cxx | 26 ------------------
fpicker/source/aqua/fps-aqua-ucd.txt | 13 ---------
fpicker/source/aqua/fps_aqua.component | 37 ++++++++++++++++++++++++++
fpicker/source/aqua/makefile.mk | 8 ++++++
fpicker/source/generic/fpicker.component | 37 ++++++++++++++++++++++++++
fpicker/source/generic/fpicker.cxx | 7 -----
fpicker/source/generic/makefile.mk | 8 ++++++
fpicker/source/office/fps_office.component | 37 ++++++++++++++++++++++++++
fpicker/source/office/fps_office.cxx | 7 -----
fpicker/source/office/makefile.mk | 8 ++++++
fpicker/source/unx/gnome/FPentry.cxx | 26 ------------------
fpicker/source/unx/gnome/fps-gnome-ucd.txt | 13 ---------
fpicker/source/unx/gnome/fps_gnome.component | 37 ++++++++++++++++++++++++++
fpicker/source/unx/gnome/makefile.mk | 8 ++++++
fpicker/source/unx/kde4/KDE4FPEntry.cxx | 21 ---------------
fpicker/source/unx/kde4/fps-kde4-ucd.txt | 6 -----
fpicker/source/unx/kde4/fps_kde4.component | 34 +++++++++++++++++++++++
fpicker/source/unx/kde4/makefile.mk | 8 ++++++
fpicker/source/win32/filepicker/FPentry.cxx | 25 -----------------
fpicker/source/win32/folderpicker/Fopentry.cxx | 25 -----------------
fpicker/util/exports.dxp | 1 -
fpicker/util/fop.component | 34 +++++++++++++++++++++++
fpicker/util/fps.component | 34 +++++++++++++++++++++++
fpicker/util/makefile.mk | 13 +++++++++
25 files changed, 310 insertions(+), 173 deletions(-)
delete mode 100644 fpicker/source/aqua/fps-aqua-ucd.txt
create mode 100644 fpicker/source/aqua/fps_aqua.component
create mode 100644 fpicker/source/generic/fpicker.component
create mode 100644 fpicker/source/office/fps_office.component
delete mode 100644 fpicker/source/unx/gnome/fps-gnome-ucd.txt
create mode 100644 fpicker/source/unx/gnome/fps_gnome.component
delete mode 100644 fpicker/source/unx/kde4/fps-kde4-ucd.txt
create mode 100644 fpicker/source/unx/kde4/fps_kde4.component
create mode 100644 fpicker/util/fop.component
create mode 100644 fpicker/util/fps.component
(limited to 'fpicker')
diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst
index 7c4e0bf6024a..4fff0467fc87 100644
--- a/fpicker/prj/d.lst
+++ b/fpicker/prj/d.lst
@@ -9,6 +9,10 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\unx\gnome\fps-gnome-ucd.txt %_DEST%\bin%_EXT%\fps-gnome-ucd.txt
-..\source\unx\kde4\fps-kde4-ucd.txt %_DEST%\bin%_EXT%\fps-kde4-ucd.txt
-..\source\aqua\fps-aqua-ucd.txt %_DEST%\bin%_EXT%\fps-aqua-ucd.txt
+..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component
+..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component
+..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component
+..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component
+..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component
+..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component
+..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index 127d1f5d60bb..5d5dc16c5d32 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -95,32 +95,6 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
- pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
diff --git a/fpicker/source/aqua/fps-aqua-ucd.txt b/fpicker/source/aqua/fps-aqua-ucd.txt
deleted file mode 100644
index d71e8f4a574f..000000000000
--- a/fpicker/source/aqua/fps-aqua-ucd.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalAquaFilePicker
-ComponentName=fps_aqua.uno.dylib
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.AquaFilePicker
-
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalAquaFolderPicker
-ComponentName=fps_aqua.uno.dylib
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.AquaFolderPicker
diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component
new file mode 100644
index 000000000000..a04443e37ffd
--- /dev/null
+++ b/fpicker/source/aqua/fps_aqua.component
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
index 10990e22d5e1..ff0473c8a71e 100644
--- a/fpicker/source/aqua/makefile.mk
+++ b/fpicker/source/aqua/makefile.mk
@@ -83,3 +83,11 @@ DEF1NAME=$(SHL1TARGET)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/fps_aqua.component
+
+$(MISC)/fps_aqua.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fps_aqua.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fps_aqua.component
diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component
new file mode 100644
index 000000000000..7d44d006d960
--- /dev/null
+++ b/fpicker/source/generic/fpicker.component
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 4589b3319163..7d6417099ae0 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -216,13 +216,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
- void * pServiceManager, void * pRegistryKey)
-{
- return cppu::component_writeInfoHelper (
- pServiceManager, pRegistryKey, g_entries);
-}
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
{
diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
index bfbfb65f3da6..0b2ad77baac6 100644
--- a/fpicker/source/generic/makefile.mk
+++ b/fpicker/source/generic/makefile.mk
@@ -60,3 +60,11 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/fpicker.component
+
+$(MISC)/fpicker.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fpicker.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fpicker.component
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component
new file mode 100644
index 000000000000..3e49f68a49db
--- /dev/null
+++ b/fpicker/source/office/fps_office.component
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 52659e1f76f5..3d06873338de 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -63,13 +63,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, void * pRegistryKey)
-{
- return cppu::component_writeInfoHelper (
- pServiceManager, pRegistryKey, g_entries);
-}
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
{
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
index adc3c30f9a3d..7481fd867ca7 100644
--- a/fpicker/source/office/makefile.mk
+++ b/fpicker/source/office/makefile.mk
@@ -86,3 +86,11 @@ RESLIB1SRSFILES=\
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/fps_office.component
+
+$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fps_office.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fps_office.component
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index 7561d1f4e95f..ccca3dabf72c 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -99,32 +99,6 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
- pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
diff --git a/fpicker/source/unx/gnome/fps-gnome-ucd.txt b/fpicker/source/unx/gnome/fps-gnome-ucd.txt
deleted file mode 100644
index 4a84215dc960..000000000000
--- a/fpicker/source/unx/gnome/fps-gnome-ucd.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalGtkFilePicker
-ComponentName=fps_gnome.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.GtkFilePicker
-
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalGtkFolderPicker
-ComponentName=fps_gnome.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.GtkFolderPicker
diff --git a/fpicker/source/unx/gnome/fps_gnome.component b/fpicker/source/unx/gnome/fps_gnome.component
new file mode 100644
index 000000000000..72bca42f8acf
--- /dev/null
+++ b/fpicker/source/unx/gnome/fps_gnome.component
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk
index 04c6e650ff6f..82b2413dd4af 100644
--- a/fpicker/source/unx/gnome/makefile.mk
+++ b/fpicker/source/unx/gnome/makefile.mk
@@ -96,3 +96,11 @@ DEF1NAME=$(SHL1TARGET)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/fps_gnome.component
+
+$(MISC)/fps_gnome.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fps_gnome.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fps_gnome.component
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index 3d74c1a09dca..174b1fc440a6 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -55,27 +55,6 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
- {
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
- }
-
void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/unx/kde4/fps-kde4-ucd.txt b/fpicker/source/unx/kde4/fps-kde4-ucd.txt
deleted file mode 100644
index 8ecc4e0a0a52..000000000000
--- a/fpicker/source/unx/kde4/fps-kde4-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.KDE4FilePicker
-ComponentName=fps_kde4.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.KDE4FilePicker
diff --git a/fpicker/source/unx/kde4/fps_kde4.component b/fpicker/source/unx/kde4/fps_kde4.component
new file mode 100644
index 000000000000..d627212b75e8
--- /dev/null
+++ b/fpicker/source/unx/kde4/fps_kde4.component
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk
index e245e6618465..7ccf6df6a0ce 100644
--- a/fpicker/source/unx/kde4/makefile.mk
+++ b/fpicker/source/unx/kde4/makefile.mk
@@ -80,3 +80,11 @@ DEF1VERSIONMAP=exports.map
$(MISC)$/KDE4FilePicker.moc.cxx : KDE4FilePicker.hxx
$(MOC4) $< -o $@
+
+ALLTAR : $(MISC)/fps_kde4.component
+
+$(MISC)/fps_kde4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fps_kde4.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fps_kde4.component
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index e93c3bec18ba..79a2cf3b2865 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -104,31 +104,6 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 717359ba511a..3c861cc67ce3 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -87,31 +87,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "InvalidRegistryException caught");
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
-}
-
//----------------------------------------------------------------------
// component_getFactory
// returns a factory to create XFilePicker-Services
diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp
index 028ac4175990..f0e1c69934bc 100644
--- a/fpicker/util/exports.dxp
+++ b/fpicker/util/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/fpicker/util/fop.component b/fpicker/util/fop.component
new file mode 100644
index 000000000000..a31c096dd42a
--- /dev/null
+++ b/fpicker/util/fop.component
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
diff --git a/fpicker/util/fps.component b/fpicker/util/fps.component
new file mode 100644
index 000000000000..cc18d211028c
--- /dev/null
+++ b/fpicker/util/fps.component
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index c249e4259e91..60bd3333cb71 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -100,3 +100,16 @@ DEF2EXPORTFILE= exports.dxp
.INCLUDE : target.mk
+ALLTAR : $(MISC)/fop.component $(MISC)/fps.component
+
+$(MISC)/fop.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fop.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fop.component
+
+$(MISC)/fps.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fps.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fps.component
--
cgit
From cac4b2315361bc5b7b95689e3c2bd1a596013cae Mon Sep 17 00:00:00 2001
From: Mathias Bauer
Date: Tue, 5 Oct 2010 16:38:28 +0200
Subject: CWS changehid: remove duplicated definitions of HIDs
---
fpicker/source/office/iodlg.hrc | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 60374f226edf..b87082b56cbd 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -28,9 +28,8 @@
#ifndef _SVTOOLS_IODLGIMPL_HRC
#define _SVTOOLS_IODLGIMPL_HRC
-#ifndef _SVTOOLS_HRC
#include "svtools/svtools.hrc"
-#endif
+#include "svtools/helpid.hrc"
// ModalDialog DLG_SVT_EXPLORERFILE
@@ -86,22 +85,5 @@
#define SID_SFX_START 5000
#define SID_OPENURL (SID_SFX_START + 596)
-#define HID_FILEDLG_STANDARD "FPICKER_HID_FILEDLG_STANDARD"
-#define HID_FILEDLG_MANAGER "FPICKER_HID_FILEDLG_MANAGER"
-#define HID_FILEDLG_URL "FPICKER_HID_FILEDLG_URL"
-#define HID_FILEDLG_USE_PASSWD "FPICKER_HID_FILEDLG_USE_PASSWD"
-#define HID_FILEDLG_READ_ONLY "FPICKER_HID_FILEDLG_READ_ONLY"
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX "FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX"
-#define HID_FILEDLG_SAVE_BTN "FPICKER_HID_FILEDLG_SAVE_BTN"
-#define HID_FILEDLG_SAVE_FILENAME "FPICKER_HID_FILEDLG_SAVE_FILENAME"
-#define HID_FILEDLG_SAVE_FILETYPE "FPICKER_HID_FILEDLG_SAVE_FILETYPE"
-#define HID_FILEDLG_INSERT_BTN "FPICKER_HID_FILEDLG_INSERT_BTN"
-#define HID_FILEDLG_PATH_BTN "FPICKER_HID_FILEDLG_PATH_BTN"
-#define HID_FILEDLG_PATH_FILENAME "FPICKER_HID_FILEDLG_PATH_FILENAME"
-#define HID_FILEDLG_FOLDER_BTN "FPICKER_HID_FILEDLG_FOLDER_BTN"
-#define HID_FILEDLG_FOLDER_FILENAME "FPICKER_HID_FILEDLG_FOLDER_FILENAME"
-#define HID_FILEDLG_SRCHFOLDER_BTN "FPICKER_HID_FILEDLG_SRCHFOLDER_BTN"
-
#endif
--
cgit
From a8bc280fabb91e1a7282e451feadec79c66d5790 Mon Sep 17 00:00:00 2001
From: Mathias Bauer
Date: Mon, 11 Oct 2010 17:56:12 +0200
Subject: CWS changehid: generate former auto hids into src files
---
fpicker/source/office/iodlg.src | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'fpicker')
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 0b3c27b68071..da2d1cd926b6 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -79,12 +79,14 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ImageButton BTN_EXPLORERFILE_NEWFOLDER
{
+ HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 59 , 6 ) ;
QuickHelpText [ en-US ] = "Create New Directory" ;
};
ImageButton BTN_EXPLORERFILE_LISTVIEW
{
+ HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 109 , 6 ) ;
ButtonImage = Image
@@ -99,6 +101,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ImageButton BTN_EXPLORERFILE_DETAILSVIEW
{
+ HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 109 , 6 ) ;
ButtonImage = Image
@@ -113,6 +116,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
MenuButton BTN_EXPLORERFILE_UP
{
+ HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 109 , 6 ) ;
QuickHelpText [ en-US ] = "Up One Level" ;
@@ -120,6 +124,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
MenuButton BTN_EXPLORERFILE_STANDARD
{
+ HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 59 , 6 ) ;
QuickHelpText [ en-US ] = "Default Directory" ;
@@ -139,6 +144,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
Edit ED_EXPLORERFILE_FILENAME
{
+ HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
Pos = MAP_APPFONT ( 59 , 117 ) ;
Size = MAP_APPFONT ( 159 , 12 ) ;
Border = TRUE ;
@@ -152,6 +158,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ListBox LB_EXPLORERFILE_SHARED_LISTBOX
{
+ HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX";
Pos = MAP_APPFONT ( 59 , 132 ) ;
Size = MAP_APPFONT ( 159 , 40 ) ;
DropDown = TRUE ;
@@ -166,6 +173,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ListBox LB_EXPLORERFILE_FILETYPE
{
+ HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE";
Pos = MAP_APPFONT ( 59 , 147 ) ;
Size = MAP_APPFONT ( 159 , 80 ) ;
DropDown = TRUE ;
@@ -175,26 +183,31 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
CheckBox CB_EXPLORERFILE_READONLY
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY";
Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = "~Read-only" ;
};
CheckBox CB_EXPLORERFILE_PASSWORD
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD";
Size = MAP_APPFONT ( 100, 10 ) ;
Text [ en-US ] = "Save with password" ;
};
CheckBox CB_AUTO_EXTENSION
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION";
Size = MAP_APPFONT ( 160 , 10 ) ;
Text [ en-US ] = "~Automatic file name extension" ;
};
CheckBox CB_OPTIONS
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS";
Size = MAP_APPFONT ( 120 , 10 ) ;
Text [ en-US ] = "Edit ~filter settings";
};
PushButton BTN_EXPLORERFILE_OPEN
{
+ HelpID = "fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN";
Pos = MAP_APPFONT ( 224 , 117 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
@@ -243,6 +256,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
// QueryFolderNameDialog ----------------------------------------------------------
ModalDialog DLG_SVT_QUERYFOLDERNAME
{
+ HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME";
Border = TRUE ;
Moveable = TRUE ;
OutputSize = TRUE ;
@@ -257,6 +271,7 @@ ModalDialog DLG_SVT_QUERYFOLDERNAME
};
Edit ED_SVT_QUERYFOLDERNAME_DLG_NAME
{
+ HelpID = "fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME";
Pos = MAP_APPFONT ( 12 , 27 ) ;
Size = MAP_APPFONT ( 138 , 12 ) ;
Border = TRUE ;
--
cgit
From 1885dddbdd2382f95aef15df15d4cd110f8d7854 Mon Sep 17 00:00:00 2001
From: sb
Date: Fri, 22 Oct 2010 10:37:46 +0200
Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
---
fpicker/prj/build.lst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 434f22660f33..52d99ec0759a 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,4 +1,4 @@
-fp fpicker : l10n rdbmaker svtools NULL
+fp fpicker : LIBXSLT:libxslt l10n rdbmaker svtools NULL
fp fpicker\inc nmake - all fp_inc NULL
fp fpicker\source\generic nmake - all fp_generic fp_inc NULL
fp fpicker\source\office nmake - all fp_office fp_inc NULL
--
cgit
From 5b0573b9fbfe126f982e68fa93989239fd0874d2 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]"
Date: Tue, 23 Nov 2010 18:41:04 +0100
Subject: vcl117: removed obsolete header
---
fpicker/source/office/OfficeFilePicker.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 21839554aefc..c203924f6e51 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -42,7 +42,7 @@
#endif
-#include
+#include
#include "commonpicker.hxx"
#include "pickercallbacks.hxx"
--
cgit
From f8431bc530cabfe39df3918b994269dded8d7f8c Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko
Date: Mon, 10 Jan 2011 11:42:17 +0100
Subject: removetooltypes: #i112600# adjust fpicker
---
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 2 +-
fpicker/source/win32/filepicker/getfilenamewrapper.cxx | 2 +-
fpicker/source/win32/filepicker/previewadapter.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 4b6ba5d39d49..dcecdb6a207c 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -332,7 +332,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize*
//-----------------------------------------------------------------------------------------
STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustomize* /*pCustomize*/,
DWORD nIDCtl ,
- sal_Bool bChecked )
+ BOOL bChecked )
{
/*
if (nIDCtl == css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION)
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index ece582089f6e..8da6f4014f15 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -74,7 +74,7 @@ namespace /* private */
~CurDirGuard()
{
- sal_Bool bDirSet = sal_False;
+ bool bDirSet = false;
if ( m_pBuffer )
{
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index d4e4d182316d..a145c2af563d 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -318,7 +318,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
// resize the filelistbox to the half of the
// available space
- sal_Bool bRet = SetWindowPos(flb_new,
+ bool bRet = SetWindowPos(flb_new,
NULL, 0, 0, cx, height,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
--
cgit
From 66356194e2a9b45df904e6452b954b9e15a121c3 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko
Date: Tue, 11 Jan 2011 16:23:55 +0100
Subject: removetooltypes01: #i112600# do not affect FASTBOOL in this cws
---
fpicker/source/office/iodlg.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 131e0841cfb7..3749b6e7a85a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -3273,7 +3273,7 @@ sal_Bool SvtFileDialog::AddControl( Window* pControl, sal_Bool bNewLine )
Point aNewControlPos;
Size* pNewDlgSize = NULL;
sal_Bool bNewRow = bNewLine;
- int bFirstNewRow = sal_False;
+ sal_Bool bFirstNewRow = sal_False;
if ( nType == WINDOW_WINDOW )
{
--
cgit
From f6eccc2ea7f61ba4a98da966bea6475f54bd303b Mon Sep 17 00:00:00 2001
From: Carsten Driesner
Date: Thu, 13 Jan 2011 12:55:59 +0100
Subject: removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with
sal_uLong in fpicker
---
fpicker/source/office/iodlg.cxx | 4 ++--
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 6 +++---
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx | 4 ++--
fpicker/source/win32/filepicker/asyncrequests.cxx | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 3749b6e7a85a..3c015ca95b26 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1527,7 +1527,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
{
String aPath;
- sal_uIntPtr nCount = _pFileView->GetSelectionCount();
+ sal_uLong nCount = _pFileView->GetSelectionCount();
SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
if ( nCount && pEntry )
@@ -2524,7 +2524,7 @@ void SvtFileDialog::InitSize()
SvStringsDtor* SvtFileDialog::GetPathList() const
{
SvStringsDtor* pList = new SvStringsDtor;
- sal_uIntPtr nCount = _pFileView->GetSelectionCount();
+ sal_uLong nCount = _pFileView->GetSelectionCount();
SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
if ( ! pEntry )
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index dcecdb6a207c..c750cc3fa14b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -103,15 +103,15 @@ HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rII
}
//-----------------------------------------------------------------------------------------
-sal_uIntPtr STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()
+ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()
{
return osl_incrementInterlockedCount(&m_nRefCount);
}
//-----------------------------------------------------------------------------------------
-sal_uIntPtr STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
+ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
{
- sal_uIntPtr nReturn = --m_nRefCount;
+ sal_uLong nReturn = --m_nRefCount;
if ( m_nRefCount == 0 )
delete this;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index b058f3b5c077..4b9434d8c6c2 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -88,8 +88,8 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
//------------------------------------------------------------------------------------
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID rIID ,
void** ppObject);
- virtual sal_uIntPtr STDMETHODCALLTYPE AddRef();
- virtual sal_uIntPtr STDMETHODCALLTYPE Release();
+ virtual ULONG STDMETHODCALLTYPE AddRef();
+ virtual ULONG STDMETHODCALLTYPE Release();
//------------------------------------------------------------------------------------
// IFileDialogEvents
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index dee52c0ffe2c..eb0c9c6b4105 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -43,7 +43,7 @@ namespace css = ::com::sun::star;
void lcl_sleep(::osl::Condition& aCondition ,
::sal_Int32 nMilliSeconds)
{
- sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
+ sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
if (nMilliSeconds < 1)
aCondition.wait(0);
--
cgit
From 94eae11e9ee5956df320078b759ad86459df6694 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko
Date: Fri, 14 Jan 2011 11:20:36 +0100
Subject: removetooltypes01: #i112600# fix TRUE/FALSE autodoc tags
---
fpicker/source/office/OfficeControlAccess.hxx | 2 +-
fpicker/source/office/commonpicker.hxx | 2 +-
fpicker/source/office/iodlg.cxx | 4 ++--
fpicker/source/office/iodlg.hxx | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 739b9211a09f..35196907f900 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -92,7 +92,7 @@ namespace svt
@param _rValue
the value to set
@param _bIgnoreIllegalArgument
- if , an exception will be thrown if the given value is of improper type
+ if , an exception will be thrown if the given value is of improper type
*/
void implSetControlProperty(
sal_Int16 _nControlId,
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index fd6d952fbe2f..2531f5e7f4c5 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -188,7 +188,7 @@ namespace svt
/** handle a single argument from the XInitialization::initialize method
- @return if the argument could be handled
+ @return if the argument could be handled
*/
virtual sal_Bool implHandleInitializationArgument(
const ::rtl::OUString& _rName,
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 3c015ca95b26..355203dbe767 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -392,7 +392,7 @@ namespace
// -----------------------------------------------------------------------
/** retrieves the value of an environment variable
- @return if and only if the retrieved string value is not empty
+ @return if and only if the retrieved string value is not empty
*/
bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, ::rtl::OUString& _rValue )
{
@@ -900,7 +900,7 @@ sal_Bool SvtFileDialog::createNewUserFilter( const String& _rNewFilter, sal_Bool
// 05.12.2001 - 95486 - fs@openoffice.org
// now, the default extension is set to the one of the user filter (or empty)
- // if the former is not allowed (_bAllowUserDefExt = ), we have to use the ext of the current filter
+ // if the former is not allowed (_bAllowUserDefExt = ), we have to use the ext of the current filter
// (if possible)
sal_Bool bUseCurFilterExt = sal_True;
String sUserFilter = _pImp->_pUserFilter->GetType();
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 3cc06453f11f..746a6e1d207a 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -142,7 +142,7 @@ private:
@param _bMultiExt
allow for filters with more than one extension pattern
@param _rFilterChanged
- set to if the filter changed
+ set to if the filter changed
@return
the filter which has been found
*/
@@ -303,7 +303,7 @@ public:
only certain URLs can be browsed. This method checks whether a given URL belongs
to this set of permitted URLs.
- If no "access restriction" is effective, this method always returns .
+ If no "access restriction" is effective, this method always returns .
*/
inline bool isUrlAllowed( const String& _rURL ) const { return m_aURLFilter.isUrlAllowed( _rURL ); }
@@ -313,16 +313,16 @@ private:
/** updates _pUserFilter with a new filter
No checks for necessity are made.
@param _bAllowUserDefExt
- set to if a filter like "*.txt" should reset the DefaultExtension to doc.
+ set to if a filter like "*.txt" should reset the DefaultExtension to doc.
In a file-save-dialog this would have the following effect:
Say that auto-extension is checked, and the user enters *.txt, while a non-txt filter is selected.
- If _bAllowUserDefExt is set to , then a user input of "foo" would save a foo.txt, but in a format
+ If _bAllowUserDefExt is set to , then a user input of "foo" would save a foo.txt, but in a format
which is determined by the filter selected (which is no txt file as said above).
- If _bAllowUserDefExt is set to , the default extension will be the one of the selected filter, means
+ If _bAllowUserDefExt is set to , the default extension will be the one of the selected filter, means
in the above scenario a file "foo." will be saved where ext is the extension of the selected filter.
- @return if the new filter is "*.*"
+ @return if the new filter is "*.*"
*/
sal_Bool createNewUserFilter( const String& _rNewFilter, sal_Bool _bAllowUserDefExt );
--
cgit
From f308742dbe1238eb7ff020664af7515f12489217 Mon Sep 17 00:00:00 2001
From: "Malte Timmermann [mt]"
Date: Wed, 19 Jan 2011 12:52:07 +0100
Subject: accfixes: accessible name for preview bitmap
---
fpicker/source/office/iodlg.cxx | 1 +
fpicker/source/office/iodlg.hrc | 1 +
fpicker/source/office/iodlg.src | 4 ++++
3 files changed, 6 insertions(+)
(limited to 'fpicker')
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index b9d7fac3aa3b..0ab0f33db24f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -3015,6 +3015,7 @@ void SvtFileDialog::AddControls_Impl( )
_pPrevBmp = new FixedBitmap( this, WinBits( WB_BORDER ) );
_pPrevBmp->SetBackground( Wallpaper( Color( COL_WHITE ) ) );
_pPrevBmp->Show();
+ _pPrevBmp->SetAccessibleName(SvtResId(STR_PREVIEW));
}
if ( _nExtraBits & SFX_EXTRA_AUTOEXTENSION )
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index b87082b56cbd..42b235ee31af 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -70,6 +70,7 @@
#define STR_PATHSELECT 5
#define STR_BUTTONSELECT 6
#define STR_ACTUALVERSION 7
+#define STR_PREVIEW 8
// DLG_SVT_QUERYFOLDERNAME -----------------------
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index da2d1cd926b6..2a460797fe56 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -251,6 +251,10 @@ ModalDialog DLG_SVT_EXPLORERFILE
{
Text [ en-US ] = "Current version";
};
+ String STR_PREVIEW
+ {
+ Text [ en-US ] = "File Preview";
+ };
};
// QueryFolderNameDialog ----------------------------------------------------------
--
cgit
From 14017c25807282b7c039828b3fc75f173fc19b87 Mon Sep 17 00:00:00 2001
From: Carsten Driesner
Date: Thu, 20 Jan 2011 11:34:18 +0100
Subject: removetooltypes01: #i112600# Remove tools types for Mac specific
parts
---
fpicker/source/aqua/AquaFilePickerDelegate.hxx | 2 +-
fpicker/source/aqua/AquaFilePickerDelegate.mm | 2 +-
fpicker/source/aqua/NSURL_OOoAdditions.mm | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 9515cdb59aa9..e17defb2b712 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -45,7 +45,7 @@ class FilterHelper;
- (void)setFilterHelper:(FilterHelper*)filterHelper;
-- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
- (void)panelSelectionDidChange:(id)sender;
- (void)panel:(id)sender directoryDidChange:(NSString *)path;
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 4266453a7102..d5c906281475 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -56,7 +56,7 @@
#pragma mark NSSavePanel delegate methods
-- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
{
if( filterHelper == NULL )
return true;
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index ecc38b7e232b..6be80a765228 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -92,8 +92,8 @@ NSString* resolveAlias( NSString* i_pSystemPath )
FSRef rFS;
if( CFURLGetFSRef( rUrl, &rFS ) )
{
- MacOSBoolean bIsFolder = false;
- MacOSBoolean bAlias = false;
+ Boolean bIsFolder = false;
+ Boolean bAlias = false;
OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias);
if( (err == noErr) && bAlias )
{
--
cgit
From b55473cd10240c7ae3c8b4dbc34fbd44146f4a87 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko
Date: Mon, 24 Jan 2011 12:37:15 +0100
Subject: removetooltypes01: #i112600# adjust rebase for windows
---
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index c750cc3fa14b..2fadaa6bfdff 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -111,7 +111,7 @@ ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()
//-----------------------------------------------------------------------------------------
ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
{
- sal_uLong nReturn = --m_nRefCount;
+ ULONG nReturn = --m_nRefCount;
if ( m_nRefCount == 0 )
delete this;
--
cgit
From 4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann
Date: Tue, 22 Feb 2011 19:07:34 +0100
Subject: masterfix DEV300: #i10000# usage of L10N build_type
---
fpicker/prj/build.lst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'fpicker')
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 52d99ec0759a..1be09c5d8fd1 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,4 +1,4 @@
-fp fpicker : LIBXSLT:libxslt l10n rdbmaker svtools NULL
+fp fpicker : LIBXSLT:libxslt L10N:l10n rdbmaker svtools NULL
fp fpicker\inc nmake - all fp_inc NULL
fp fpicker\source\generic nmake - all fp_generic fp_inc NULL
fp fpicker\source\office nmake - all fp_office fp_inc NULL
--
cgit
From 9cd038e5b89c978ea24ba7efa7c3152801190455 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud
Date: Sat, 12 Mar 2011 18:57:32 -0600
Subject: fix mis-merge all-around.
---
fpicker/source/unx/gnome/SalGtkPicker.cxx | 40 -------------------------------
1 file changed, 40 deletions(-)
(limited to 'fpicker')
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 403e139485b4..94671521a6fc 100755
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -223,46 +223,6 @@ gint RunDialog::run()
return nStatus;
}
-static void lcl_setGTKLanguage(const uno::Reference& xServiceMgr)
-{
- static bool bSet = false;
- if (bSet)
- return;
-
- OUString sUILocale;
- try
- {
- uno::Reference xConfigMgr =
- uno::Reference(xServiceMgr->createInstance(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
- UNO_QUERY_THROW );
-
- Sequence< Any > theArgs(1);
- theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
-
- uno::Reference< container::XNameAccess > xNameAccess =
- uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
- UNO_QUERY_THROW );
-
- if (xNameAccess.is())
- xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
- } catch (...) {}
-
- if (sUILocale.getLength())
- {
- sUILocale = sUILocale.replace('-', '_');
- rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("LANGUAGE"));
- osl_setEnvironment(envVar.pData, sUILocale.pData);
- }
- bSet = true;
-}
-
-SalGtkPicker::SalGtkPicker(const uno::Reference& xServiceMgr) : m_pDialog(0)
-{
- lcl_setGTKLanguage(xServiceMgr);
-}
-
static void lcl_setGTKLanguage(const uno::Reference& xServiceMgr)
{
static bool bSet = false;
--
cgit