diff options
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 7 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/source/framework.hxx | 1 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.hxx | 4 | ||||
| -rw-r--r-- | jvmfwk/source/libxmlutil.hxx | 18 |
5 files changed, 1 insertions, 35 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 0a75d8e36fca..6557217f1463 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -44,8 +44,6 @@ #include "rtl/bootstrap.hxx" #include "boost/optional.hpp" #include <string.h> -// #define NS_JAVA_FRAMEWORK "http://openoffice.org/2004/java/framework/1.0" -// #define NS_SCHEMA_INSTANCE "http://www.w3.org/2001/XMLSchema-instance" using namespace osl; @@ -154,13 +152,12 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave) nodeCrLf = xmlNewText((xmlChar*) "\n"); xmlAddChild(root, nodeCrLf); - //<javaInfo xsi:nil="true" autoSelect="true"> + //<javaInfo xsi:nil="true"> xmlNode * nodeJava = xmlNewTextChild( root,NULL, (xmlChar*) "javaInfo", (xmlChar*) ""); if (nodeJava == NULL) throw FrameworkException(JFW_E_ERROR, sExcMsg); xmlSetNsProp(nodeJava,nsXsi,(xmlChar*) "nil",(xmlChar*) "true"); -// xmlSetProp(nodeJava,(xmlChar*) "autoSelect",(xmlChar*) "true"); //add a new line nodeCrLf = xmlNewText((xmlChar*) "\n"); xmlAddChild(root, nodeCrLf); @@ -733,7 +730,6 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const //that after removing the file and shortly later creating it again //did not change the creation time. That is the newly created file //had the creation time of the former file. -// ::TimeValue time = stat.getCreationTime(); ::TimeValue modTime = stat.getModifyTime(); ::TimeValue curTime = {0,0}; if (sal_True == ::osl_getSystemTime(& curTime)) @@ -746,7 +742,6 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const fprintf(stderr, "[Java framework] Deleting settings file at \n%s\n", s.getStr()); #endif //delete file -// File::RC rc_rem = File::remove(sURL); File f(sURL); if (File::E_None == f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read) && File::E_None == f.setPos(0, 0) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 77c76fb66d8e..59f1942f13af 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -162,8 +162,6 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi for (citLoc ii = vecJRELocations.begin(); ii != vecJRELocations.end(); ++ii) { -// rtl::OUString sLocation = -// rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8); jfw::CJavaInfo aInfo; plerr = (*jfw_plugin_getJavaInfoByPathFunc)( ii->pData, @@ -1256,10 +1254,6 @@ CJavaInfo::operator JavaInfo const * () const { return pInfo; } -// ::JavaInfo** CJavaInfo::operator & () -// { -// return & pInfo; -// } rtl::OUString CJavaInfo::getVendor() const { diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index 89859d4806ed..0ba8c6b29583 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -104,7 +104,6 @@ public: void attach(::JavaInfo* pInfo); ::JavaInfo * detach(); const ::JavaInfo* operator ->() const; -// ::JavaInfo** operator & (); operator ::JavaInfo* (); operator ::JavaInfo const * () const; ::JavaInfo* cloneJavaInfo() const; diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx index 59df5c5dcf35..9e241cf92efe 100644 --- a/jvmfwk/source/fwkutil.hxx +++ b/jvmfwk/source/fwkutil.hxx @@ -69,15 +69,11 @@ struct Bootstrap : struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {}; -//osl::Mutex * getFwkMutex(); - rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData); rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data); rtl::OUString getPlatform(); -//const rtl::Bootstrap& getBootstrap(); - rtl::OUString getDirFromFile(const rtl::OUString& usFilePath); diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx index 5ac245afc3c7..b8c4a6e2f388 100644 --- a/jvmfwk/source/libxmlutil.hxx +++ b/jvmfwk/source/libxmlutil.hxx @@ -88,24 +88,6 @@ public: }; //=========================================================== -// class CXmlNsPtr -// { -// xmlNs* _object; - -// CXmlNsPtr(const CXmlNsPtr&); -// CXmlNsPtr & operator = (const CXmlNsPtr&); -// public: -// CXmlNsPtr(); -// CXmlNsPtr(xmlNs* aDoc); -// /** Takes ownership of xmlDoc -// */ -// CXmlNsPtr & operator = (xmlNs* pObj); -// ~CXmlNsPtr(); -// xmlNs* operator -> (); -// operator xmlNs* (); -// }; - -//=========================================================== class CXmlCharPtr { xmlChar* _object; |