Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
bdc30530
Kaydet (Commit)
bdc30530
authored
Agu 18, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
rBaseURL argument now unused
Change-Id: I02cacfeaf26788ed024fa9753af132f0d5822e6f
üst
c89207ea
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
16 deletions
+13
-16
hldocntp.cxx
cui/source/dialogs/hldocntp.cxx
+1
-1
hldoctp.cxx
cui/source/dialogs/hldoctp.cxx
+1
-2
iodlg.cxx
fpicker/source/office/iodlg.cxx
+1
-1
inettbc.hxx
include/svtools/inettbc.hxx
+1
-1
localfilehelper.hxx
include/unotools/localfilehelper.hxx
+1
-1
pptin.cxx
sd/source/filter/ppt/pptin.cxx
+1
-1
linkmgr2.cxx
sfx2/source/appl/linkmgr2.cxx
+1
-1
inettbc.cxx
sfx2/source/inet/inettbc.cxx
+1
-1
inettbc.cxx
svtools/source/control/inettbc.cxx
+4
-6
localfilehelper.cxx
unotools/source/ucbhelper/localfilehelper.cxx
+1
-1
No files found.
cui/source/dialogs/hldocntp.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -407,7 +407,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
OUString
aStrURL
;
OUString
aTempStrURL
(
m_pCbbPath
->
GetText
()
);
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
aTempStrURL
,
m_pCbbPath
->
GetBaseURL
(),
aStrURL
);
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
aTempStrURL
,
aStrURL
);
OUString
aStrPath
=
aStrURL
;
bool
bZeroPath
=
aStrPath
.
isEmpty
();
...
...
cui/source/dialogs/hldoctp.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -118,7 +118,6 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
// get data from dialog-controls
OUString
aStrURL
;
OUString
aStrPath
(
m_pCbbPath
->
GetText
()
);
const
OUString
aBaseURL
(
m_pCbbPath
->
GetBaseURL
()
);
OUString
aStrMark
(
m_pEdTarget
->
GetText
()
);
if
(
aStrPath
!=
aEmptyStr
)
...
...
@@ -127,7 +126,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
if
(
aURL
.
GetProtocol
()
!=
INetProtocol
::
NotValid
)
// maybe the path is already a valid
aStrURL
=
aStrPath
;
// hyperlink, then we can use this path directly
else
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
aStrPath
,
a
BaseURL
,
a
StrURL
);
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
aStrPath
,
aStrURL
);
//#105788# always create a URL even if it is not valid
if
(
aStrURL
==
aEmptyStr
)
...
...
fpicker/source/office/iodlg.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -935,7 +935,7 @@ IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
INetURLObject
aFileObject
(
aFileName
);
if
(
(
aFileObject
.
GetProtocol
()
==
INetProtocol
::
NotValid
)
&&
!
aFileName
.
isEmpty
()
)
{
OUString
sCompleted
=
SvtURLBox
::
ParseSmart
(
aFileName
,
_pFileView
->
GetViewURL
()
,
SvtPathOptions
().
GetWorkPath
()
);
OUString
sCompleted
=
SvtURLBox
::
ParseSmart
(
aFileName
,
_pFileView
->
GetViewURL
()
);
if
(
!
sCompleted
.
isEmpty
()
)
aFileName
=
sCompleted
;
}
...
...
include/svtools/inettbc.hxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -80,7 +80,7 @@ public:
void
UpdatePickList
(
);
static
OUString
ParseSmart
(
const
OUString
&
aText
,
const
OUString
&
aBaseURL
,
const
OUString
&
aWorkDir
);
static
OUString
ParseSmart
(
const
OUString
&
aText
,
const
OUString
&
aBaseURL
);
void
SetFilter
(
const
OUString
&
_sFilter
);
...
...
include/unotools/localfilehelper.hxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -35,7 +35,7 @@ namespace utl
Returning sal_True and an empty URL means that the URL doesn't point to a local file.
*/
static
bool
ConvertPhysicalNameToURL
(
const
OUString
&
rName
,
OUString
&
rReturn
);
static
bool
ConvertSystemPathToURL
(
const
OUString
&
rName
,
const
OUString
&
rBaseURL
,
OUString
&
rReturn
);
static
bool
ConvertSystemPathToURL
(
const
OUString
&
rName
,
OUString
&
rReturn
);
/**
Converts a "UCB compatible" URL into a "physical" file name.
...
...
sd/source/filter/ppt/pptin.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -2066,7 +2066,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
OUString
aBookmarkURL
(
pInfo
->
GetBookmark
()
);
INetURLObject
aURL
(
pPtr
->
aTarget
);
if
(
INetProtocol
::
NotValid
==
aURL
.
GetProtocol
()
)
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
pPtr
->
aTarget
,
aB
aseURL
,
aB
ookmarkURL
);
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
pPtr
->
aTarget
,
aBookmarkURL
);
if
(
aBookmarkURL
.
isEmpty
()
)
aBookmarkURL
=
URIHelper
::
SmartRel2Abs
(
INetURLObject
(
aBaseURL
),
pPtr
->
aTarget
,
URIHelper
::
GetMaybeFileHdl
(),
true
);
pInfo
->
SetBookmark
(
aBookmarkURL
);
...
...
sfx2/source/appl/linkmgr2.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -564,7 +564,7 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL )
OUString
sRet
;
INetURLObject
aURL
(
rTopic
);
if
(
INetProtocol
::
NotValid
==
aURL
.
GetProtocol
()
)
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
rTopic
,
rBaseURL
,
sRet
);
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
rTopic
,
sRet
);
if
(
sRet
.
isEmpty
()
)
sRet
=
URIHelper
::
SmartRel2Abs
(
INetURLObject
(
rBaseURL
),
rTopic
,
URIHelper
::
GetMaybeFileHdl
(),
true
);
return
sRet
;
...
...
sfx2/source/inet/inettbc.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -88,7 +88,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ )
if
(
aObj
.
GetProtocol
()
==
INetProtocol
::
NotValid
)
{
OUString
aBaseURL
=
GetURLBox
()
->
GetBaseURL
();
aName
=
SvtURLBox
::
ParseSmart
(
rName
,
aBaseURL
,
SvtPathOptions
().
GetWorkPath
()
);
aName
=
SvtURLBox
::
ParseSmart
(
rName
,
aBaseURL
);
}
else
aName
=
rName
;
...
...
svtools/source/control/inettbc.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -460,8 +460,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
}
}
OUString
SvtURLBox
::
ParseSmart
(
const
OUString
&
_aText
,
const
OUString
&
_aBaseURL
,
const
OUString
&
aWorkDir
)
OUString
SvtURLBox
::
ParseSmart
(
const
OUString
&
_aText
,
const
OUString
&
_aBaseURL
)
{
OUString
aMatch
;
OUString
aText
=
_aText
;
...
...
@@ -538,14 +537,13 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR
else
{
OUString
aTmpMatch
;
::
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
aText
,
a
WorkDir
,
a
TmpMatch
);
::
utl
::
LocalFileHelper
::
ConvertSystemPathToURL
(
aText
,
aTmpMatch
);
aMatch
=
aTmpMatch
;
}
return
aMatch
;
}
void
SvtMatchContext_Impl
::
doExecute
()
{
::
osl
::
MutexGuard
aGuard
(
theSvtMatchContextMutex
::
get
()
);
...
...
@@ -586,7 +584,7 @@ void SvtMatchContext_Impl::doExecute()
if
(
schedule
()
)
{
if
(
eProt
==
INetProtocol
::
NotValid
)
aMatch
=
SvtURLBox
::
ParseSmart
(
aText
,
aBaseURL
,
aWorkDir
);
aMatch
=
SvtURLBox
::
ParseSmart
(
aText
,
aBaseURL
);
else
aMatch
=
aText
;
if
(
!
aMatch
.
isEmpty
()
)
...
...
@@ -1217,7 +1215,7 @@ OUString SvtURLBox::GetURL()
if
(
aObj
.
GetProtocol
()
==
INetProtocol
::
NotValid
)
{
OUString
aName
=
ParseSmart
(
aText
,
aBaseURL
,
SvtPathOptions
().
GetWorkPath
()
);
OUString
aName
=
ParseSmart
(
aText
,
aBaseURL
);
aObj
.
SetURL
(
aName
);
OUString
aURL
(
aObj
.
GetMainURL
(
INetURLObject
::
NO_DECODE
)
);
if
(
aURL
.
isEmpty
()
)
...
...
unotools/source/ucbhelper/localfilehelper.cxx
Dosyayı görüntüle @
bdc30530
...
...
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::ucb;
namespace
utl
{
bool
LocalFileHelper
::
ConvertSystemPathToURL
(
const
OUString
&
rName
,
const
OUString
&
,
OUString
&
rReturn
)
bool
LocalFileHelper
::
ConvertSystemPathToURL
(
const
OUString
&
rName
,
OUString
&
rReturn
)
{
bool
ok
=
osl
::
FileBase
::
getFileURLFromSystemPath
(
rName
,
rReturn
)
==
osl
::
FileBase
::
E_None
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment