summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx102
-rw-r--r--sc/source/core/data/conditio.cxx59
-rw-r--r--sc/source/core/data/drwlayer.cxx6
-rw-r--r--svtools/source/contnr/treelist.cxx12
-rw-r--r--sw/source/core/doc/tblrwcl.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
6 files changed, 0 insertions, 185 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 00f8b5569b0b..12ca15ef6462 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -135,108 +135,6 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog*
return S_OK;
}
-//-----------------------------------------------------------------------------
-::rtl::OUString lcl_getURLFromShellItem2 (IShellItem* pItem)
-{
- LPOLESTR pStr = NULL;
- ::rtl::OUString sURL;
-
- SIGDN eConversion = SIGDN_FILESYSPATH;
- HRESULT hr = pItem->GetDisplayName ( eConversion, &pStr );
-
- if ( FAILED(hr) )
- {
- eConversion = SIGDN_URL;
- hr = pItem->GetDisplayName ( eConversion, &pStr );
-
- if ( FAILED(hr) )
- return ::rtl::OUString();
-
- sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
- }
- else
- {
- ::osl::FileBase::getFileURLFromSystemPath( reinterpret_cast<sal_Unicode*>(pStr), sURL );
- }
-
- CoTaskMemFree (pStr);
- return sURL;
-}
-
-//-----------------------------------------------------------------------------------------
-void lcl_updateVersionListDirectly(IFileDialog* pDialog)
-{
- static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence"));
- static const ::sal_Int16 CONTROL_VERSIONLIST = css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_VERSION;
-
- TFileDialog iDialog (pDialog);
- TFileOpenDialog iOpen ;
- TFileDialogCustomize iCustomize;
-
-#ifdef __MINGW32__
- iDialog->QueryInterface(IID_IFileOpenDialog, (void**)(&iOpen));
- iDialog->QueryInterface(IID_IFileDialogCustomize, (void**)(&iCustomize));
-#else
- iDialog.query(&iOpen );
- iDialog.query(&iCustomize);
-#endif
-
- // make sure version list match to the current selection always ...
- // at least an empty version list will be better then the wrong one .-)
- iCustomize->RemoveAllControlItems(CONTROL_VERSIONLIST);
-
- HRESULT hResult = E_FAIL;
- ComPtr< IShellItemArray > iItems;
- ComPtr< IShellItem > iItem;
-
- if (iOpen.is())
- {
- hResult = iOpen->GetSelectedItems(&iItems);
- if (FAILED(hResult))
- return;
-
- DWORD nCount;
- hResult = iItems->GetCount(&nCount);
- if ( FAILED(hResult) )
- return;
-
- // we can show one version list only within control
- if (nCount != 1)
- return;
-
- hResult = iItems->GetItemAt(0, &iItem);
- }
- else
- if (iDialog.is())
- hResult = iDialog->GetCurrentSelection(&iItem);
-
- if ( FAILED(hResult) )
- return;
-
- const ::rtl::OUString sURL = lcl_getURLFromShellItem2(iItem);
- if (sURL.getLength() < 1)
- return;
- try
- {
- css::uno::Reference< css::embed::XStorage > xStorage = ::comphelper::OStorageHelper::GetStorageFromURL(sURL, css::embed::ElementModes::READ);
- if ( ! xStorage.is() )
- return;
-
- css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
- css::uno::Reference< css::document::XDocumentRevisionListPersistence > xReader (xSMGR->createInstance(SERVICENAME_REVISIONPERSISTENCE), css::uno::UNO_QUERY_THROW);
- css::uno::Sequence< css::util::RevisionTag > lVersions = xReader->load(xStorage);
-
- for (::sal_Int32 i=0; i<lVersions.getLength(); ++i)
- {
- const css::util::RevisionTag& aTag = lVersions[i];
- iCustomize->AddControlItem(CONTROL_VERSIONLIST, i, reinterpret_cast<LPCTSTR>(aTag.Identifier.getStr()));
- }
- iCustomize->SetSelectedControlItem(CONTROL_VERSIONLIST, 0);
- }
- catch(const css::uno::Exception&)
- {}
-}
-
//-----------------------------------------------------------------------------------------
STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* /*pDialog*/)
{
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 60b470496c39..74448336ae2c 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1425,65 +1425,6 @@ ScCondFormatData ScConditionalFormat::GetData( ScBaseCell* pCell, const ScAddres
return aData;
}
-void lcl_Extend( ScRange& rRange, ScDocument* pDoc, bool bLines )
-{
- SCTAB nTab = rRange.aStart.Tab();
- OSL_ENSURE(rRange.aEnd.Tab() == nTab, "lcl_Extend - mehrere Tabellen?");
-
- SCCOL nStartCol = rRange.aStart.Col();
- SCROW nStartRow = rRange.aStart.Row();
- SCCOL nEndCol = rRange.aEnd.Col();
- SCROW nEndRow = rRange.aEnd.Row();
-
- bool bEx = pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab );
-
- if (bLines)
- {
- if (nStartCol > 0) --nStartCol;
- if (nStartRow > 0) --nStartRow;
- if (nEndCol < MAXCOL) ++nEndCol;
- if (nEndRow < MAXROW) ++nEndRow;
- }
-
- if ( bEx || bLines )
- {
- rRange.aStart.Set( nStartCol, nStartRow, nTab );
- rRange.aEnd.Set( nEndCol, nEndRow, nTab );
- }
-}
-
-bool lcl_CutRange( ScRange& rRange, const ScRange& rOther )
-{
- rRange.Justify();
- ScRange aCmpRange = rOther;
- aCmpRange.Justify();
-
- if ( rRange.aStart.Col() <= aCmpRange.aEnd.Col() &&
- rRange.aEnd.Col() >= aCmpRange.aStart.Col() &&
- rRange.aStart.Row() <= aCmpRange.aEnd.Row() &&
- rRange.aEnd.Row() >= aCmpRange.aStart.Row() &&
- rRange.aStart.Tab() <= aCmpRange.aEnd.Tab() &&
- rRange.aEnd.Tab() >= aCmpRange.aStart.Tab() )
- {
- if ( rRange.aStart.Col() < aCmpRange.aStart.Col() )
- rRange.aStart.SetCol( aCmpRange.aStart.Col() );
- if ( rRange.aStart.Row() < aCmpRange.aStart.Row() )
- rRange.aStart.SetRow( aCmpRange.aStart.Row() );
- if ( rRange.aStart.Tab() < aCmpRange.aStart.Tab() )
- rRange.aStart.SetTab( aCmpRange.aStart.Tab() );
- if ( rRange.aEnd.Col() > aCmpRange.aEnd.Col() )
- rRange.aEnd.SetCol( aCmpRange.aEnd.Col() );
- if ( rRange.aEnd.Row() > aCmpRange.aEnd.Row() )
- rRange.aEnd.SetRow( aCmpRange.aEnd.Row() );
- if ( rRange.aEnd.Tab() > aCmpRange.aEnd.Tab() )
- rRange.aEnd.SetTab( aCmpRange.aEnd.Tab() );
-
- return true;
- }
-
- return false; // ausserhalb
-}
-
void ScConditionalFormat::DoRepaint( const ScRange* pModified )
{
if(pModified)
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index dbe0a9d61544..bc8a2b0e5e2b 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -193,12 +193,6 @@ inline void ReverseTwipsToMM( long& nVal )
nVal = HmmToTwips (nVal);
}
-void lcl_TwipsToMM( Point& rPoint )
-{
- TwipsToMM( rPoint.X() );
- TwipsToMM( rPoint.Y() );
-}
-
void lcl_ReverseTwipsToMM( Point& rPoint )
{
ReverseTwipsToMM( rPoint.X() );
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 5008f40cd7ae..42bb3e40b75c 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1381,18 +1381,6 @@ void SvTreeList::InvalidateEntry( SvListEntry* pEntry )
Broadcast( LISTACTION_INVALIDATE_ENTRY, pEntry );
}
-void lcl_CheckList( SvTreeEntryList* pList )
-{
- SvListEntry* pEntry = (SvListEntry*)(pList->First());
- sal_uLong nPos = 0;
- while ( pEntry )
- {
- DBG_ASSERT(pEntry->GetChildListPos()==nPos,"Wrong ListPos");
- pEntry = (SvListEntry*)(pList->Next());
- nPos++;
- }
-}
-
SvListEntry* SvTreeList::GetRootLevelParent( SvListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"GetRootLevelParent:No Entry");
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 7d50585dc013..505eeab45b1e 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -279,8 +279,6 @@ _CpyTabFrm& _CpyTabFrm::operator=( const _CpyTabFrm& rCpyTabFrm )
SV_DECL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm, 0 )
SV_IMPL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm )
-void lcl_DelCpyTabFrmFmts( _CpyTabFrm& rArr );
-
struct _CpyPara
{
boost::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths;
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index f60ec4659b31..f7c483ddd4da 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3858,10 +3858,6 @@ void SwCellFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
|*
|*************************************************************************/
-//Weiter unten definiert
-void lcl_PaintLowerBorders( const SwLayoutFrm *pLay,
- const SwRect &rRect, const SwPageFrm *pPage );
-
struct BorderLinesGuard
{
explicit BorderLinesGuard() : m_pBorderLines(g_pBorderLines)
generated by cgit (git 2.34.1) at 2025-02-12 09:33:39 +0000