sw/inc/htmltbl.hxx | 154 ++++----
sw/source/core/doc/htmltbl.cxx | 484 +++++++++++++--------------
sw/source/core/text/inftxt.cxx | 196 +++++------
sw/source/core/text/inftxt.hxx | 250 +++++++-------
sw/source/ui/config/optpage.cxx | 602 +++++++++++++++++-----------------
sw/source/uibase/inc/optpage.hxx | 92 ++---
sw/source/uibase/inc/unomailmerge.hxx | 84 ++--
sw/source/uibase/uno/unomailmerge.cxx | 450 ++++++++++++-------------
8 files changed, 1156 insertions(+), 1156 deletions(-)
New commits:
commit ad8af6c83cd32af0e377a7e220ea5cd0fbea341e
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Nov 6 08:35:03 2015 +0100
sw: prefix members of SwXMailMerge
Change-Id: If8ad3b57bd2b5af83cbf44737db24e44af92d6b7
diff --git a/sw/source/uibase/inc/unomailmerge.hxx
b/sw/source/uibase/inc/unomailmerge.hxx
index 2620d25..6aa7e67 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -75,53 +75,53 @@ class SwXMailMerge :
{
friend class MailMergeExecuteFinalizer;
- cppu::OInterfaceContainerHelper aEvtListeners;
- cppu::OInterfaceContainerHelper aMergeListeners;
- OPropertyListenerContainerHelper aPropListeners;
+ cppu::OInterfaceContainerHelper m_aEvtListeners;
+ cppu::OInterfaceContainerHelper m_aMergeListeners;
+ OPropertyListenerContainerHelper m_aPropListeners;
- const SfxItemPropertySet* pPropSet;
+ const SfxItemPropertySet* m_pPropSet;
- SfxObjectShellRef xDocSh; // the document
+ SfxObjectShellRef m_xDocSh; // the document
- OUString aTmpFileName;
+ OUString m_aTmpFileName;
// properties of mail merge service
- com::sun::star::uno::Sequence< com::sun::star::uno::Any >
aSelection;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet >
xResultSet;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >
xConnection;
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel;
- OUString aDataSourceName;
- OUString aDataCommand;
- OUString aFilter;
- OUString aDocumentURL;
- OUString aOutputURL;
- OUString aFileNamePrefix;
- sal_Int32 nDataCommandType;
- sal_Int16 nOutputType;
- bool bEscapeProcessing;
- bool bSinglePrintJobs;
- bool bFileNameFromColumn;
-
- OUString sInServerPassword;
- OUString sOutServerPassword;
- OUString sSubject;
- OUString sAddressFromColumn;
- OUString sMailBody;
- OUString sAttachmentName;
- OUString sAttachmentFilter;
- com::sun::star::uno::Sequence< OUString > aCopiesTo;
- com::sun::star::uno::Sequence< OUString > aBlindCopiesTo;
- bool bSendAsHTML;
- bool bSendAsAttachment;
-
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aPrintSettings;
-
- bool bSaveAsSingleFile;
- OUString sSaveFilter;
- OUString sSaveFilterOptions;
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aSaveFilterData;
-
- bool bDisposing;
+ com::sun::star::uno::Sequence< com::sun::star::uno::Any >
m_aSelection;
+ com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet >
m_xResultSet;
+ com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >
m_xConnection;
+ com::sun::star::uno::Reference< com::sun::star::frame::XModel >
m_xModel;
+ OUString m_aDataSourceName;
+ OUString m_aDataCommand;
+ OUString m_aFilter;
+ OUString m_aDocumentURL;
+ OUString m_aOutputURL;
+ OUString m_aFileNamePrefix;
+ sal_Int32 m_nDataCommandType;
+ sal_Int16 m_nOutputType;
+ bool m_bEscapeProcessing;
+ bool m_bSinglePrintJobs;
+ bool m_bFileNameFromColumn;
+
+ OUString m_sInServerPassword;
+ OUString m_sOutServerPassword;
+ OUString m_sSubject;
+ OUString m_sAddressFromColumn;
+ OUString m_sMailBody;
+ OUString m_sAttachmentName;
+ OUString m_sAttachmentFilter;
+ com::sun::star::uno::Sequence< OUString > m_aCopiesTo;
+ com::sun::star::uno::Sequence< OUString > m_aBlindCopiesTo;
+ bool m_bSendAsHTML;
+ bool m_bSendAsAttachment;
+
+ com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
m_aPrintSettings;
+
+ bool m_bSaveAsSingleFile;
+ OUString m_sSaveFilter;
+ OUString m_sSaveFilterOptions;
+ com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
m_aSaveFilterData;
+
+ bool m_bDisposing;
SwDBManager *m_pMgr;
void launchEvent( const com::sun::star::beans::PropertyChangeEvent
&rEvt ) const;
diff --git a/sw/source/uibase/uno/unomailmerge.cxx
b/sw/source/uibase/uno/unomailmerge.cxx
index 3d8fc43..5655b9b 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -366,45 +366,45 @@ static bool DeleteTmpFile_Impl(
}
SwXMailMerge::SwXMailMerge() :
- aEvtListeners ( GetMailMergeMutex() ),
- aMergeListeners ( GetMailMergeMutex() ),
- aPropListeners ( GetMailMergeMutex() ),
- pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_MAILMERGE ) ),
- nDataCommandType(sdb::CommandType::TABLE),
- nOutputType(MailMergeType::PRINTER),
- bEscapeProcessing(true), //!! allow to process properties like
"Filter", "Order", ...
- bSinglePrintJobs(false),
- bFileNameFromColumn(false),
- bSendAsHTML(false),
- bSendAsAttachment(false),
- bSaveAsSingleFile(false),
- bDisposing(false),
+ m_aEvtListeners ( GetMailMergeMutex() ),
+ m_aMergeListeners ( GetMailMergeMutex() ),
+ m_aPropListeners ( GetMailMergeMutex() ),
+ m_pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_MAILMERGE ) ),
+ m_nDataCommandType(sdb::CommandType::TABLE),
+ m_nOutputType(MailMergeType::PRINTER),
+ m_bEscapeProcessing(true), //!! allow to process properties like
"Filter", "Order", ...
+ m_bSinglePrintJobs(false),
+ m_bFileNameFromColumn(false),
+ m_bSendAsHTML(false),
+ m_bSendAsAttachment(false),
+ m_bSaveAsSingleFile(false),
+ m_bDisposing(false),
m_pMgr(0)
{
// create empty document
// like in: SwModule::InsertEnv (appenv.cxx)
- xDocSh = new SwDocShell( SfxObjectCreateMode::STANDARD );
- xDocSh->DoInitNew();
- SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
+ m_xDocSh = new SwDocShell( SfxObjectCreateMode::STANDARD );
+ m_xDocSh->DoInitNew();
+ SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *m_xDocSh, 0 );
SwView *pView = static_cast<SwView*>( pFrame->GetViewShell() );
pView->AttrChangedNotify( &pView->GetWrtShell() ); //So that SelectShell
is called.
- xModel = xDocSh->GetModel();
+ m_xModel = m_xDocSh->GetModel();
}
SwXMailMerge::~SwXMailMerge()
{
- if (!aTmpFileName.isEmpty())
- DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName );
+ if (!m_aTmpFileName.isEmpty())
+ DeleteTmpFile_Impl( m_xModel, m_xDocSh, m_aTmpFileName );
else // there was no temporary file in use
{
//! we still need to close the model and doc shell manually
//! because there is no automatism that will do that later.
//! #120086#
- if ( eVetoed == CloseModelAndDocSh( xModel, xDocSh ) )
+ if ( eVetoed == CloseModelAndDocSh( m_xModel, m_xDocSh ) )
OSL_FAIL("ownership transferred to vetoing object!" );
- xModel = 0;
- xDocSh = 0; // destroy doc shell
+ m_xModel = 0;
+ m_xDocSh = 0; // destroy doc shell
}
}
@@ -438,23 +438,23 @@ uno::Any SAL_CALL SwXMailMerge::execute(
// (use values from the service as default and override them with
// the values that are provided as arguments)
- uno::Sequence< uno::Any > aCurSelection = aSelection;
- uno::Reference< sdbc::XResultSet > xCurResultSet = xResultSet;
- uno::Reference< sdbc::XConnection > xCurConnection = xConnection;
- uno::Reference< frame::XModel > xCurModel = xModel;
- OUString aCurDataSourceName = aDataSourceName;
- OUString aCurDataCommand = aDataCommand;
- OUString aCurFilter = aFilter;
- OUString aCurDocumentURL = aDocumentURL;
- OUString aCurOutputURL = aOutputURL;
- OUString aCurFileNamePrefix = aFileNamePrefix;
- sal_Int32 nCurDataCommandType = nDataCommandType;
- sal_Int16 nCurOutputType = nOutputType;
- bool bCurEscapeProcessing = bEscapeProcessing;
- bool bCurSinglePrintJobs = bSinglePrintJobs;
- bool bCurFileNameFromColumn = bFileNameFromColumn;
-
- SfxObjectShellRef xCurDocSh = xDocSh; // the document
+ uno::Sequence< uno::Any > aCurSelection = m_aSelection;
+ uno::Reference< sdbc::XResultSet > xCurResultSet = m_xResultSet;
+ uno::Reference< sdbc::XConnection > xCurConnection = m_xConnection;
+ uno::Reference< frame::XModel > xCurModel = m_xModel;
+ OUString aCurDataSourceName = m_aDataSourceName;
+ OUString aCurDataCommand = m_aDataCommand;
+ OUString aCurFilter = m_aFilter;
+ OUString aCurDocumentURL = m_aDocumentURL;
+ OUString aCurOutputURL = m_aOutputURL;
+ OUString aCurFileNamePrefix = m_aFileNamePrefix;
+ sal_Int32 nCurDataCommandType = m_nDataCommandType;
+ sal_Int16 nCurOutputType = m_nOutputType;
+ bool bCurEscapeProcessing = m_bEscapeProcessing;
+ bool bCurSinglePrintJobs = m_bSinglePrintJobs;
+ bool bCurFileNameFromColumn = m_bFileNameFromColumn;
+
+ SfxObjectShellRef xCurDocSh = m_xDocSh; // the document
const beans::NamedValue *pArguments = rArguments.getConstArray();
sal_Int32 nArgs = rArguments.getLength();
@@ -509,37 +509,37 @@ uno::Any SAL_CALL SwXMailMerge::execute(
else if (rName == UNO_NAME_FILE_NAME_FROM_COLUMN)
bOK = rValue >>= bCurFileNameFromColumn;
else if (rName == UNO_NAME_SUBJECT)
- bOK = rValue >>= sSubject;
+ bOK = rValue >>= m_sSubject;
else if (rName == UNO_NAME_ADDRESS_FROM_COLUMN)
- bOK = rValue >>= sAddressFromColumn;
+ bOK = rValue >>= m_sAddressFromColumn;
else if (rName == UNO_NAME_SEND_AS_HTML)
- bOK = rValue >>= bSendAsHTML;
+ bOK = rValue >>= m_bSendAsHTML;
else if (rName == UNO_NAME_MAIL_BODY)
- bOK = rValue >>= sMailBody;
+ bOK = rValue >>= m_sMailBody;
else if (rName == UNO_NAME_ATTACHMENT_NAME)
- bOK = rValue >>= sAttachmentName;
+ bOK = rValue >>= m_sAttachmentName;
else if (rName == UNO_NAME_ATTACHMENT_FILTER)
- bOK = rValue >>= sAttachmentFilter;
+ bOK = rValue >>= m_sAttachmentFilter;
else if (rName == UNO_NAME_COPIES_TO)
- bOK = rValue >>= aCopiesTo;
+ bOK = rValue >>= m_aCopiesTo;
else if (rName == UNO_NAME_BLIND_COPIES_TO)
- bOK = rValue >>= aBlindCopiesTo;
+ bOK = rValue >>= m_aBlindCopiesTo;
else if (rName == UNO_NAME_SEND_AS_ATTACHMENT)
- bOK = rValue >>= bSendAsAttachment;
+ bOK = rValue >>= m_bSendAsAttachment;
else if (rName == UNO_NAME_PRINT_OPTIONS)
- bOK = rValue >>= aPrintSettings;
+ bOK = rValue >>= m_aPrintSettings;
else if (rName == UNO_NAME_SAVE_AS_SINGLE_FILE)
- bOK = rValue >>= bSaveAsSingleFile;
+ bOK = rValue >>= m_bSaveAsSingleFile;
else if (rName == UNO_NAME_SAVE_FILTER)
- bOK = rValue >>= sSaveFilter;
+ bOK = rValue >>= m_sSaveFilter;
else if (rName == UNO_NAME_SAVE_FILTER_OPTIONS)
- bOK = rValue >>= sSaveFilterOptions;
+ bOK = rValue >>= m_sSaveFilterOptions;
else if (rName == UNO_NAME_SAVE_FILTER_DATA)
- bOK = rValue >>= aSaveFilterData;
+ bOK = rValue >>= m_aSaveFilterData;
else if (rName == UNO_NAME_IN_SERVER_PASSWORD)
- bOK = rValue >>= sInServerPassword;
+ bOK = rValue >>= m_sInServerPassword;
else if (rName == UNO_NAME_OUT_SERVER_PASSWORD)
- bOK = rValue >>= sOutServerPassword;
+ bOK = rValue >>= m_sOutServerPassword;
else
throw UnknownPropertyException( "Property is unknown: " + rName,
static_cast < cppu::OWeakObject * > ( this ) );
@@ -690,7 +690,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
// #i25686# printing should not be done asynchronously to prevent
dangling offices
// when mail merge is called as command line macro
aMergeDesc.bPrintAsync = false;
- aMergeDesc.aPrintOptions = aPrintSettings;
+ aMergeDesc.aPrintOptions = m_aPrintSettings;
aMergeDesc.bCreateSingleFile = false;
}
break;
@@ -740,24 +740,24 @@ uno::Any SAL_CALL SwXMailMerge::execute(
pMgr->SetSubject( aPath );
if(MailMergeType::FILE == nCurOutputType)
{
- aMergeDesc.sSaveToFilter = sSaveFilter;
- aMergeDesc.sSaveToFilterOptions = sSaveFilterOptions;
- aMergeDesc.aSaveToFilterData = aSaveFilterData;
- aMergeDesc.bCreateSingleFile = bSaveAsSingleFile;
+ aMergeDesc.sSaveToFilter = m_sSaveFilter;
+ aMergeDesc.sSaveToFilterOptions = m_sSaveFilterOptions;
+ aMergeDesc.aSaveToFilterData = m_aSaveFilterData;
+ aMergeDesc.bCreateSingleFile = m_bSaveAsSingleFile;
}
else
{
- pMgr->SetEMailColumn( sAddressFromColumn );
- if(sAddressFromColumn.isEmpty())
+ pMgr->SetEMailColumn( m_sAddressFromColumn );
+ if(m_sAddressFromColumn.isEmpty())
throw RuntimeException("Mail address column not set.",
static_cast < cppu::OWeakObject * > ( this ) );
- aMergeDesc.sSaveToFilter = sAttachmentFilter;
- aMergeDesc.sSubject = sSubject;
- aMergeDesc.sMailBody = sMailBody;
- aMergeDesc.sAttachmentName = sAttachmentName;
- aMergeDesc.aCopiesTo = aCopiesTo;
- aMergeDesc.aBlindCopiesTo = aBlindCopiesTo;
- aMergeDesc.bSendAsHTML = bSendAsHTML;
- aMergeDesc.bSendAsAttachment = bSendAsAttachment;
+ aMergeDesc.sSaveToFilter = m_sAttachmentFilter;
+ aMergeDesc.sSubject = m_sSubject;
+ aMergeDesc.sMailBody = m_sMailBody;
+ aMergeDesc.sAttachmentName = m_sAttachmentName;
+ aMergeDesc.aCopiesTo = m_aCopiesTo;
+ aMergeDesc.aBlindCopiesTo = m_aBlindCopiesTo;
+ aMergeDesc.bSendAsHTML = m_bSendAsHTML;
+ aMergeDesc.bSendAsAttachment = m_bSendAsAttachment;
aMergeDesc.bCreateSingleFile = false;
pMMConfigItem.reset(new SwMailMergeConfigItem);
@@ -765,7 +765,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
aMergeDesc.xSmtpServer =
SwMailMergeHelper::ConnectToSmtpServer(
*pMMConfigItem,
xInService,
- sInServerPassword, sOutServerPassword );
+ m_sInServerPassword, m_sOutServerPassword );
if( !aMergeDesc.xSmtpServer.is() ||
!aMergeDesc.xSmtpServer->isConnected())
throw RuntimeException("Failed to connect to mail
server.", static_cast < cppu::OWeakObject * > ( this ) );
}
@@ -779,7 +779,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
SwDocShell::Factory().GetFilterContainer() );
OUString
aExtension(comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(), '*'));
utl::TempFile aTempFile( "SwMM", true, &aExtension );
- aTmpFileName = aTempFile.GetURL();
+ m_aTmpFileName = aTempFile.GetURL();
Reference< XStorable > xStorable( xCurModel, UNO_QUERY );
bool bStoredAsTemporary = false;
@@ -787,7 +787,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
{
try
{
- xStorable->storeAsURL( aTmpFileName, Sequence< PropertyValue >() );
+ xStorable->storeAsURL( m_aTmpFileName, Sequence< PropertyValue >()
);
bStoredAsTemporary = true;
}
catch (const Exception&)
@@ -808,10 +808,10 @@ uno::Any SAL_CALL SwXMailMerge::execute(
pMgr->SetMailMergeEvtSrc( pOldSrc );
- if ( xCurModel.get() != xModel.get() )
+ if ( xCurModel.get() != m_xModel.get() )
{ // in case it was a temporary model -> close it, and delete the file
- DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName );
- aTmpFileName.clear();
+ DeleteTmpFile_Impl( xCurModel, xCurDocSh, m_aTmpFileName );
+ m_aTmpFileName.clear();
}
// (in case it wasn't a temporary model, it will be closed in the dtor, at
the latest)
@@ -843,7 +843,7 @@ void SAL_CALL SwXMailMerge::cancel() throw
(com::sun::star::uno::RuntimeExceptio
void SwXMailMerge::LaunchMailMergeEvent( const MailMergeEvent &rEvt ) const
{
- cppu::OInterfaceIteratorHelper aIt( const_cast<SwXMailMerge
*>(this)->aMergeListeners );
+ cppu::OInterfaceIteratorHelper aIt( const_cast<SwXMailMerge
*>(this)->m_aMergeListeners );
while (aIt.hasMoreElements())
{
Reference< XMailMergeListener > xRef( aIt.next(), UNO_QUERY );
@@ -855,7 +855,7 @@ void SwXMailMerge::LaunchMailMergeEvent( const
MailMergeEvent &rEvt ) const
void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const
{
cppu::OInterfaceContainerHelper *pContainer =
- aPropListeners.getContainer( rEvt.PropertyHandle );
+ m_aPropListeners.getContainer( rEvt.PropertyHandle );
if (pContainer)
{
cppu::OInterfaceIteratorHelper aIt( *pContainer );
@@ -872,7 +872,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
SwXMailMerge::getPropertySetI
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- static Reference< XPropertySetInfo > aRef = pPropSet->getPropertySetInfo();
+ static Reference< XPropertySetInfo > aRef =
m_pPropSet->getPropertySetInfo();
return aRef;
}
@@ -882,7 +882,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
{
SolarMutexGuard aGuard;
- const SfxItemPropertySimpleEntry* pCur =
pPropSet->getPropertyMap().getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur =
m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pCur)
throw UnknownPropertyException();
else if (pCur->nFlags & PropertyAttribute::READONLY)
@@ -892,37 +892,37 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
void *pData = NULL;
switch (pCur->nWID)
{
- case WID_SELECTION : pData = &aSelection; break;
- case WID_RESULT_SET : pData = &xResultSet; break;
- case WID_CONNECTION : pData = &xConnection; break;
- case WID_MODEL : pData = &xModel; break;
- case WID_DATA_SOURCE_NAME : pData = &aDataSourceName;
break;
- case WID_DATA_COMMAND : pData = &aDataCommand; break;
- case WID_FILTER : pData = &aFilter; break;
- case WID_DOCUMENT_URL : pData = &aDocumentURL; break;
- case WID_OUTPUT_URL : pData = &aOutputURL; break;
- case WID_DATA_COMMAND_TYPE : pData = &nDataCommandType;
break;
- case WID_OUTPUT_TYPE : pData = &nOutputType; break;
- case WID_ESCAPE_PROCESSING : pData = &bEscapeProcessing;
break;
- case WID_SINGLE_PRINT_JOBS : pData = &bSinglePrintJobs;
break;
- case WID_FILE_NAME_FROM_COLUMN : pData = &bFileNameFromColumn;
break;
- case WID_FILE_NAME_PREFIX : pData = &aFileNamePrefix;
break;
- case WID_MAIL_SUBJECT: pData = &sSubject; break;
- case WID_ADDRESS_FROM_COLUMN: pData = &sAddressFromColumn;
break;
- case WID_SEND_AS_HTML: pData = &bSendAsHTML; break;
- case WID_SEND_AS_ATTACHMENT: pData = &bSendAsAttachment;
break;
- case WID_MAIL_BODY: pData = &sMailBody; break;
- case WID_ATTACHMENT_NAME: pData = &sAttachmentName;
break;
- case WID_ATTACHMENT_FILTER: pData =
&sAttachmentFilter;break;
- case WID_PRINT_OPTIONS: pData = &aPrintSettings; break;
- case WID_SAVE_AS_SINGLE_FILE: pData = &bSaveAsSingleFile;
break;
- case WID_SAVE_FILTER: pData = &sSaveFilter; break;
- case WID_SAVE_FILTER_OPTIONS: pData = &sSaveFilterOptions;
break;
- case WID_SAVE_FILTER_DATA: pData = &aSaveFilterData;
break;
- case WID_COPIES_TO: pData = &aCopiesTo; break;
- case WID_BLIND_COPIES_TO: pData = &aBlindCopiesTo;break;
- case WID_IN_SERVER_PASSWORD: pData = &sInServerPassword;
break;
- case WID_OUT_SERVER_PASSWORD: pData = &sOutServerPassword;
break;
+ case WID_SELECTION : pData = &m_aSelection; break;
+ case WID_RESULT_SET : pData = &m_xResultSet; break;
+ case WID_CONNECTION : pData = &m_xConnection; break;
+ case WID_MODEL : pData = &m_xModel; break;
+ case WID_DATA_SOURCE_NAME : pData = &m_aDataSourceName;
break;
+ case WID_DATA_COMMAND : pData = &m_aDataCommand;
break;
+ case WID_FILTER : pData = &m_aFilter; break;
+ case WID_DOCUMENT_URL : pData = &m_aDocumentURL;
break;
+ case WID_OUTPUT_URL : pData = &m_aOutputURL; break;
+ case WID_DATA_COMMAND_TYPE : pData = &m_nDataCommandType;
break;
+ case WID_OUTPUT_TYPE : pData = &m_nOutputType; break;
+ case WID_ESCAPE_PROCESSING : pData = &m_bEscapeProcessing;
break;
+ case WID_SINGLE_PRINT_JOBS : pData = &m_bSinglePrintJobs;
break;
+ case WID_FILE_NAME_FROM_COLUMN : pData =
&m_bFileNameFromColumn; break;
+ case WID_FILE_NAME_PREFIX : pData = &m_aFileNamePrefix;
break;
+ case WID_MAIL_SUBJECT: pData = &m_sSubject; break;
+ case WID_ADDRESS_FROM_COLUMN: pData = &m_sAddressFromColumn;
break;
+ case WID_SEND_AS_HTML: pData = &m_bSendAsHTML; break;
+ case WID_SEND_AS_ATTACHMENT: pData = &m_bSendAsAttachment;
break;
+ case WID_MAIL_BODY: pData = &m_sMailBody; break;
+ case WID_ATTACHMENT_NAME: pData = &m_sAttachmentName;
break;
+ case WID_ATTACHMENT_FILTER: pData =
&m_sAttachmentFilter;break;
+ case WID_PRINT_OPTIONS: pData = &m_aPrintSettings;
break;
+ case WID_SAVE_AS_SINGLE_FILE: pData = &m_bSaveAsSingleFile;
break;
+ case WID_SAVE_FILTER: pData = &m_sSaveFilter; break;
+ case WID_SAVE_FILTER_OPTIONS: pData = &m_sSaveFilterOptions;
break;
+ case WID_SAVE_FILTER_DATA: pData = &m_aSaveFilterData;
break;
+ case WID_COPIES_TO: pData = &m_aCopiesTo; break;
+ case WID_BLIND_COPIES_TO: pData =
&m_aBlindCopiesTo;break;
+ case WID_IN_SERVER_PASSWORD: pData = &m_sInServerPassword;
break;
+ case WID_OUT_SERVER_PASSWORD: pData = &m_sOutServerPassword;
break;
default :
OSL_FAIL("unknown WID");
}
@@ -932,30 +932,30 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
bool bOK = true;
if (aOld != rValue)
{
- if (pData == &aSelection)
- bOK = rValue >>= aSelection;
- else if (pData == &xResultSet)
- bOK = rValue >>= xResultSet;
- else if (pData == &xConnection)
- bOK = rValue >>= xConnection;
- else if (pData == &xModel)
- bOK = rValue >>= xModel;
- else if (pData == &aDataSourceName)
- bOK = rValue >>= aDataSourceName;
- else if (pData == &aDataCommand)
- bOK = rValue >>= aDataCommand;
- else if (pData == &aFilter)
- bOK = rValue >>= aFilter;
- else if (pData == &aDocumentURL)
+ if (pData == &m_aSelection)
+ bOK = rValue >>= m_aSelection;
+ else if (pData == &m_xResultSet)
+ bOK = rValue >>= m_xResultSet;
+ else if (pData == &m_xConnection)
+ bOK = rValue >>= m_xConnection;
+ else if (pData == &m_xModel)
+ bOK = rValue >>= m_xModel;
+ else if (pData == &m_aDataSourceName)
+ bOK = rValue >>= m_aDataSourceName;
+ else if (pData == &m_aDataCommand)
+ bOK = rValue >>= m_aDataCommand;
+ else if (pData == &m_aFilter)
+ bOK = rValue >>= m_aFilter;
+ else if (pData == &m_aDocumentURL)
{
OUString aText;
bOK = rValue >>= aText;
if (!aText.isEmpty()
- && !LoadFromURL_impl( xModel, xDocSh, aText, true ))
+ && !LoadFromURL_impl( m_xModel, m_xDocSh, aText, true ))
throw RuntimeException("Failed to create document from
URL: " + aText, static_cast < cppu::OWeakObject * > ( this ) );
- aDocumentURL = aText;
+ m_aDocumentURL = aText;
}
- else if (pData == &aOutputURL)
+ else if (pData == &m_aOutputURL)
{
OUString aText;
bOK = rValue >>= aText;
@@ -966,52 +966,52 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
if (UCB_IsReadOnlyFileName(aText))
throw IllegalArgumentException("URL is read-only: " +
aText, static_cast < cppu::OWeakObject * > ( this ), 0 );
}
- aOutputURL = aText;
+ m_aOutputURL = aText;
}
- else if (pData == &nDataCommandType)
- bOK = rValue >>= nDataCommandType;
- else if (pData == &nOutputType)
- bOK = rValue >>= nOutputType;
- else if (pData == &bEscapeProcessing)
- bOK = rValue >>= bEscapeProcessing;
- else if (pData == &bSinglePrintJobs)
- bOK = rValue >>= bSinglePrintJobs;
- else if (pData == &bFileNameFromColumn)
- bOK = rValue >>= bFileNameFromColumn;
- else if (pData == &aFileNamePrefix)
- bOK = rValue >>= aFileNamePrefix;
- else if (pData == &sSubject)
- bOK = rValue >>= sSubject;
- else if (pData == &sAddressFromColumn)
- bOK = rValue >>= sAddressFromColumn;
- else if (pData == &bSendAsHTML)
- bOK = rValue >>= bSendAsHTML;
- else if (pData == &bSendAsAttachment)
- bOK = rValue >>= bSendAsAttachment;
- else if (pData == &sMailBody)
- bOK = rValue >>= sMailBody;
- else if (pData == &sAttachmentName)
- bOK = rValue >>= sAttachmentName;
- else if (pData == &sAttachmentFilter)
- bOK = rValue >>= sAttachmentFilter;
- else if (pData == &aPrintSettings)
- bOK = rValue >>= aPrintSettings;
- else if (pData == &bSaveAsSingleFile)
- bOK = rValue >>= bSaveAsSingleFile;
- else if (pData == &sSaveFilter)
- bOK = rValue >>= sSaveFilter;
- else if (pData == &sSaveFilterOptions)
- bOK = rValue >>= sSaveFilterOptions;
- else if (pData == &aSaveFilterData)
- bOK = rValue >>= aSaveFilterData;
- else if (pData == &aCopiesTo)
- bOK = rValue >>= aCopiesTo;
- else if (pData == &aBlindCopiesTo)
- bOK = rValue >>= aBlindCopiesTo;
- else if(pData == &sInServerPassword)
- bOK = rValue >>= sInServerPassword;
- else if(pData == &sOutServerPassword)
- bOK = rValue >>= sInServerPassword;
+ else if (pData == &m_nDataCommandType)
+ bOK = rValue >>= m_nDataCommandType;
+ else if (pData == &m_nOutputType)
+ bOK = rValue >>= m_nOutputType;
+ else if (pData == &m_bEscapeProcessing)
+ bOK = rValue >>= m_bEscapeProcessing;
+ else if (pData == &m_bSinglePrintJobs)
+ bOK = rValue >>= m_bSinglePrintJobs;
+ else if (pData == &m_bFileNameFromColumn)
+ bOK = rValue >>= m_bFileNameFromColumn;
+ else if (pData == &m_aFileNamePrefix)
+ bOK = rValue >>= m_aFileNamePrefix;
+ else if (pData == &m_sSubject)
+ bOK = rValue >>= m_sSubject;
+ else if (pData == &m_sAddressFromColumn)
+ bOK = rValue >>= m_sAddressFromColumn;
+ else if (pData == &m_bSendAsHTML)
+ bOK = rValue >>= m_bSendAsHTML;
+ else if (pData == &m_bSendAsAttachment)
+ bOK = rValue >>= m_bSendAsAttachment;
+ else if (pData == &m_sMailBody)
+ bOK = rValue >>= m_sMailBody;
+ else if (pData == &m_sAttachmentName)
+ bOK = rValue >>= m_sAttachmentName;
+ else if (pData == &m_sAttachmentFilter)
+ bOK = rValue >>= m_sAttachmentFilter;
+ else if (pData == &m_aPrintSettings)
+ bOK = rValue >>= m_aPrintSettings;
+ else if (pData == &m_bSaveAsSingleFile)
+ bOK = rValue >>= m_bSaveAsSingleFile;
+ else if (pData == &m_sSaveFilter)
+ bOK = rValue >>= m_sSaveFilter;
+ else if (pData == &m_sSaveFilterOptions)
+ bOK = rValue >>= m_sSaveFilterOptions;
+ else if (pData == &m_aSaveFilterData)
+ bOK = rValue >>= m_aSaveFilterData;
+ else if (pData == &m_aCopiesTo)
+ bOK = rValue >>= m_aCopiesTo;
+ else if (pData == &m_aBlindCopiesTo)
+ bOK = rValue >>= m_aBlindCopiesTo;
+ else if(pData == &m_sInServerPassword)
+ bOK = rValue >>= m_sInServerPassword;
+ else if(pData == &m_sOutServerPassword)
+ bOK = rValue >>= m_sInServerPassword;
else {
OSL_FAIL("invalid pointer" );
}
@@ -1038,44 +1038,44 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
Any aRet;
- const SfxItemPropertySimpleEntry* pCur =
pPropSet->getPropertyMap().getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur =
m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pCur)
throw UnknownPropertyException();
else
{
switch (pCur->nWID)
{
- case WID_SELECTION : aRet <<= aSelection; break;
- case WID_RESULT_SET : aRet <<= xResultSet; break;
- case WID_CONNECTION : aRet <<= xConnection; break;
- case WID_MODEL : aRet <<= xModel; break;
- case WID_DATA_SOURCE_NAME : aRet <<= aDataSourceName;
break;
- case WID_DATA_COMMAND : aRet <<= aDataCommand; break;
- case WID_FILTER : aRet <<= aFilter; break;
- case WID_DOCUMENT_URL : aRet <<= aDocumentURL; break;
- case WID_OUTPUT_URL : aRet <<= aOutputURL; break;
- case WID_DATA_COMMAND_TYPE : aRet <<= nDataCommandType;
break;
- case WID_OUTPUT_TYPE : aRet <<= nOutputType; break;
- case WID_ESCAPE_PROCESSING : aRet <<= bEscapeProcessing;
break;
- case WID_SINGLE_PRINT_JOBS : aRet <<= bSinglePrintJobs;
break;
- case WID_FILE_NAME_FROM_COLUMN : aRet <<= bFileNameFromColumn;
break;
- case WID_FILE_NAME_PREFIX : aRet <<= aFileNamePrefix;
break;
- case WID_MAIL_SUBJECT: aRet <<= sSubject; break;
- case WID_ADDRESS_FROM_COLUMN: aRet <<= sAddressFromColumn;
break;
- case WID_SEND_AS_HTML: aRet <<= bSendAsHTML; break;
- case WID_SEND_AS_ATTACHMENT: aRet <<= bSendAsAttachment;
break;
- case WID_MAIL_BODY: aRet <<= sMailBody; break;
- case WID_ATTACHMENT_NAME: aRet <<= sAttachmentName;
break;
- case WID_ATTACHMENT_FILTER: aRet <<=
sAttachmentFilter;break;
- case WID_PRINT_OPTIONS: aRet <<= aPrintSettings; break;
- case WID_SAVE_AS_SINGLE_FILE: aRet <<= bSaveAsSingleFile;
break;
- case WID_SAVE_FILTER: aRet <<= sSaveFilter; break;
- case WID_SAVE_FILTER_OPTIONS: aRet <<= sSaveFilterOptions;
break;
- case WID_SAVE_FILTER_DATA: aRet <<= aSaveFilterData;
break;
- case WID_COPIES_TO: aRet <<= aCopiesTo; break;
- case WID_BLIND_COPIES_TO: aRet <<= aBlindCopiesTo;break;
- case WID_IN_SERVER_PASSWORD: aRet <<= sInServerPassword;
break;
- case WID_OUT_SERVER_PASSWORD: aRet <<= sOutServerPassword;
break;
+ case WID_SELECTION : aRet <<= m_aSelection; break;
+ case WID_RESULT_SET : aRet <<= m_xResultSet; break;
+ case WID_CONNECTION : aRet <<= m_xConnection; break;
+ case WID_MODEL : aRet <<= m_xModel; break;
+ case WID_DATA_SOURCE_NAME : aRet <<= m_aDataSourceName;
break;
+ case WID_DATA_COMMAND : aRet <<= m_aDataCommand;
break;
+ case WID_FILTER : aRet <<= m_aFilter; break;
+ case WID_DOCUMENT_URL : aRet <<= m_aDocumentURL;
break;
+ case WID_OUTPUT_URL : aRet <<= m_aOutputURL; break;
+ case WID_DATA_COMMAND_TYPE : aRet <<= m_nDataCommandType;
break;
+ case WID_OUTPUT_TYPE : aRet <<= m_nOutputType; break;
+ case WID_ESCAPE_PROCESSING : aRet <<= m_bEscapeProcessing;
break;
+ case WID_SINGLE_PRINT_JOBS : aRet <<= m_bSinglePrintJobs;
break;
+ case WID_FILE_NAME_FROM_COLUMN : aRet <<=
m_bFileNameFromColumn; break;
+ case WID_FILE_NAME_PREFIX : aRet <<= m_aFileNamePrefix;
break;
+ case WID_MAIL_SUBJECT: aRet <<= m_sSubject; break;
+ case WID_ADDRESS_FROM_COLUMN: aRet <<= m_sAddressFromColumn;
break;
+ case WID_SEND_AS_HTML: aRet <<= m_bSendAsHTML; break;
+ case WID_SEND_AS_ATTACHMENT: aRet <<= m_bSendAsAttachment;
break;
+ case WID_MAIL_BODY: aRet <<= m_sMailBody; break;
+ case WID_ATTACHMENT_NAME: aRet <<= m_sAttachmentName;
break;
+ case WID_ATTACHMENT_FILTER: aRet <<=
m_sAttachmentFilter;break;
+ case WID_PRINT_OPTIONS: aRet <<= m_aPrintSettings;
break;
+ case WID_SAVE_AS_SINGLE_FILE: aRet <<= m_bSaveAsSingleFile;
break;
+ case WID_SAVE_FILTER: aRet <<= m_sSaveFilter; break;
+ case WID_SAVE_FILTER_OPTIONS: aRet <<= m_sSaveFilterOptions;
break;
+ case WID_SAVE_FILTER_DATA: aRet <<= m_aSaveFilterData;
break;
+ case WID_COPIES_TO: aRet <<= m_aCopiesTo; break;
+ case WID_BLIND_COPIES_TO: aRet <<=
m_aBlindCopiesTo;break;
+ case WID_IN_SERVER_PASSWORD: aRet <<= m_sInServerPassword;
break;
+ case WID_OUT_SERVER_PASSWORD: aRet <<= m_sOutServerPassword;
break;
default :
OSL_FAIL("unknown WID");
}
@@ -1090,11 +1090,11 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener(
throw (UnknownPropertyException, WrappedTargetException, RuntimeException,
std::exception)
{
SolarMutexGuard aGuard;
- if (!bDisposing && rListener.is())
+ if (!m_bDisposing && rListener.is())
{
- const SfxItemPropertySimpleEntry* pCur =
pPropSet->getPropertyMap().getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur =
m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (pCur)
- aPropListeners.addInterface( pCur->nWID, rListener );
+ m_aPropListeners.addInterface( pCur->nWID, rListener );
else
throw UnknownPropertyException();
}
@@ -1106,11 +1106,11 @@ void SAL_CALL
SwXMailMerge::removePropertyChangeListener(
throw (UnknownPropertyException, WrappedTargetException, RuntimeException,
std::exception)
{
SolarMutexGuard aGuard;
- if (!bDisposing && rListener.is())
+ if (!m_bDisposing && rListener.is())
{
- const SfxItemPropertySimpleEntry* pCur =
pPropSet->getPropertyMap().getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur =
m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (pCur)
- aPropListeners.removeInterface( pCur->nWID, rListener );
+ m_aPropListeners.removeInterface( pCur->nWID, rListener );
else
throw UnknownPropertyException();
}
@@ -1139,14 +1139,14 @@ void SAL_CALL SwXMailMerge::dispose()
{
SolarMutexGuard aGuard;
- if (!bDisposing)
+ if (!m_bDisposing)
{
- bDisposing = true;
+ m_bDisposing = true;
EventObject aEvtObj( static_cast<XPropertySet *>(this) );
- aEvtListeners.disposeAndClear( aEvtObj );
- aMergeListeners.disposeAndClear( aEvtObj );
- aPropListeners.disposeAndClear( aEvtObj );
+ m_aEvtListeners.disposeAndClear( aEvtObj );
+ m_aMergeListeners.disposeAndClear( aEvtObj );
+ m_aPropListeners.disposeAndClear( aEvtObj );
}
}
@@ -1155,8 +1155,8 @@ void SAL_CALL SwXMailMerge::addEventListener(
throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- if (!bDisposing && rxListener.is())
- aEvtListeners.addInterface( rxListener );
+ if (!m_bDisposing && rxListener.is())
+ m_aEvtListeners.addInterface( rxListener );
}
void SAL_CALL SwXMailMerge::removeEventListener(
@@ -1164,8 +1164,8 @@ void SAL_CALL SwXMailMerge::removeEventListener(
throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- if (!bDisposing && rxListener.is())
- aEvtListeners.removeInterface( rxListener );
+ if (!m_bDisposing && rxListener.is())
+ m_aEvtListeners.removeInterface( rxListener );
}
void SAL_CALL SwXMailMerge::addMailMergeEventListener(
@@ -1173,8 +1173,8 @@ void SAL_CALL SwXMailMerge::addMailMergeEventListener(
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- if (!bDisposing && rxListener.is())
- aMergeListeners.addInterface( rxListener );
+ if (!m_bDisposing && rxListener.is())
+ m_aMergeListeners.addInterface( rxListener );
}
void SAL_CALL SwXMailMerge::removeMailMergeEventListener(
@@ -1182,8 +1182,8 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener(
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- if (!bDisposing && rxListener.is())
- aMergeListeners.removeInterface( rxListener );
+ if (!m_bDisposing && rxListener.is())
+ m_aMergeListeners.removeInterface( rxListener );
}
OUString SAL_CALL SwXMailMerge::getImplementationName()
commit e876b4ef91b1f5fcccbafda19ac0ccf115835625
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Nov 6 08:34:11 2015 +0100
sw: prefix members of SwStdFontTabPage
Change-Id: Ia0de4c400937305baab7fef0e414777f0cd906e9
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 1ca1d49..5d5d7bf 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -536,70 +536,70 @@ void SwAddPrinterTabPage::PageCreated( const
SfxAllItemSet& aSet)
SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent,
const SfxItemSet& rSet ) :
SfxTabPage( pParent, "OptFontTabPage" ,
"modules/swriter/ui/optfonttabpage.ui" , &rSet),
- pPrt(0),
- pFontList(0),
- pFontConfig(0),
- pWrtShell(0),
- eLanguage( GetAppLanguage() ),
-
- bListDefault(false),
- bSetListDefault(true),
- bLabelDefault(false),
- bSetLabelDefault(true),
- bIdxDefault(false),
- bSetIdxDefault(true),
- bDeletePrinter(false),
-
- bListHeightDefault (false),
- bSetListHeightDefault (false),
- bLabelHeightDefault (false),
- bSetLabelHeightDefault(false),
- bIndexHeightDefault (false),
- bSetIndexHeightDefault (false),
-
- nFontGroup(FONT_GROUP_DEFAULT),
-
- sScriptWestern(SW_RES(ST_SCRIPT_WESTERN)),
- sScriptAsian(SW_RES(ST_SCRIPT_ASIAN)),
- sScriptComplex(SW_RES(ST_SCRIPT_CTL))
-{
- get(pLabelFT,"label1");
- get(pStandardBox,"standardbox");
- pStandardBox->SetStyle(pStandardBox->GetStyle() | WB_SORT);
- get(pStandardHeightLB,"standardheight");
- get(pTitleBox,"titlebox");
- pTitleBox->SetStyle(pTitleBox->GetStyle() | WB_SORT);
- get(pTitleHeightLB,"titleheight");
- get(pListBox,"listbox");
- pListBox->SetStyle(pListBox->GetStyle() | WB_SORT);
- get(pListHeightLB,"listheight");
- get(pLabelBox,"labelbox");
- pLabelBox->SetStyle(pLabelBox->GetStyle() | WB_SORT);
- get(pLabelHeightLB,"labelheight");
- get(pIdxBox,"idxbox");
- pIdxBox->SetStyle(pIdxBox->GetStyle() | WB_SORT);
- get(pIndexHeightLB,"indexheight");
-
- get(pStandardPB,"standard");
-
- pStandardPB->SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl));
- pStandardBox->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- pListBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- pLabelBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- pIdxBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ m_pPrt(0),
+ m_pFontList(0),
+ m_pFontConfig(0),
+ m_pWrtShell(0),
+ m_eLanguage( GetAppLanguage() ),
+
+ m_bListDefault(false),
+ m_bSetListDefault(true),
+ m_bLabelDefault(false),
+ m_bSetLabelDefault(true),
+ m_bIdxDefault(false),
+ m_bSetIdxDefault(true),
+ m_bDeletePrinter(false),
+
+ m_bListHeightDefault (false),
+ m_bSetListHeightDefault (false),
+ m_bLabelHeightDefault (false),
+ m_bSetLabelHeightDefault(false),
+ m_bIndexHeightDefault (false),
+ m_bSetIndexHeightDefault (false),
+
+ m_nFontGroup(FONT_GROUP_DEFAULT),
+
+ m_sScriptWestern(SW_RES(ST_SCRIPT_WESTERN)),
+ m_sScriptAsian(SW_RES(ST_SCRIPT_ASIAN)),
+ m_sScriptComplex(SW_RES(ST_SCRIPT_CTL))
+{
+ get(m_pLabelFT,"label1");
+ get(m_pStandardBox,"standardbox");
+ m_pStandardBox->SetStyle(m_pStandardBox->GetStyle() | WB_SORT);
+ get(m_pStandardHeightLB,"standardheight");
+ get(m_pTitleBox,"titlebox");
+ m_pTitleBox->SetStyle(m_pTitleBox->GetStyle() | WB_SORT);
+ get(m_pTitleHeightLB,"titleheight");
+ get(m_pListBox,"listbox");
+ m_pListBox->SetStyle(m_pListBox->GetStyle() | WB_SORT);
+ get(m_pListHeightLB,"listheight");
+ get(m_pLabelBox,"labelbox");
+ m_pLabelBox->SetStyle(m_pLabelBox->GetStyle() | WB_SORT);
+ get(m_pLabelHeightLB,"labelheight");
+ get(m_pIdxBox,"idxbox");
+ m_pIdxBox->SetStyle(m_pIdxBox->GetStyle() | WB_SORT);
+ get(m_pIndexHeightLB,"indexheight");
+
+ get(m_pStandardPB,"standard");
+
+ m_pStandardPB->SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl));
+ m_pStandardBox->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ m_pListBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ m_pLabelBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ m_pIdxBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
Link<Control&,void> aFocusLink = LINK( this, SwStdFontTabPage,
LoseFocusHdl);
- pStandardBox->SetLoseFocusHdl( aFocusLink );
- pTitleBox ->SetLoseFocusHdl( aFocusLink );
- pListBox ->SetLoseFocusHdl( aFocusLink );
- pLabelBox ->SetLoseFocusHdl( aFocusLink );
- pIdxBox ->SetLoseFocusHdl( aFocusLink );
+ m_pStandardBox->SetLoseFocusHdl( aFocusLink );
+ m_pTitleBox ->SetLoseFocusHdl( aFocusLink );
+ m_pListBox ->SetLoseFocusHdl( aFocusLink );
+ m_pLabelBox ->SetLoseFocusHdl( aFocusLink );
+ m_pIdxBox ->SetLoseFocusHdl( aFocusLink );
Link<Edit&,void> aModifyHeightLink( LINK( this, SwStdFontTabPage,
ModifyHeightHdl));
- pStandardHeightLB->SetModifyHdl( aModifyHeightLink );
- pTitleHeightLB-> SetModifyHdl( aModifyHeightLink );
- pListHeightLB-> SetModifyHdl( aModifyHeightLink );
- pLabelHeightLB-> SetModifyHdl( aModifyHeightLink );
- pIndexHeightLB-> SetModifyHdl( aModifyHeightLink );
+ m_pStandardHeightLB->SetModifyHdl( aModifyHeightLink );
+ m_pTitleHeightLB-> SetModifyHdl( aModifyHeightLink );
+ m_pListHeightLB-> SetModifyHdl( aModifyHeightLink );
+ m_pLabelHeightLB-> SetModifyHdl( aModifyHeightLink );
+ m_pIndexHeightLB-> SetModifyHdl( aModifyHeightLink );
}
SwStdFontTabPage::~SwStdFontTabPage()
@@ -609,21 +609,21 @@ SwStdFontTabPage::~SwStdFontTabPage()
void SwStdFontTabPage::dispose()
{
- delete pFontList;
- if (bDeletePrinter)
- pPrt.disposeAndClear();
- pLabelFT.clear();
- pStandardBox.clear();
- pStandardHeightLB.clear();
- pTitleBox.clear();
- pTitleHeightLB.clear();
- pListBox.clear();
- pListHeightLB.clear();
- pLabelBox.clear();
- pLabelHeightLB.clear();
- pIdxBox.clear();
- pIndexHeightLB.clear();
- pStandardPB.clear();
+ delete m_pFontList;
+ if (m_bDeletePrinter)
+ m_pPrt.disposeAndClear();
+ m_pLabelFT.clear();
+ m_pStandardBox.clear();
+ m_pStandardHeightLB.clear();
+ m_pTitleBox.clear();
+ m_pTitleHeightLB.clear();
+ m_pListBox.clear();
+ m_pListHeightLB.clear();
+ m_pLabelBox.clear();
+ m_pLabelHeightLB.clear();
+ m_pIdxBox.clear();
+ m_pIndexHeightLB.clear();
+ m_pStandardPB.clear();
SfxTabPage::dispose();
}
@@ -658,127 +658,127 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* )
{
SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(false);
- const OUString sStandard = pStandardBox->GetText();
- const OUString sTitle = pTitleBox->GetText();
- const OUString sList = pListBox->GetText();
- const OUString sLabel = pLabelBox->GetText();
- const OUString sIdx = pIdxBox->GetText();
-
- bool bStandardHeightChanged = pStandardHeightLB->IsValueChangedFromSaved();
- bool bTitleHeightChanged = pTitleHeightLB->IsValueChangedFromSaved();
- bool bListHeightChanged = pListHeightLB->IsValueChangedFromSaved() &&
(!bListHeightDefault || !bSetListHeightDefault );
- bool bLabelHeightChanged = pLabelHeightLB->IsValueChangedFromSaved() &&
(!bLabelHeightDefault || !bSetLabelHeightDefault );
- bool bIndexHeightChanged = pIndexHeightLB->IsValueChangedFromSaved() &&
(!bIndexHeightDefault || !bSetIndexHeightDefault );
-
- pFontConfig->SetFontStandard(sStandard, nFontGroup);
- pFontConfig->SetFontOutline(sTitle, nFontGroup);
- pFontConfig->SetFontList(sList, nFontGroup);
- pFontConfig->SetFontCaption(sLabel, nFontGroup);
- pFontConfig->SetFontIndex(sIdx, nFontGroup);
+ const OUString sStandard = m_pStandardBox->GetText();
+ const OUString sTitle = m_pTitleBox->GetText();
+ const OUString sList = m_pListBox->GetText();
+ const OUString sLabel = m_pLabelBox->GetText();
+ const OUString sIdx = m_pIdxBox->GetText();
+
+ bool bStandardHeightChanged =
m_pStandardHeightLB->IsValueChangedFromSaved();
+ bool bTitleHeightChanged = m_pTitleHeightLB->IsValueChangedFromSaved();
+ bool bListHeightChanged = m_pListHeightLB->IsValueChangedFromSaved() &&
(!m_bListHeightDefault || !m_bSetListHeightDefault );
+ bool bLabelHeightChanged = m_pLabelHeightLB->IsValueChangedFromSaved() &&
(!m_bLabelHeightDefault || !m_bSetLabelHeightDefault );
+ bool bIndexHeightChanged = m_pIndexHeightLB->IsValueChangedFromSaved() &&
(!m_bIndexHeightDefault || !m_bSetIndexHeightDefault );
+
+ m_pFontConfig->SetFontStandard(sStandard, m_nFontGroup);
+ m_pFontConfig->SetFontOutline(sTitle, m_nFontGroup);
+ m_pFontConfig->SetFontList(sList, m_nFontGroup);
+ m_pFontConfig->SetFontCaption(sLabel, m_nFontGroup);
+ m_pFontConfig->SetFontIndex(sIdx, m_nFontGroup);
if(bStandardHeightChanged)
{
- float fSize = (float)pStandardHeightLB->GetValue() / 10;
- pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_STANDARD, nFontGroup );
+ float fSize = (float)m_pStandardHeightLB->GetValue() / 10;
+ m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_STANDARD, m_nFontGroup );
}
if(bTitleHeightChanged)
{
- float fSize = (float)pTitleHeightLB->GetValue() / 10;
- pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_OUTLINE, nFontGroup );
+ float fSize = (float)m_pTitleHeightLB->GetValue() / 10;
+ m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_OUTLINE, m_nFontGroup );
}
if(bListHeightChanged)
{
- float fSize = (float)pListHeightLB->GetValue() / 10;
- pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_LIST, nFontGroup );
+ float fSize = (float)m_pListHeightLB->GetValue() / 10;
+ m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_LIST, m_nFontGroup );
}
if(bLabelHeightChanged)
{
- float fSize = (float)pLabelHeightLB->GetValue() / 10;
- pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_CAPTION, nFontGroup );
+ float fSize = (float)m_pLabelHeightLB->GetValue() / 10;
+ m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_CAPTION, m_nFontGroup );
}
if(bIndexHeightChanged)
{
- float fSize = (float)pIndexHeightLB->GetValue() / 10;
- pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_INDEX, nFontGroup );
+ float fSize = (float)m_pIndexHeightLB->GetValue() / 10;
+ m_pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ),
FONT_INDEX, m_nFontGroup );
}
- if(pWrtShell)
+ if(m_pWrtShell)
{
- pWrtShell->StartAllAction();
- SfxPrinter* pPrinter =
pWrtShell->getIDocumentDeviceAccess().getPrinter( false );
+ m_pWrtShell->StartAllAction();
+ SfxPrinter* pPrinter =
m_pWrtShell->getIDocumentDeviceAccess().getPrinter( false );
bool bMod = false;
const sal_uInt16 nFontWhich = sal::static_int_cast< sal_uInt16,
RES_CHRATR >(
- nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONT :
- FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONT :
RES_CHRATR_CTL_FONT);
+ m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONT :
+ FONT_GROUP_CJK == m_nFontGroup ? RES_CHRATR_CJK_FONT :
RES_CHRATR_CTL_FONT);
const sal_uInt16 nFontHeightWhich = sal::static_int_cast< sal_uInt16,
RES_CHRATR >(
- nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONTSIZE :
- FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONTSIZE :
RES_CHRATR_CTL_FONTSIZE);
- if(sStandard != sShellStd)
+ m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONTSIZE :
+ FONT_GROUP_CJK == m_nFontGroup ? RES_CHRATR_CJK_FONTSIZE :
RES_CHRATR_CTL_FONTSIZE);
+ if(sStandard != m_sShellStd)
{
vcl::Font aFont( sStandard, Size( 0, 10 ) );
if( pPrinter )
aFont = pPrinter->GetFontMetric( aFont );
- pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(),
aFont.GetName(),
+ m_pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(),
aFont.GetName(),
aEmptyOUStr, aFont.GetPitch(),
aFont.GetCharSet(), nFontWhich));
- SwTextFormatColl *pColl =
pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+ SwTextFormatColl *pColl =
m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
pColl->ResetFormatAttr(nFontWhich);
bMod = true;
}
if(bStandardHeightChanged)
{
- float fSize = (float)pStandardHeightLB->GetValue() / 10;
- pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize,
SFX_MAPUNIT_TWIP ), 100, nFontHeightWhich ) );
- SwTextFormatColl *pColl =
pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+ float fSize = (float)m_pStandardHeightLB->GetValue() / 10;
+ m_pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize,
SFX_MAPUNIT_TWIP ), 100, nFontHeightWhich ) );
+ SwTextFormatColl *pColl =
m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
pColl->ResetFormatAttr(nFontHeightWhich);
bMod = true;
}
- if(sTitle != sShellTitle )
+ if(sTitle != m_sShellTitle )
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_HEADLINE_BASE, pPrinter,
sTitle, nFontWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_HEADLINE_BASE, pPrinter,
sTitle, nFontWhich);
bMod = true;
}
if(bTitleHeightChanged)
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_HEADLINE_BASE,
- sal::static_int_cast< sal_uInt16, sal_Int64
>(pTitleHeightLB->GetValue()), nFontHeightWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_HEADLINE_BASE,
+ sal::static_int_cast< sal_uInt16, sal_Int64
>(m_pTitleHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
- if(sList != sShellList && (!bListDefault || !bSetListDefault ))
+ if(sList != m_sShellList && (!m_bListDefault || !m_bSetListDefault ))
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_NUMBUL_BASE, pPrinter, sList,
nFontWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_NUMBUL_BASE, pPrinter,
sList, nFontWhich);
bMod = true;
}
if(bListHeightChanged)
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_NUMBUL_BASE,
- sal::static_int_cast< sal_uInt16, sal_Int64
>(pListHeightLB->GetValue()), nFontHeightWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_NUMBUL_BASE,
+ sal::static_int_cast< sal_uInt16, sal_Int64
>(m_pListHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
- if(sLabel != sShellLabel && (!bLabelDefault || !bSetLabelDefault))
+ if(sLabel != m_sShellLabel && (!m_bLabelDefault ||
!m_bSetLabelDefault))
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_LABEL, pPrinter, sLabel,
nFontWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_LABEL, pPrinter, sLabel,
nFontWhich);
bMod = true;
}
if(bLabelHeightChanged)
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_LABEL,
- sal::static_int_cast< sal_uInt16, sal_Int64
>(pLabelHeightLB->GetValue()), nFontHeightWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_LABEL,
+ sal::static_int_cast< sal_uInt16, sal_Int64
>(m_pLabelHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
- if(sIdx != sShellIndex && (!bIdxDefault || !bSetIdxDefault))
+ if(sIdx != m_sShellIndex && (!m_bIdxDefault || !m_bSetIdxDefault))
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_REGISTER_BASE, pPrinter, sIdx,
nFontWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_REGISTER_BASE, pPrinter,
sIdx, nFontWhich);
bMod = true;
}
if(bIndexHeightChanged)
{
- lcl_SetColl(pWrtShell, RES_POOLCOLL_REGISTER_BASE,
- sal::static_int_cast< sal_uInt16, sal_Int64
>(pIndexHeightLB->GetValue()), nFontHeightWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_REGISTER_BASE,
+ sal::static_int_cast< sal_uInt16, sal_Int64
>(m_pIndexHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
if ( bMod )
- pWrtShell->SetModified();
- pWrtShell->EndAllAction();
+ m_pWrtShell->SetModified();
+ m_pWrtShell->EndAllAction();
}
return false;
}
@@ -786,29 +786,29 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* )
void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
{
const SfxPoolItem* pLang;
- const sal_uInt16 nLangSlot = nFontGroup == FONT_GROUP_DEFAULT ?
SID_ATTR_LANGUAGE :
- FONT_GROUP_CJK == nFontGroup ? SID_ATTR_CHAR_CJK_LANGUAGE :
SID_ATTR_CHAR_CTL_LANGUAGE;
+ const sal_uInt16 nLangSlot = m_nFontGroup == FONT_GROUP_DEFAULT ?
SID_ATTR_LANGUAGE :
+ FONT_GROUP_CJK == m_nFontGroup ? SID_ATTR_CHAR_CJK_LANGUAGE :
SID_ATTR_CHAR_CTL_LANGUAGE;
if( SfxItemState::SET == rSet->GetItemState(nLangSlot, false, &pLang))
- eLanguage = static_cast<const SvxLanguageItem*>(pLang)->GetValue();
+ m_eLanguage = static_cast<const SvxLanguageItem*>(pLang)->GetValue();
- OUString sToReplace = sScriptWestern;
- if(FONT_GROUP_CJK == nFontGroup )
- sToReplace = sScriptAsian;
- else if(FONT_GROUP_CTL == nFontGroup )
- sToReplace = sScriptComplex;
- pLabelFT->SetText(pLabelFT->GetText().replaceFirst("%1", sToReplace));
+ OUString sToReplace = m_sScriptWestern;
+ if(FONT_GROUP_CJK == m_nFontGroup )
+ sToReplace = m_sScriptAsian;
+ else if(FONT_GROUP_CTL == m_nFontGroup )
+ sToReplace = m_sScriptComplex;
+ m_pLabelFT->SetText(m_pLabelFT->GetText().replaceFirst("%1", sToReplace));
const SfxPoolItem* pItem;
- if (bDeletePrinter)
+ if (m_bDeletePrinter)
{
- pPrt.disposeAndClear();
+ m_pPrt.disposeAndClear();
}
if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_PRINTER, false,
&pItem))
{
- pPrt = static_cast<SfxPrinter*>(static_cast<const
SwPtrItem*>(pItem)->GetValue());
+ m_pPrt = static_cast<SfxPrinter*>(static_cast<const
SwPtrItem*>(pItem)->GetValue());
}
else
{
@@ -816,19 +816,19 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
0 );
- pPrt = VclPtr<SfxPrinter>::Create(pPrinterSet);
+ m_pPrt = VclPtr<SfxPrinter>::Create(pPrinterSet);
}
- delete pFontList;
- pFontList = new FontList( pPrt );
+ delete m_pFontList;
+ m_pFontList = new FontList( m_pPrt );
// #i94536# prevent duplication of font entries when 'reset' button is
pressed
- if( !pStandardBox->GetEntryCount() )
+ if( !m_pStandardBox->GetEntryCount() )
{
// get the set of disctinct available family names
std::set< OUString > aFontNames;
- int nFontNames = pPrt->GetDevFontCount();
+ int nFontNames = m_pPrt->GetDevFontCount();
for( int i = 0; i < nFontNames; i++ )
{
- vcl::FontInfo aInf( pPrt->GetDevFont( i ) );
+ vcl::FontInfo aInf( m_pPrt->GetDevFont( i ) );
aFontNames.insert( aInf.GetName() );
}
@@ -836,21 +836,21 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
for( std::set< OUString >::const_iterator it = aFontNames.begin();
it != aFontNames.end(); ++it )
{
- pStandardBox->InsertEntry( *it );
- pTitleBox->InsertEntry( *it );
- pListBox->InsertEntry( *it );
- pLabelBox->InsertEntry( *it );
- pIdxBox->InsertEntry( *it );
+ m_pStandardBox->InsertEntry( *it );
+ m_pTitleBox->InsertEntry( *it );
+ m_pListBox->InsertEntry( *it );
+ m_pLabelBox->InsertEntry( *it );
+ m_pIdxBox->InsertEntry( *it );
}
}
if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_STDFONTS, false,
&pItem))
{
- pFontConfig = static_cast<SwStdFontConfig*>(static_cast<const
SwPtrItem*>(pItem)->GetValue());
+ m_pFontConfig = static_cast<SwStdFontConfig*>(static_cast<const
SwPtrItem*>(pItem)->GetValue());
}
if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_WRTSHELL, false,
&pItem))
{
- pWrtShell = static_cast<SwWrtShell*>(static_cast<const
SwPtrItem*>(pItem)->GetValue());
+ m_pWrtShell = static_cast<SwWrtShell*>(static_cast<const
SwPtrItem*>(pItem)->GetValue());
}
OUString sStdBackup;
OUString sOutBackup;
@@ -863,198 +863,198 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
sal_Int32 nLabelHeight = -1;
sal_Int32 nIndexHeight = -1;
- if(!pWrtShell)
- {
- sStdBackup = pFontConfig->GetFontStandard(nFontGroup);
- sOutBackup = pFontConfig->GetFontOutline(nFontGroup);
- sListBackup= pFontConfig->GetFontList(nFontGroup);
- sCapBackup = pFontConfig->GetFontCaption(nFontGroup);
- sIdxBackup = pFontConfig->GetFontIndex(nFontGroup);
- nStandardHeight = pFontConfig->GetFontHeight( FONT_STANDARD,
nFontGroup, eLanguage );
- nTitleHeight = pFontConfig->GetFontHeight( FONT_OUTLINE ,
nFontGroup, eLanguage );
- nListHeight = pFontConfig->GetFontHeight( FONT_LIST ,
nFontGroup, eLanguage );
- nLabelHeight = pFontConfig->GetFontHeight( FONT_CAPTION ,
nFontGroup, eLanguage );
- nIndexHeight = pFontConfig->GetFontHeight( FONT_INDEX ,
nFontGroup, eLanguage );
+ if(!m_pWrtShell)
+ {
+ sStdBackup = m_pFontConfig->GetFontStandard(m_nFontGroup);
+ sOutBackup = m_pFontConfig->GetFontOutline(m_nFontGroup);
+ sListBackup= m_pFontConfig->GetFontList(m_nFontGroup);
+ sCapBackup = m_pFontConfig->GetFontCaption(m_nFontGroup);
+ sIdxBackup = m_pFontConfig->GetFontIndex(m_nFontGroup);
+ nStandardHeight = m_pFontConfig->GetFontHeight( FONT_STANDARD,
m_nFontGroup, m_eLanguage );
+ nTitleHeight = m_pFontConfig->GetFontHeight( FONT_OUTLINE ,
m_nFontGroup, m_eLanguage );
+ nListHeight = m_pFontConfig->GetFontHeight( FONT_LIST ,
m_nFontGroup, m_eLanguage );
+ nLabelHeight = m_pFontConfig->GetFontHeight( FONT_CAPTION ,
m_nFontGroup, m_eLanguage );
+ nIndexHeight = m_pFontConfig->GetFontHeight( FONT_INDEX ,
m_nFontGroup, m_eLanguage );
if( nStandardHeight <= 0)
- nStandardHeight = SwStdFontConfig::GetDefaultHeightFor(
FONT_STANDARD + nFontGroup * FONT_PER_GROUP, eLanguage);
+ nStandardHeight = SwStdFontConfig::GetDefaultHeightFor(
FONT_STANDARD + m_nFontGroup * FONT_PER_GROUP, m_eLanguage);
if( nTitleHeight <= 0)
- nTitleHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_OUTLINE
+ nFontGroup * FONT_PER_GROUP, eLanguage);
+ nTitleHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_OUTLINE
+ m_nFontGroup * FONT_PER_GROUP, m_eLanguage);
if( nListHeight <= 0)
- nListHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_LIST +
nFontGroup * FONT_PER_GROUP, eLanguage);
+ nListHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_LIST +
m_nFontGroup * FONT_PER_GROUP, m_eLanguage);
if( nLabelHeight <= 0)
- nLabelHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_CAPTION
+ nFontGroup * FONT_PER_GROUP, eLanguage);
+ nLabelHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_CAPTION
+ m_nFontGroup * FONT_PER_GROUP, m_eLanguage);
if( nIndexHeight <= 0)
- nIndexHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_INDEX +
nFontGroup * FONT_PER_GROUP, eLanguage);
+ nIndexHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_INDEX +
m_nFontGroup * FONT_PER_GROUP, m_eLanguage);
}
else
{
- SwTextFormatColl *pColl =
pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
- const SvxFontItem& rFont = !nFontGroup ? pColl->GetFont() :
- FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
- sShellStd = sStdBackup = rFont.GetFamilyName();
+ SwTextFormatColl *pColl =
m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+ const SvxFontItem& rFont = !m_nFontGroup ? pColl->GetFont() :
+ FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
+ m_sShellStd = sStdBackup = rFont.GetFamilyName();
const sal_uInt16 nFontHeightWhich = sal::static_int_cast< sal_uInt16,
RES_CHRATR >(
- nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONTSIZE :
- FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONTSIZE :
RES_CHRATR_CTL_FONTSIZE );
+ m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONTSIZE :
+ FONT_GROUP_CJK == m_nFontGroup ? RES_CHRATR_CJK_FONTSIZE :
RES_CHRATR_CTL_FONTSIZE );
const SvxFontHeightItem& rFontHeightStandard = static_cast<const
SvxFontHeightItem& >(pColl->GetFormatAttr(nFontHeightWhich));
nStandardHeight = (sal_Int32)rFontHeightStandard.GetHeight();
- pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_HEADLINE_BASE);
- const SvxFontItem& rFontHL = !nFontGroup ? pColl->GetFont() :
- FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
- sShellTitle = sOutBackup = rFontHL.GetFamilyName();
+ pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_HEADLINE_BASE);
+ const SvxFontItem& rFontHL = !m_nFontGroup ? pColl->GetFont() :
+ FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
+ m_sShellTitle = sOutBackup = rFontHL.GetFamilyName();
const SvxFontHeightItem& rFontHeightTitle = static_cast<const
SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich ));
nTitleHeight = (sal_Int32)rFontHeightTitle.GetHeight();
const sal_uInt16 nFontWhich = sal::static_int_cast< sal_uInt16,
RES_CHRATR >(
- nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONT :
- FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONT :
RES_CHRATR_CTL_FONT);
- pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_NUMBUL_BASE);
- const SvxFontItem& rFontLS = !nFontGroup ? pColl->GetFont() :
- FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
- bListDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
- sShellList = sListBackup = rFontLS.GetFamilyName();
+ m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONT :
+ FONT_GROUP_CJK == m_nFontGroup ? RES_CHRATR_CJK_FONT :
RES_CHRATR_CTL_FONT);
+ pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_NUMBUL_BASE);
+ const SvxFontItem& rFontLS = !m_nFontGroup ? pColl->GetFont() :
+ FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
+ m_bListDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
+ m_sShellList = sListBackup = rFontLS.GetFamilyName();
const SvxFontHeightItem& rFontHeightList = static_cast<const
SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich));
nListHeight = (sal_Int32)rFontHeightList.GetHeight();
- bListHeightDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
+ m_bListHeightDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
- pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_LABEL);
- bLabelDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
- const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() :
- FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
- sShellLabel = sCapBackup = rFontCP.GetFamilyName();
+ pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_LABEL);
+ m_bLabelDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
+ const SvxFontItem& rFontCP = !m_nFontGroup ? pColl->GetFont() :
+ FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
+ m_sShellLabel = sCapBackup = rFontCP.GetFamilyName();
const SvxFontHeightItem& rFontHeightLabel = static_cast<const
SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich));
nLabelHeight = (sal_Int32)rFontHeightLabel.GetHeight();
- bLabelHeightDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
+ m_bLabelHeightDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
- pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_REGISTER_BASE);
- bIdxDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
- const SvxFontItem& rFontIDX = !nFontGroup ? pColl->GetFont() :
- FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
- sShellIndex = sIdxBackup = rFontIDX.GetFamilyName();
+ pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_REGISTER_BASE);
+ m_bIdxDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
+ const SvxFontItem& rFontIDX = !m_nFontGroup ? pColl->GetFont() :
+ FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
+ m_sShellIndex = sIdxBackup = rFontIDX.GetFamilyName();
const SvxFontHeightItem& rFontHeightIndex = static_cast<const
SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich));
nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight();
- bIndexHeightDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
- }
- pStandardBox->SetText(sStdBackup );
- pTitleBox->SetText(sOutBackup );
- pListBox->SetText(sListBackup);
- pLabelBox->SetText(sCapBackup );
- pIdxBox->SetText(sIdxBackup );
-
- vcl::FontInfo aFontInfo( pFontList->Get(sStdBackup, sStdBackup) );
- pStandardHeightLB->Fill( &aFontInfo, pFontList );
- aFontInfo = pFontList->Get(sOutBackup, sOutBackup );
- pTitleHeightLB->Fill( &aFontInfo, pFontList );
- aFontInfo = pFontList->Get(sListBackup,sListBackup);
- pListHeightLB->Fill( &aFontInfo, pFontList );
- aFontInfo = pFontList->Get(sCapBackup, sCapBackup );
- pLabelHeightLB->Fill( &aFontInfo, pFontList );
- aFontInfo = pFontList->Get(sIdxBackup, sIdxBackup );
- pIndexHeightLB->Fill( &aFontInfo, pFontList );
-
- pStandardHeightLB->SetValue( CalcToPoint( nStandardHeight,
SFX_MAPUNIT_TWIP, 10 ) );
- pTitleHeightLB-> SetValue( CalcToPoint( nTitleHeight ,
SFX_MAPUNIT_TWIP, 10 ) );
- pListHeightLB-> SetValue( CalcToPoint( nListHeight ,
SFX_MAPUNIT_TWIP, 10 ) );
- pLabelHeightLB-> SetValue( CalcToPoint( nLabelHeight ,
SFX_MAPUNIT_TWIP, 10 ));
- pIndexHeightLB-> SetValue( CalcToPoint( nIndexHeight ,
SFX_MAPUNIT_TWIP, 10 ));
-
- pStandardBox->SaveValue();
- pTitleBox->SaveValue();
- pListBox->SaveValue();
- pLabelBox->SaveValue();
- pIdxBox->SaveValue();
-
- pStandardHeightLB->SaveValue();
- pTitleHeightLB->SaveValue();
- pListHeightLB->SaveValue();
- pLabelHeightLB->SaveValue();
- pIndexHeightLB->SaveValue();
+ m_bIndexHeightDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
+ }
+ m_pStandardBox->SetText(sStdBackup );
+ m_pTitleBox->SetText(sOutBackup );
+ m_pListBox->SetText(sListBackup);
+ m_pLabelBox->SetText(sCapBackup );
+ m_pIdxBox->SetText(sIdxBackup );
+
+ vcl::FontInfo aFontInfo( m_pFontList->Get(sStdBackup, sStdBackup) );
+ m_pStandardHeightLB->Fill( &aFontInfo, m_pFontList );
+ aFontInfo = m_pFontList->Get(sOutBackup, sOutBackup );
+ m_pTitleHeightLB->Fill( &aFontInfo, m_pFontList );
+ aFontInfo = m_pFontList->Get(sListBackup,sListBackup);
+ m_pListHeightLB->Fill( &aFontInfo, m_pFontList );
+ aFontInfo = m_pFontList->Get(sCapBackup, sCapBackup );
+ m_pLabelHeightLB->Fill( &aFontInfo, m_pFontList );
+ aFontInfo = m_pFontList->Get(sIdxBackup, sIdxBackup );
+ m_pIndexHeightLB->Fill( &aFontInfo, m_pFontList );
+
+ m_pStandardHeightLB->SetValue( CalcToPoint( nStandardHeight,
SFX_MAPUNIT_TWIP, 10 ) );
+ m_pTitleHeightLB-> SetValue( CalcToPoint( nTitleHeight ,
SFX_MAPUNIT_TWIP, 10 ) );
+ m_pListHeightLB-> SetValue( CalcToPoint( nListHeight ,
SFX_MAPUNIT_TWIP, 10 ) );
+ m_pLabelHeightLB-> SetValue( CalcToPoint( nLabelHeight ,
SFX_MAPUNIT_TWIP, 10 ));
+ m_pIndexHeightLB-> SetValue( CalcToPoint( nIndexHeight ,
SFX_MAPUNIT_TWIP, 10 ));
+
+ m_pStandardBox->SaveValue();
+ m_pTitleBox->SaveValue();
+ m_pListBox->SaveValue();
+ m_pLabelBox->SaveValue();
+ m_pIdxBox->SaveValue();
+
+ m_pStandardHeightLB->SaveValue();
+ m_pTitleHeightLB->SaveValue();
+ m_pListHeightLB->SaveValue();
+ m_pLabelHeightLB->SaveValue();
+ m_pIndexHeightLB->SaveValue();
}
IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void)
{
- sal_uInt8 nFontOffset = nFontGroup * FONT_PER_GROUP;
- pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD +
nFontOffset, eLanguage));
- pTitleBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_OUTLINE +
nFontOffset, eLanguage));
- pListBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_LIST +
nFontOffset, eLanguage));
- pLabelBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_CAPTION +
nFontOffset, eLanguage));
- pIdxBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_INDEX +
nFontOffset, eLanguage));
-
- pStandardBox->SaveValue();
- pTitleBox->SaveValue();
- pListBox->SaveValue();
- pLabelBox->SaveValue();
- pIdxBox->SaveValue();
-
- pStandardHeightLB->SetValue( CalcToPoint(
- SwStdFontConfig::GetDefaultHeightFor(FONT_STANDARD + nFontOffset,
eLanguage),
+ sal_uInt8 nFontOffset = m_nFontGroup * FONT_PER_GROUP;
+ m_pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD +
nFontOffset, m_eLanguage));
+ m_pTitleBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_OUTLINE +
nFontOffset, m_eLanguage));
+ m_pListBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_LIST +
nFontOffset, m_eLanguage));
+ m_pLabelBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_CAPTION +
nFontOffset, m_eLanguage));
+ m_pIdxBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_INDEX +
nFontOffset, m_eLanguage));
+
+ m_pStandardBox->SaveValue();
+ m_pTitleBox->SaveValue();
+ m_pListBox->SaveValue();
+ m_pLabelBox->SaveValue();
+ m_pIdxBox->SaveValue();
+
+ m_pStandardHeightLB->SetValue( CalcToPoint(
+ SwStdFontConfig::GetDefaultHeightFor(FONT_STANDARD + nFontOffset,
m_eLanguage),
SFX_MAPUNIT_TWIP, 10 ) );
- pTitleHeightLB ->SetValue(CalcToPoint(
+ m_pTitleHeightLB ->SetValue(CalcToPoint(
SwStdFontConfig::GetDefaultHeightFor(FONT_OUTLINE +
- nFontOffset, eLanguage), SFX_MAPUNIT_TWIP, 10 ));
- pListHeightLB ->SetValue(CalcToPoint(
- SwStdFontConfig::GetDefaultHeightFor(FONT_LIST + nFontOffset,
eLanguage),
+ nFontOffset, m_eLanguage), SFX_MAPUNIT_TWIP, 10 ));
+ m_pListHeightLB ->SetValue(CalcToPoint(
+ SwStdFontConfig::GetDefaultHeightFor(FONT_LIST + nFontOffset,
m_eLanguage),
SFX_MAPUNIT_TWIP, 10 ));
- pLabelHeightLB ->SetValue(CalcToPoint(
- SwStdFontConfig::GetDefaultHeightFor(FONT_CAPTION + nFontOffset,
eLanguage),
+ m_pLabelHeightLB ->SetValue(CalcToPoint(
+ SwStdFontConfig::GetDefaultHeightFor(FONT_CAPTION + nFontOffset,
m_eLanguage),
SFX_MAPUNIT_TWIP, 10 ));
- pIndexHeightLB ->SetValue(CalcToPoint(
- SwStdFontConfig::GetDefaultHeightFor(FONT_INDEX + nFontOffset,
eLanguage),
+ m_pIndexHeightLB ->SetValue(CalcToPoint(
+ SwStdFontConfig::GetDefaultHeightFor(FONT_INDEX + nFontOffset,
m_eLanguage),
SFX_MAPUNIT_TWIP, 10 ));
}
IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHdl, Edit&, rBox, void )
{
- if(&rBox == pStandardBox)
+ if(&rBox == m_pStandardBox)
{
const OUString sEntry = rBox.GetText();
- if(bSetListDefault && bListDefault)
- pListBox->SetText(sEntry);
- if(bSetLabelDefault && bLabelDefault)
- pLabelBox->SetText(sEntry);
- if(bSetIdxDefault && bIdxDefault)
- pIdxBox->SetText(sEntry);
+ if(m_bSetListDefault && m_bListDefault)
+ m_pListBox->SetText(sEntry);
+ if(m_bSetLabelDefault && m_bLabelDefault)
+ m_pLabelBox->SetText(sEntry);
+ if(m_bSetIdxDefault && m_bIdxDefault)
+ m_pIdxBox->SetText(sEntry);
}
- else if(&rBox == pListBox)
+ else if(&rBox == m_pListBox)
{
- bSetListDefault = false;
+ m_bSetListDefault = false;
}
- else if(&rBox == pLabelBox)
+ else if(&rBox == m_pLabelBox)
{
- bSetLabelDefault = false;
+ m_bSetLabelDefault = false;
}
- else if(&rBox == pIdxBox)
+ else if(&rBox == m_pIdxBox)
{
- bSetIdxDefault = false;
+ m_bSetIdxDefault = false;
}
}
IMPL_LINK_TYPED( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void )
{
- if(&rBox == pStandardHeightLB)
+ if(&rBox == m_pStandardHeightLB)
{
sal_Int64 nValue =
static_cast<FontSizeBox&>(rBox).GetValue(FUNIT_TWIP);
- if(bSetListHeightDefault && bListHeightDefault)
- pListHeightLB->SetValue(nValue, FUNIT_TWIP);
- if(bSetLabelHeightDefault && bLabelHeightDefault)
- pLabelHeightLB->SetValue(nValue, FUNIT_TWIP);
- if(bSetIndexHeightDefault && bIndexHeightDefault)
- pIndexHeightLB->SetValue(nValue, FUNIT_TWIP);
+ if(m_bSetListHeightDefault && m_bListHeightDefault)
+ m_pListHeightLB->SetValue(nValue, FUNIT_TWIP);
+ if(m_bSetLabelHeightDefault && m_bLabelHeightDefault)
+ m_pLabelHeightLB->SetValue(nValue, FUNIT_TWIP);
+ if(m_bSetIndexHeightDefault && m_bIndexHeightDefault)
+ m_pIndexHeightLB->SetValue(nValue, FUNIT_TWIP);
}
- else if(&rBox == pListHeightLB)
+ else if(&rBox == m_pListHeightLB)
{
- bSetListHeightDefault = false;
+ m_bSetListHeightDefault = false;
}
- else if(&rBox == pLabelHeightLB)
+ else if(&rBox == m_pLabelHeightLB)
{
- bSetLabelHeightDefault = false;
+ m_bSetLabelHeightDefault = false;
}
- else if(&rBox == pIndexHeightLB)
+ else if(&rBox == m_pIndexHeightLB)
{
- bSetIndexHeightDefault = false;
+ m_bSetIndexHeightDefault = false;
}
}
@@ -1063,28 +1063,28 @@ IMPL_LINK_TYPED( SwStdFontTabPage, LoseFocusHdl,
Control&, rControl, void )
ComboBox* pBox = static_cast<ComboBox*>(&rControl);
FontSizeBox* pHeightLB = 0;
const OUString sEntry = pBox->GetText();
- if(pBox == pStandardBox)
+ if(pBox == m_pStandardBox)
{
- pHeightLB = pStandardHeightLB;
+ pHeightLB = m_pStandardHeightLB;
}
- else if(pBox == pTitleBox)
+ else if(pBox == m_pTitleBox)
{
- pHeightLB = pTitleHeightLB;
+ pHeightLB = m_pTitleHeightLB;
}
- else if(pBox == pListBox)
+ else if(pBox == m_pListBox)
{
- pHeightLB = pListHeightLB;
+ pHeightLB = m_pListHeightLB;
}
- else if(pBox == pLabelBox)
+ else if(pBox == m_pLabelBox)
{
- pHeightLB = pLabelHeightLB;
+ pHeightLB = m_pLabelHeightLB;
}
else /*if(pBox == pIdxBox)*/
{
- pHeightLB = pIndexHeightLB;
+ pHeightLB = m_pIndexHeightLB;
}
- vcl::FontInfo aFontInfo( pFontList->Get(sEntry, sEntry) );
- pHeightLB->Fill( &aFontInfo, pFontList );
+ vcl::FontInfo aFontInfo( m_pFontList->Get(sEntry, sEntry) );
+ pHeightLB->Fill( &aFontInfo, m_pFontList );
}
void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet)
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index bd71176..cb125f8 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -125,53 +125,53 @@ public:
class SwStdFontTabPage : public SfxTabPage
{
friend class VclPtr<SwStdFontTabPage>;
- VclPtr<FixedText> pLabelFT;
-
- VclPtr<ComboBox> pStandardBox;
- VclPtr<FontSizeBox> pStandardHeightLB;
- VclPtr<ComboBox> pTitleBox ;
- VclPtr<FontSizeBox> pTitleHeightLB;
- VclPtr<ComboBox> pListBox ;
- VclPtr<FontSizeBox> pListHeightLB;
- VclPtr<ComboBox> pLabelBox ;
- VclPtr<FontSizeBox> pLabelHeightLB;
- VclPtr<ComboBox> pIdxBox ;
- VclPtr<FontSizeBox> pIndexHeightLB;
- VclPtr<PushButton> pStandardPB;
-
- OUString sShellStd;
- OUString sShellTitle;
- OUString sShellList;
- OUString sShellLabel;
- OUString sShellIndex;
-
- VclPtr<SfxPrinter> pPrt;
- FontList* pFontList;
- SwStdFontConfig* pFontConfig;
- SwWrtShell* pWrtShell;
- LanguageType eLanguage;
+ VclPtr<FixedText> m_pLabelFT;
+
+ VclPtr<ComboBox> m_pStandardBox;
+ VclPtr<FontSizeBox> m_pStandardHeightLB;
+ VclPtr<ComboBox> m_pTitleBox ;
+ VclPtr<FontSizeBox> m_pTitleHeightLB;
+ VclPtr<ComboBox> m_pListBox ;
+ VclPtr<FontSizeBox> m_pListHeightLB;
+ VclPtr<ComboBox> m_pLabelBox ;
+ VclPtr<FontSizeBox> m_pLabelHeightLB;
+ VclPtr<ComboBox> m_pIdxBox ;
+ VclPtr<FontSizeBox> m_pIndexHeightLB;
+ VclPtr<PushButton> m_pStandardPB;
+
+ OUString m_sShellStd;
+ OUString m_sShellTitle;
+ OUString m_sShellList;
+ OUString m_sShellLabel;
+ OUString m_sShellIndex;
+
+ VclPtr<SfxPrinter> m_pPrt;
+ FontList* m_pFontList;
+ SwStdFontConfig* m_pFontConfig;
+ SwWrtShell* m_pWrtShell;
+ LanguageType m_eLanguage;
// only defaults were there? they were signed with the boxes
- bool bListDefault :1;
- bool bSetListDefault :1;
- bool bLabelDefault :1;
- bool bSetLabelDefault :1;
- bool bIdxDefault :1;
- bool bSetIdxDefault :1;
- bool bDeletePrinter :1;
-
- bool bListHeightDefault :1;
- bool bSetListHeightDefault :1;
- bool bLabelHeightDefault :1;
- bool bSetLabelHeightDefault :1;
- bool bIndexHeightDefault :1;
- bool bSetIndexHeightDefault :1;
-
- sal_uInt8 nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL]
-
- OUString sScriptWestern;
- OUString sScriptAsian;
- OUString sScriptComplex;
+ bool m_bListDefault :1;
+ bool m_bSetListDefault :1;
+ bool m_bLabelDefault :1;
+ bool m_bSetLabelDefault :1;
+ bool m_bIdxDefault :1;
+ bool m_bSetIdxDefault :1;
+ bool m_bDeletePrinter :1;
+
+ bool m_bListHeightDefault :1;
+ bool m_bSetListHeightDefault :1;
+ bool m_bLabelHeightDefault :1;
+ bool m_bSetLabelHeightDefault :1;
+ bool m_bIndexHeightDefault :1;
+ bool m_bSetIndexHeightDefault :1;
+
+ sal_uInt8 m_nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL]
+
+ OUString m_sScriptWestern;
+ OUString m_sScriptAsian;
+ OUString m_sScriptComplex;
DECL_LINK_TYPED(StandardHdl, Button*, void );
DECL_LINK_TYPED(ModifyHdl, Edit&, void );
@@ -190,7 +190,7 @@ public:
void SetFontMode(sal_uInt8 nGroup)
{
- nFontGroup = nGroup;
+ m_nFontGroup = nGroup;
}
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
commit e22024c1701a74b7b780f43763857490c5d6a7b0
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Nov 6 08:33:27 2015 +0100
sw: prefix members of SwHTMLTableLayout
Change-Id: I8a0563551f1ee71e9ab9359c7b75ff5855b436b5
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index aea633c..8c038a5 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -173,65 +173,65 @@ public:
class SwHTMLTableLayout
{
- Timer aResizeTimer; ///< Timer for DelayedResize.
+ Timer m_aResizeTimer; ///< Timer for DelayedResize.
- SwHTMLTableLayoutColumn **aColumns;
- SwHTMLTableLayoutCell **aCells;
+ SwHTMLTableLayoutColumn **m_aColumns;
+ SwHTMLTableLayoutCell **m_aCells;
- const SwTable *pSwTable; ///< SwTable (Top-Table only).
- SwTableBox *pLeftFillerBox; ///< Left filler-box (table in table
only).
- SwTableBox *pRightFillerBox; ///< Right filler-box (table in Table
only).
+ const SwTable *m_pSwTable; ///< SwTable (Top-Table only).
+ SwTableBox *m_pLeftFillerBox; ///< Left filler-box (table in table
only).
+ SwTableBox *m_pRightFillerBox; ///< Right filler-box (table in
Table only).
- sal_uLong nMin; ///< Minimal width of table (Twips).
- sal_uLong nMax; ///< Maximal width of table (Twips).
+ sal_uLong m_nMin; ///< Minimal width of table (Twips).
+ sal_uLong m_nMax; ///< Maximal width of table (Twips).
- sal_uInt16 nRows; ///< Row count.
- sal_uInt16 nCols; ///< Column count.
+ sal_uInt16 m_nRows; ///< Row count.
+ sal_uInt16 m_nCols; ///< Column count.
- sal_uInt16 nLeftMargin; ///< Space to left margin (from
paragraph).
- sal_uInt16 nRightMargin; ///< Space to left margin (from
paragraph).
+ sal_uInt16 m_nLeftMargin; ///< Space to left margin (from
paragraph).
+ sal_uInt16 m_nRightMargin; ///< Space to left margin (from
paragraph).
- sal_uInt16 nInhAbsLeftSpace; ///< Space inherited from surrounding
box
- sal_uInt16 nInhAbsRightSpace; ///< that was added to boxes.
+ sal_uInt16 m_nInhAbsLeftSpace; ///< Space inherited from
surrounding box
+ sal_uInt16 m_nInhAbsRightSpace; ///< that was added to boxes.
- sal_uInt16 nRelLeftFill; ///< Width of boxes relative to
alignment
- sal_uInt16 nRelRightFill; ///< of tables in tables.
+ sal_uInt16 m_nRelLeftFill; ///< Width of boxes relative to
alignment
+ sal_uInt16 m_nRelRightFill; ///< of tables in tables.
- sal_uInt16 nRelTabWidth; ///< Relative width of table.
+ sal_uInt16 m_nRelTabWidth; ///< Relative width of table.
- sal_uInt16 nWidthOption; ///< Width of table (in Twips oder %).
- sal_uInt16 nCellPadding; ///< Space to contents (in Twips).
- sal_uInt16 nCellSpacing; ///< Cell spacing (in Twips).
- sal_uInt16 nBorder; /** Line strength of outer border, or
rather the
+ sal_uInt16 m_nWidthOption; ///< Width of table (in Twips oder
%).
+ sal_uInt16 m_nCellPadding; ///< Space to contents (in Twips).
+ sal_uInt16 m_nCellSpacing; ///< Cell spacing (in Twips).
+ sal_uInt16 m_nBorder; /** Line strength of outer border,
or rather the
space needed for it as calculated by
Netscape. */
- sal_uInt16 nLeftBorderWidth;
- sal_uInt16 nRightBorderWidth;
- sal_uInt16 nInhLeftBorderWidth;
- sal_uInt16 nInhRightBorderWidth;
- sal_uInt16 nBorderWidth;
+ sal_uInt16 m_nLeftBorderWidth;
+ sal_uInt16 m_nRightBorderWidth;
+ sal_uInt16 m_nInhLeftBorderWidth;
+ sal_uInt16 m_nInhRightBorderWidth;
+ sal_uInt16 m_nBorderWidth;
- sal_uInt16 nDelayedResizeAbsAvail; ///< Param for delayed Resize.
- sal_uInt16 nLastResizeAbsAvail;
+ sal_uInt16 m_nDelayedResizeAbsAvail; ///< Param for delayed Resize.
+ sal_uInt16 m_nLastResizeAbsAvail;
- sal_uInt8 nPass1Done; ///< Reference-values for
- sal_uInt8 nWidthSet; ///< the runs through loop.
+ sal_uInt8 m_nPass1Done; ///< Reference-values for
+ sal_uInt8 m_nWidthSet; ///< the runs through loop.
- SvxAdjust eTableAdjust; ///< Alignment of table.
+ SvxAdjust m_eTableAdjust; ///< Alignment of table.
- bool bColsOption : 1; ///< Table has a COLS-option.
- bool bColTags : 1; ///< Tabelle has COL/COLGRP-tags.
- bool bPrcWidthOption : 1; ///< Width is given in percent.
- bool bUseRelWidth : 1; ///< SwTable gets relative width.
+ bool m_bColsOption : 1; ///< Table has a COLS-option.
+ bool m_bColTags : 1; ///< Tabelle has COL/COLGRP-tags.
+ bool m_bPrcWidthOption : 1; ///< Width is given in percent.
+ bool m_bUseRelWidth : 1; ///< SwTable gets relative width.
- bool bMustResize : 1; ///< Table width must be defined.
- bool bExportable : 1; ///< Layout may be used for export.
- bool bBordersChanged : 1; ///< Borders have been changed.
- bool bMayBeInFlyFrame : 1; ///< Table could be within frame.
+ bool m_bMustResize : 1; ///< Table width must be defined.
+ bool m_bExportable : 1; ///< Layout may be used for export.
+ bool m_bBordersChanged : 1; ///< Borders have been changed.
+ bool m_bMayBeInFlyFrame : 1; ///< Table could be within frame.
- bool bDelayedResizeRecalc : 1; ///< Param for delayed Resize.
- bool bMustNotResize : 1; ///< Table may not be resized.
- bool bMustNotRecalc : 1; ///< Table may not be adapted to its
contents.
+ bool m_bDelayedResizeRecalc : 1; ///< Param for delayed Resize.
+ bool m_bMustNotResize : 1; ///< Table may not be resized.
+ bool m_bMustNotRecalc : 1; ///< Table may not be adapted to its
contents.
void AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax, sal_uLong& rAbsMin,
sal_uInt16 nCol, sal_uInt16 nColSpan,
@@ -242,7 +242,7 @@ class SwHTMLTableLayout
SwFrameFormat *FindFlyFrameFormat() const;
const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); }
- void ClearPass1Info() { nMin = nMax = 0; }
+ void ClearPass1Info() { m_nMin = m_nMax = 0; }
void _Resize( sal_uInt16 nAbsAvail, bool bRecalc=false );
@@ -287,24 +287,24 @@ public:
inline SwHTMLTableLayoutCell *GetCell( sal_uInt16 nRow, sal_uInt16 nCol )
const;
inline void SetCell( SwHTMLTableLayoutCell *pCell, sal_uInt16 nRow,
sal_uInt16 nCol );
- void SetLeftFillerBox( SwTableBox *pBox ) { pLeftFillerBox = pBox; }
- void SetRightFillerBox( SwTableBox *pBox ) { pRightFillerBox = pBox; }
+ void SetLeftFillerBox( SwTableBox *pBox ) { m_pLeftFillerBox = pBox; }
+ void SetRightFillerBox( SwTableBox *pBox ) { m_pRightFillerBox = pBox; }
- sal_uLong GetMin() const { return nMin; }
- sal_uLong GetMax() const { return nMax; }
- sal_uInt16 GetRelLeftFill() const { return nRelLeftFill; }
- sal_uInt16 GetRelRightFill() const { return nRelRightFill; }
+ sal_uLong GetMin() const { return m_nMin; }
+ sal_uLong GetMax() const { return m_nMax; }
+ sal_uInt16 GetRelLeftFill() const { return m_nRelLeftFill; }
+ sal_uInt16 GetRelRightFill() const { return m_nRelRightFill; }
inline long GetBrowseWidthMin() const;
- bool HasColsOption() const { return bColsOption; }
- bool HasColTags() const { return bColTags; }
+ bool HasColsOption() const { return m_bColsOption; }
+ bool HasColTags() const { return m_bColTags; }
- bool IsTopTable() const { return pSwTable != 0; }
+ bool IsTopTable() const { return m_pSwTable != 0; }
- void SetMustResize( bool bSet ) { bMustResize = bSet; }
- void SetMustNotResize( bool bSet ) { bMustNotResize = bSet; }
- void SetMustNotRecalc( bool bSet ) { bMustNotRecalc = bSet; }
+ void SetMustResize( bool bSet ) { m_bMustResize = bSet; }
+ void SetMustNotResize( bool bSet ) { m_bMustNotResize = bSet; }
+ void SetMustNotRecalc( bool bSet ) { m_bMustNotRecalc = bSet; }
/** Recalculation of table widths for available width that has been passed.
- If bRecalc is set, contents of boxes are included into calculation.
@@ -334,23 +334,23 @@ public:
sal_uInt16 GetBrowseWidthByTable( const SwDoc& rDoc ) const;
/// For Export.
- sal_uInt16 GetWidthOption() const { return nWidthOption; }
- bool HasPrcWidthOption() const { return bPrcWidthOption; }
+ sal_uInt16 GetWidthOption() const { return m_nWidthOption; }
+ bool HasPrcWidthOption() const { return m_bPrcWidthOption; }
- sal_uInt16 GetCellPadding() const { return nCellPadding; }
- sal_uInt16 GetCellSpacing() const { return nCellSpacing; }
- sal_uInt16 GetBorder() const { return nBorder; }
+ sal_uInt16 GetCellPadding() const { return m_nCellPadding; }
+ sal_uInt16 GetCellSpacing() const { return m_nCellSpacing; }
+ sal_uInt16 GetBorder() const { return m_nBorder; }
- sal_uInt16 GetRowCount() const { return nRows; }
- sal_uInt16 GetColCount() const { return nCols; }
+ sal_uInt16 GetRowCount() const { return m_nRows; }
+ sal_uInt16 GetColCount() const { return m_nCols; }
- void SetExportable( bool bSet ) { bExportable = bSet; }
- bool IsExportable() const { return bExportable; }
+ void SetExportable( bool bSet ) { m_bExportable = bSet; }
+ bool IsExportable() const { return m_bExportable; }
- bool HaveBordersChanged() const { return bBordersChanged; }
+ bool HaveBordersChanged() const { return m_bBordersChanged; }
- void SetMayBeInFlyFrame( bool bSet ) { bMayBeInFlyFrame = bSet; }
- bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; }
+ void SetMayBeInFlyFrame( bool bSet ) { m_bMayBeInFlyFrame = bSet; }
+ bool MayBeInFlyFrame() const { return m_bMayBeInFlyFrame; }
};
inline void SwHTMLTableLayoutCell::SetProtected()
@@ -405,16 +405,16 @@ inline sal_uInt16 SwHTMLTableLayout::GetInhCellSpace(
sal_uInt16 nCol,
{
sal_uInt16 nSpace = 0;
if( nCol==0 )
- nSpace = nSpace + nInhAbsLeftSpace;
- if( nCol+nColSpan==nCols )
- nSpace = nSpace + nInhAbsRightSpace;
+ nSpace = nSpace + m_nInhAbsLeftSpace;
+ if( nCol+nColSpan==m_nCols )
+ nSpace = nSpace + m_nInhAbsRightSpace;
return nSpace;
}
inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol
) const
{
- return aColumns[nCol];
+ return m_aColumns[nCol];
}
inline void SwHTMLTableLayoutColumn::SetWidthOption(
@@ -432,29 +432,29 @@ inline void SwHTMLTableLayoutColumn::SetWidthOption(
inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol,
sal_uInt16 nCol )
{
- aColumns[nCol] = pCol;
+ m_aColumns[nCol] = pCol;
}
inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( sal_uInt16 nRow,
sal_uInt16 nCol ) const
{
- return aCells[nRow*nCols+nCol];
+ return m_aCells[nRow*m_nCols+nCol];
}
inline void SwHTMLTableLayout::SetCell( SwHTMLTableLayoutCell *pCell,
sal_uInt16 nRow, sal_uInt16 nCol )
{
- aCells[nRow*nCols+nCol] = pCell;
+ m_aCells[nRow*m_nCols+nCol] = pCell;
}
inline long SwHTMLTableLayout::GetBrowseWidthMin() const
{
- return (long)( (!nWidthOption || bPrcWidthOption) ? nMin : nRelTabWidth );
+ return (long)( (!m_nWidthOption || m_bPrcWidthOption) ? m_nMin :
m_nRelTabWidth );
}
void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16
nRight )
{
- nInhLeftBorderWidth = nLeft;
- nInhRightBorderWidth = nRight;
+ m_nInhLeftBorderWidth = nLeft;
+ m_nInhRightBorderWidth = nRight;
}
#endif
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 0622b47..4677dd8 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -176,49 +176,49 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable *
pTable,
sal_uInt16 nRightBWidth,
sal_uInt16 nInhLeftBWidth,
sal_uInt16 nInhRightBWidth )
- : aColumns( new SwHTMLTableLayoutColumn*[nCls] )
- , aCells( new SwHTMLTableLayoutCell*[static_cast<size_t>(nRws)*nCls] )
- , pSwTable( pTable )
- , pLeftFillerBox( 0 )
- , pRightFillerBox( 0 )
- , nMin( 0 )
- , nMax( 0 )
- , nRows( nRws )
- , nCols( nCls )
- , nLeftMargin( nLMargin )
- , nRightMargin( nRMargin )
- , nInhAbsLeftSpace( 0 )
- , nInhAbsRightSpace( 0 )
- , nRelLeftFill( 0 )
- , nRelRightFill( 0 )
- , nRelTabWidth( 0 )
- , nWidthOption( nWdth )
- , nCellPadding( nCellPad )
- , nCellSpacing( nCellSp )
- , nBorder( nBorderOpt )
- , nLeftBorderWidth( nLeftBWidth )
- , nRightBorderWidth( nRightBWidth )
- , nInhLeftBorderWidth( nInhLeftBWidth )
- , nInhRightBorderWidth( nInhRightBWidth )
- , nBorderWidth( nBWidth )
- , nDelayedResizeAbsAvail( 0 )
- , nLastResizeAbsAvail( 0 )
- , nPass1Done( 0 )
- , nWidthSet( 0 )
- , eTableAdjust( eAdjust )
- , bColsOption( bColsOpt )
- , bColTags( bColTgs )
- , bPrcWidthOption( bPrcWdth )
- , bUseRelWidth( false )
- , bMustResize( true )
- , bExportable( true )
- , bBordersChanged( false )
- , bMayBeInFlyFrame( false )
- , bDelayedResizeRecalc( false)
- , bMustNotResize( false )
- , bMustNotRecalc( false )
+ : m_aColumns( new SwHTMLTableLayoutColumn*[nCls] )
+ , m_aCells( new SwHTMLTableLayoutCell*[static_cast<size_t>(nRws)*nCls] )
+ , m_pSwTable( pTable )
+ , m_pLeftFillerBox( 0 )
+ , m_pRightFillerBox( 0 )
+ , m_nMin( 0 )
+ , m_nMax( 0 )
+ , m_nRows( nRws )
+ , m_nCols( nCls )
+ , m_nLeftMargin( nLMargin )
+ , m_nRightMargin( nRMargin )
+ , m_nInhAbsLeftSpace( 0 )
+ , m_nInhAbsRightSpace( 0 )
+ , m_nRelLeftFill( 0 )
+ , m_nRelRightFill( 0 )
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
